pyfemtet 0.4.7__tar.gz → 0.4.8__tar.gz

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.4.7
+Version: 0.4.8
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause

pyfemtet-0.4.8/pyfemtet/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.8"

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/_test_util.py

@@ -86,10 +86,30 @@ def _get_obj_from_csv(csv_path):
     return out, columns
 
 
-def is_equal_result(csv1, csv2):
+def is_equal_result(csv1, csv2, result_save_to=None):
     """Check the equality of two result csv files."""
     df1, columns1 = _get_obj_from_csv(csv1)
     df2, columns2 = _get_obj_from_csv(csv2)
+
+    if result_save_to is not None:
+        import datetime
+        with open(result_save_to, 'a', encoding='utf-8', newline='\n') as f:
+            name = os.path.basename(csv1)
+            content = [
+                f'===== result of {name} =====\n',
+                f'{datetime.datetime.now()}\n',
+                f'----- column numbers -----\n',
+                f'csv1: {len(columns1)} columns\n',
+                f'csv2: {len(columns2)} columns\n',
+                f'----- row numbers -----\n',
+                f'csv1: {len(df1)} columns\n',
+                f'csv2: {len(df2)} columns\n',
+                f'----- difference -----\n',
+                f'max difference ratio: {(np.abs(df1.values - df2.values) / np.abs(df2.values)).max() * 100}%\n',
+                '\n'
+            ]
+            f.writelines(content)
+
     assert len(columns1) == len(columns2), '結果 csv の column 数が異なります。'
     assert len(df1) == len(df2), '結果 csv の row 数が異なります。'
     assert (np.abs(df1.values - df2.values) / np.abs(df2.values)).max() <= 0.01, '前回の結果と 1% を超える相違があります。'

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/_femopt_core.py

@@ -14,7 +14,7 @@ import numpy as np
 import pandas as pd
 from scipy.stats.qmc import LatinHypercube
 from optuna._hypervolume import WFG
-from dask.distributed import Lock
+from dask.distributed import Lock, get_client
 
 # win32com
 from win32com.client import constants, Constants
@@ -532,7 +532,17 @@ class History:
 
         return columns, metadata
 
-    def record(self, parameters, objectives, constraints, obj_values, cns_values, message):
+    def record(
+            self,
+            parameters,
+            objectives,
+            constraints,
+            obj_values,
+            cns_values,
+            message,
+            postprocess_func,
+            postprocess_args,
+    ):
         """Records the optimization results in the history.
 
         Record only. NOT save.
@@ -544,7 +554,8 @@ class History:
             obj_values (list): The objective values.
             cns_values (list): The constraint values.
             message (str): Additional information or messages related to the optimization results.
-
+            postprocess_func (Callable): fem method to call after solving. i.e. save result file. Must take trial(int) for 1st argument.
+            postprocess_args (dict): arguments for `postprocess_func`. i.e. create binary data of result file in the worker process.
         """
 
         # create row
@@ -591,6 +602,12 @@ class History:
             self._calc_hypervolume(objectives)  # update self.local_data
             self.actor_data = self.local_data
 
+            # save file
+            if postprocess_args is not None:
+                trial = self.local_data['trial'].values[-1]
+                client = get_client()  # always returns valid client
+                client.run_on_scheduler(postprocess_func, trial, **postprocess_args)
+
     def _calc_non_domi(self, objectives):
 
         # 目的関数の履歴を取り出してくる

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/femprj_sample/cad_ex01_NX.py

@@ -107,6 +107,10 @@ if __name__ == '__main__':
     fem = FemtetWithNXInterface(
         prt_path='cad_ex01_NX.prt',
         open_result_with_gui=False,  # To calculate von Mises stress, set this argument to False. See Femtet Macro Help.
+        export_curves=False,
+        export_surfaces=False,
+        export_solids=True,
+        export_flattened_assembly=False,
     )
 
     # Initialize the FEMOpt object.

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/femprj_sample_jp/cad_ex01_NX_jp.py

@@ -103,6 +103,10 @@ if __name__ == '__main__':
     fem = FemtetWithNXInterface(
         prt_path='cad_ex01_NX.prt',
         open_result_with_gui=False,
+        export_curves=False,
+        export_surfaces=False,
+        export_solids=True,
+        export_flattened_assembly=False,
     )
 
     # FEMOpt オブジェクトの初期化 (最適化問題とFemtetとの接続を行います)

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/interface/_base.py

@@ -63,6 +63,12 @@ class FEMInterface(ABC):
         """Preprocessing after launching a dask worker and before run optimization (if implemented in concrete class)."""
         pass
 
+    def postprocess_func(self, trial: int, *args, dask_scheduler=None, **kwargs):
+        pass
+
+    def create_postprocess_args(self):
+        pass
+
 
 class NoFEM(FEMInterface):
     """Interface with no FEM for debug."""

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/interface/_femtet.py

@@ -59,9 +59,10 @@ class FemtetInterface(FEMInterface):
             self,
             femprj_path=None,
             model_name=None,
-            connect_method='auto',
-            strictly_pid_specify=True,
-            allow_without_project=False,
+            connect_method='auto',  # dask worker では __init__ の中で 'new' にするので super() の引数にしない。（しても意味がない）
+            save_pdt='all',  # 'all' or None
+            strictly_pid_specify=True,  # dask worker では True にしたいので super() の引数にしない。
+            allow_without_project=False,  # main でのみ True を許容したいので super() の引数にしない。
             open_result_with_gui=True,
             parametric_output_indexes_use_as_objective=None,
             **kwargs  # 継承されたクラスからの引数
@@ -80,6 +81,7 @@ class FemtetInterface(FEMInterface):
         self.allow_without_project = allow_without_project
         self.original_femprj_path = self.femprj_path
         self.open_result_with_gui = open_result_with_gui
+        self.save_pdt = save_pdt
 
         # その他のメンバーの宣言や初期化
         self.Femtet = None
@@ -106,6 +108,15 @@ class FemtetInterface(FEMInterface):
         # 開かれたモデルに応じて femprj_path と model を更新する
         self._connect_and_open_femtet()
 
+        # original_fem_prj が None なら必ず
+        # dask worker でないプロセスがオリジナルファイルを開いている
+        if self.original_femprj_path is None:
+            # dask worker でなければ original のはず
+            try:
+                worker = get_worker()
+            except ValueError:
+                self.original_femprj_path = self.femprj_path
+
         # 接続した Femtet の種類に応じて del 時に quit するかどうか決める
         self.quit_when_destruct = self.connected_method == 'new'
 
@@ -117,26 +128,13 @@ class FemtetInterface(FEMInterface):
             model_name=self.model_name,
             open_result_with_gui=self.open_result_with_gui,
             parametric_output_indexes_use_as_objective=self.parametric_output_indexes_use_as_objective,
+            save_pdt=self.save_pdt,
             **kwargs
         )
 
     def __del__(self):
         if self.quit_when_destruct:
-            try:
-                # 強制終了 TODO: 自動保存を回避する
-                hwnd = self.Femtet.hWnd
-                pid = _get_pid(hwnd)
-                util.close_femtet(hwnd, 1, True)
-                start = time()
-                while psutil.pid_exists(pid):
-                    if time() - start > 30:  # 30 秒経っても存在するのは何かおかしい
-                        os.kill(pid, signal.SIGKILL)
-                        break
-                    sleep(1)
-                sleep(1)
-
-            except (AttributeError, OSError):  # already dead
-                pass
+            self.quit()
         # CoUninitialize()  # Win32 exception occurred releasing IUnknown at 0x0000022427692748
 
     def _connect_new_femtet(self):
@@ -626,8 +624,25 @@ class FemtetInterface(FEMInterface):
                 print('================')
                 input('終了するには Enter を押してください。')
                 raise e
+
         else:
-            util.close_femtet(self.Femtet.hWnd, timeout, force)
+            hwnd = self.Femtet.hWnd
+
+            # terminate
+            util.close_femtet(hwnd, timeout, force)
+
+            try:
+                pid = _get_pid(hwnd)
+                start = time()
+                while psutil.pid_exists(pid):
+                    if time() - start > 30:  # 30 秒経っても存在するのは何かおかしい
+                        logger.error('Femtet の終了に失敗しました。')
+                        break
+                    sleep(1)
+                sleep(1)
+
+            except (AttributeError, OSError):  # already dead
+                pass
 
     def _setup_before_parallel(self, client):
         client.upload_file(
@@ -637,3 +652,128 @@ class FemtetInterface(FEMInterface):
 
     def _version(self):
         return _version(Femtet=self.Femtet)
+
+    def create_postprocess_args(self):
+        file_content = self.create_result_file_content()
+        jpg_content = self.create_jpg_content()
+
+        out = dict(
+            original_femprj_path=self.original_femprj_path,
+            model_name=self.model_name,
+            pdt_file_content=file_content,
+            jpg_file_content=jpg_content,
+        )
+        return out
+
+    @staticmethod
+    def postprocess_func(
+            trial: int,
+            original_femprj_path: str,
+            model_name: str,
+            pdt_file_content=None,
+            jpg_file_content=None,
+            dask_scheduler=None
+    ):
+        result_dir = original_femprj_path.replace('.femprj', '.Results')
+        if pdt_file_content is not None:
+            pdt_path = os.path.join(result_dir, model_name + f'_trial{trial}.pdt')
+            with open(pdt_path, 'wb') as f:
+                f.write(pdt_file_content)
+
+        if jpg_file_content is not None:
+            jpg_path = os.path.join(result_dir, model_name + f'_trial{trial}.jpg')
+            with open(jpg_path, 'wb') as f:
+                f.write(jpg_file_content)
+
+    def create_result_file_content(self):
+        """Called after solve"""
+        if self.save_pdt == 'all':
+            # save to worker space
+            result_dir = self.femprj_path.replace('.femprj', '.Results')
+            pdt_path = os.path.join(result_dir, self.model_name + '.pdt')
+            succeed = self.Femtet.SavePDT(pdt_path, True)
+
+            # convert .pdt to ByteIO
+            if succeed:
+                with open(pdt_path, 'rb') as f:
+                    content = f.read()
+                return content
+
+            else:
+                raise Exception('pdt ファイルの保存でエラーが発生しました。')
+
+        else:
+            return None
+
+    def create_jpg_content(self):
+        result_dir = self.femprj_path.replace('.femprj', '.Results')
+        jpg_path = os.path.join(result_dir, self.model_name + '.jpg')
+
+        # モデル表示画面の設定
+        self.Femtet.SetWindowSize(200, 200)
+        self.Femtet.Fit()
+        self.Femtet.ViewNumeric.SetCoord(1, 1, 1)
+
+        # ---モデルの画面を保存---
+        self.Femtet.Redraw()  # 再描画
+        succeed = self.Femtet.SavePicture(jpg_path, 200, 200, 80)
+
+        self.Femtet.RedrawMode = True  # 逐一の描画をオン
+
+        if not succeed:
+            raise Exception('jpg ファイルの保存でエラーが発生しました。')
+
+        if not os.path.exists(jpg_path):
+            raise Exception('保存した jpg ファイルが見つかりませんでした。')
+
+        with open(jpg_path, 'rb') as f:
+            content = f.read()
+
+        return content
+
+
+from win32com.client import Dispatch, constants
+
+
+class _UnPicklableNoFEM(FemtetInterface):
+
+
+    original_femprj_path = 'dummy'
+    model_name = 'dummy'
+    parametric_output_indexes_use_as_objective = None
+    kwargs = dict()
+    Femtet = None
+    quit_when_destruct = False
+
+    def __init__(self):
+        CoInitialize()
+        self.unpicklable_member = Dispatch('FemtetMacro.Femtet')
+        self.cns = constants
+
+    def _setup_before_parallel(self, *args, **kwargs):
+        pass
+
+    def check_param_value(self, *args, **kwargs):
+        pass
+
+    def update_parameter(self, *args, **kwargs):
+        pass
+
+    def update(self, *args, **kwargs):
+        pass
+
+    def create_result_file_content(self):
+        """Called after solve"""
+
+        # save to worker space
+        with open(__file__, 'rb') as f:
+            content = f.read()
+
+        return content
+
+    def create_file_path(self, trial: int):
+        # return path of scheduler environment
+        here = os.path.dirname(__file__)
+        pdt_path = os.path.join(here, f'trial{trial}.pdt')
+        return pdt_path
+

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/interface/_femtet_with_nx/_interface.py

@@ -17,6 +17,10 @@ class FemtetWithNXInterface(FemtetInterface):
 
     Args:
         prt_path: The path to the prt file.
+        export_curves(bool or None): Parasolid export setting of NX. If None, PyFemtet does not change the setting of NX. Defaults to None.
+        export_surfaces(bool or None): Parasolid export setting of NX. If None, PyFemtet does not change the setting of NX. Defaults to None.
+        export_solids(bool or None): Parasolid export setting of NX. If None, PyFemtet does not change the setting of NX. Defaults to None.
+        export_flattened_assembly(bool or None): Parasolid export setting of NX. If None, PyFemtet does not change the setting of NX. Defaults to None.
 
     For details of The other arguments, see ``FemtetInterface``.
 
@@ -27,9 +31,12 @@ class FemtetWithNXInterface(FemtetInterface):
     def __init__(
             self,
             prt_path,
+            export_curves: bool or None = None,
+            export_surfaces: bool or None = None,
+            export_solids: bool or None = None,
+            export_flattened_assembly: bool or None = None,
             **kwargs
     ):
-
         # check NX installation
         self.run_journal_path = os.path.join(os.environ.get('UGII_BASE_DIR'), 'NXBIN', 'run_journal.exe')
         if not os.path.isfile(self.run_journal_path):
@@ -45,10 +52,19 @@ class FemtetWithNXInterface(FemtetInterface):
         except ValueError:  # get_worker に失敗した場合
             self.prt_path = os.path.abspath(prt_path)
 
+        self.export_curves = export_curves
+        self.export_surfaces = export_surfaces
+        self.export_solids = export_solids
+        self.export_flattened_assembly = export_flattened_assembly
+
         # FemtetInterface の設定 (femprj_path, model_name の更新など)
         # + restore 情報の上書き
         super().__init__(
             prt_path=self.prt_path,
+            export_curves=self.export_curves,
+            export_surfaces=self.export_surfaces,
+            export_solids=self.export_solids,
+            export_flattened_assembly=self.export_flattened_assembly,
             **kwargs
         )
 
@@ -86,10 +102,27 @@ class FemtetWithNXInterface(FemtetInterface):
             tmp_dict[row['name']] = row['value']
         str_json = json.dumps(tmp_dict)
 
+        # create dumped json of export settings
+        tmp_dict = dict(
+            include_curves=self.export_curves,
+            include_surfaces=self.export_surfaces,
+            include_solids=self.export_solids,
+            flatten_assembly=self.export_flattened_assembly,
+        )
+        dumped_json_export_settings = json.dumps(tmp_dict)
+
         # NX journal を使ってモデルを編集する
         env = os.environ.copy()
         subprocess.run(
-            [self.run_journal_path, self._JOURNAL_PATH, '-args', self.prt_path, str_json, x_t_path],
+            [
+                self.run_journal_path,  # run_journal.exe
+                self._JOURNAL_PATH,  # update_model.py
+                '-args',
+                self.prt_path,
+                str_json,
+                x_t_path,
+                dumped_json_export_settings,
+            ],
             env=env,
             shell=True,
             cwd=os.path.dirname(self.prt_path)

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/interface/_femtet_with_nx/update_model.py

@@ -1,35 +1,34 @@
 import os
 import sys
 import json
-import NXOpen
-
+from xml.etree.ElementInclude import include
 
-def main(prtPath:str, parameters:'dict as str', x_tPath:str = None):
-    '''
-    .prt ファイルのパスを受け取り、parameters に指定された変数を更新し、
-    x_tPath が None のときは.prt と同じディレクトリに
-    .x_t ファイルをエクスポートする
+import NXOpen
 
-    Parameters
-    ----------
-    prtPath : str
-        DESCRIPTION.
-    parameters : 'dict as str'
-        DESCRIPTION.
 
-    Returns
-    -------
-    None.
+def main(
+        prtPath: str,
+        parameters: str,  # dumped json
+        x_tPath: str,
+        dumped_json_export_settings: str,
+):
+    """Update the parameter of .prt file and export to .x_t file."""
 
-    '''    
     # 保存先の設定
-    prtPath = os.path.abspath(prtPath) # 一応
+    prtPath = os.path.abspath(prtPath)
     if x_tPath is None:
         x_tPath = os.path.splitext(prtPath)[0] + '.x_t'
 
     # 辞書の作成
     parameters = json.loads(parameters)
-    
+
+    # export 設定
+    settings = json.loads(dumped_json_export_settings)
+    include_curves = settings['include_curves']
+    include_surfaces = settings['include_surfaces']
+    include_solids = settings['include_solids']
+    flatten_assembly = settings['flatten_assembly']
+
     # session の取得とパートを開く
     theSession = NXOpen.Session.GetSession()
     theSession.Parts.OpenActiveDisplay(prtPath, NXOpen.DisplayPartOption.AllowAdditional)
@@ -40,7 +39,6 @@ def main(prtPath:str, parameters:'dict as str', x_tPath:str = None):
     displayPart = theSession.Parts.Display
 
     # 式を更新
-    unit_mm = workPart.UnitCollection.FindObject("MilliMeter")
     for k, v in parameters.items():
         try:
             exp = workPart.Expressions.FindObject(k)
@@ -48,14 +46,15 @@ def main(prtPath:str, parameters:'dict as str', x_tPath:str = None):
             print(f'├ 変数{k}は .prt ファイルに含まれていません。無視されます。')
             continue
 
-        workPart.Expressions.EditWithUnits(exp, unit_mm, str(v))
+        workPart.Expressions.Edit(exp, str(v))
         # 式の更新を適用
         id1 = theSession.NewestVisibleUndoMark
         try:
             nErrs1 = theSession.UpdateManager.DoUpdate(id1)
         # 更新に失敗
         except NXOpen.NXException as e:
-            print('└ 形状が破綻しました。操作を取り消します。')
+            print(f'├ ERROR! {e}')
+            print(f'└ 形状が破綻しました。操作を取り消します。')
             return None
 
     print('│ model 更新に成功しました。')
@@ -64,19 +63,28 @@ def main(prtPath:str, parameters:'dict as str', x_tPath:str = None):
         # parasolid のエクスポート
         parasolidExporter1 = theSession.DexManager.CreateParasolidExporter()
 
-        parasolidExporter1.ObjectTypes.Curves = False
-        parasolidExporter1.ObjectTypes.Surfaces = False
-        parasolidExporter1.ObjectTypes.Solids = True
+        if include_curves is not None:
+            parasolidExporter1.ObjectTypes.Curves = include_curves
+
+        if include_surfaces is not None:
+            parasolidExporter1.ObjectTypes.Surfaces = include_surfaces
+
+        if include_solids is not None:
+            parasolidExporter1.ObjectTypes.Solids = include_solids
+
+        if flatten_assembly is not None:
+            parasolidExporter1.FlattenAssembly = flatten_assembly
 
         parasolidExporter1.InputFile = prtPath
         parasolidExporter1.ParasolidVersion = NXOpen.ParasolidExporter.ParasolidVersionOption.Current
         parasolidExporter1.OutputFile = x_tPath
 
         parasolidExporter1.Commit()
-
         parasolidExporter1.Destroy()
-    except:
-        print('└ parasolid 更新に失敗しました。')
+
+    except Exception as e:
+        print(f'├ ERROR! {e}')
+        print(f'└ parasolid 更新に失敗しました。')
         return None
 
     print('└ parasolid 更新が正常に終了しました。')

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/opt/_base.py

@@ -88,6 +88,8 @@ class AbstractOptimizer(ABC):
             y,
             c,
             self.message,
+            postprocess_func=self.fem.postprocess_func,
+            postprocess_args=self.fem.create_postprocess_args(),
         )
 
         logger.debug('history.record end')

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/visualization/_graphs.py

@@ -2,9 +2,6 @@ import plotly.graph_objs as go
 import plotly.express as px
 
 
-_CUSTOM_DATA_DICT = {'trial': 0}  # 連番
-
-
 class _ColorSet:
     non_domi = {True: '#007bff', False: '#6c757d'}  # color
 
@@ -49,7 +46,7 @@ def update_hypervolume_plot(history, df):
         x="trial",
         y="hypervolume",
         markers=True,
-        custom_data=_CUSTOM_DATA_DICT.keys(),
+        custom_data=['trial'],
     )
 
     fig.update_layout(
@@ -67,13 +64,17 @@ def update_default_figure(history, df):
     obj_names = history.obj_names
 
     if len(obj_names) == 0:
-        return go.Figure()
+        fig = go.Figure()
 
     elif len(obj_names) == 1:
-        return update_single_objective_plot(history, df)
+        fig = update_single_objective_plot(history, df)
 
     elif len(obj_names) >= 2:
-        return update_multi_objective_pairplot(history, df)
+        fig = update_multi_objective_pairplot(history, df)
+
+    fig.update_traces(hoverinfo="none", hovertemplate=None)
+
+    return fig
 
 
 def update_single_objective_plot(history, df):
@@ -97,7 +98,7 @@ def update_single_objective_plot(history, df):
             _ls.feasible['label']: False,
             'trial': True,
         },
-        custom_data=_CUSTOM_DATA_DICT.keys(),
+        custom_data=['trial'],
     )
 
     fig.add_trace(
@@ -143,11 +144,7 @@ def update_multi_objective_pairplot(history, df):
             _ls.feasible[True]: _ss.feasible[True],
             _ls.feasible[False]: _ss.feasible[False],
         },
-        hover_data={
-            _ls.feasible['label']: False,
-            'trial': True,
-        },
-        custom_data=_CUSTOM_DATA_DICT.keys(),
+        custom_data=['trial'],
         category_orders={
             _ls.feasible['label']: (_ls.feasible[False], _ls.feasible[True]),
             _ls.non_domi['label']: (_ls.non_domi[False], _ls.non_domi[True]),

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyfemtet/opt/visualization/_monitor.py

@@ -1,4 +1,5 @@
 import os
+import base64
 from typing import Optional, List
 
 import json
@@ -6,10 +7,11 @@ import webbrowser
 from time import sleep
 from threading import Thread
 
+import numpy as np
 import pandas as pd
 import psutil
 from plotly.graph_objects import Figure
-from dash import Dash, html, dcc, Output, Input, State, callback_context, no_update
+from dash import Dash, html, dcc, Output, Input, State, callback_context, no_update, dash_table
 from dash.exceptions import PreventUpdate
 import dash_bootstrap_components as dbc
 
@@ -18,7 +20,6 @@ from pyfemtet.opt.interface import FemtetInterface
 from pyfemtet.opt.visualization._graphs import (
     update_default_figure,
     update_hypervolume_plot,
-    _CUSTOM_DATA_DICT
 )
 
 
@@ -28,6 +29,8 @@ logger = get_logger('viz')
 logger.setLevel(logging.INFO)
 
 
+here = os.path.dirname(__file__)
+
 DBC_COLUMN_STYLE_CENTER = {
     'display': 'flex',
     'justify-content': 'center',
@@ -458,7 +461,7 @@ class FemtetControl:
             points_dicts = selection_data['points']
             for points_dict in points_dicts:
                 logger.debug(points_dict)
-                trial = points_dict['customdata'][_CUSTOM_DATA_DICT['trial']]
+                trial = points_dict['customdata'][0]
                 logger.debug(trial)
                 index = trial - 1
                 names = [name for name in home.monitor.local_df.columns if name.startswith('prm_')]
@@ -556,6 +559,7 @@ class HomePageBase:
     ID_GRAPH_TABS = 'home-graph-tabs'
     ID_GRAPH_CARD_BODY = 'home-graph-card-body'
     ID_GRAPH = 'home-graph'
+    ID_GRAPH_TOOLTIP = 'home-graph-hover-tooltip'
     ID_SELECTION_DATA = 'home-selection-data'
 
     # selection data attribute
@@ -577,7 +581,6 @@ class HomePageBase:
         self.monitor = monitor
         self.app: Dash = monitor.app
         self.history = monitor.history
-        self.df = monitor.local_df
         self.setup_graph_card()
         self.setup_contents()
         self.setup_layout()
@@ -616,7 +619,12 @@ class HomePageBase:
                     children=[
                         # Loading : child が Output である callback について、
                         # それが発火してから return するまでの間 Spinner が出てくる
-                        dcc.Loading(dcc.Graph(id=self.ID_GRAPH)),
+                        html.Div([
+                            dcc.Loading(
+                                dcc.Graph(id=self.ID_GRAPH, clear_on_unhover=True, figure=self.get_fig_by_tab_id(default_tab)),
+                            ),
+                            dcc.Tooltip(id=self.ID_GRAPH_TOOLTIP),
+                        ]),
                     ],
                     id=self.ID_GRAPH_CARD_BODY,
                 ),
@@ -633,7 +641,7 @@ class HomePageBase:
                 Output(self.ID_GRAPH, 'figure'),
             ],
             [
-                Input(self.ID_GRAPH_CARD_BODY, 'children'),
+                Input(self.ID_DUMMY, 'children'),
             ],
             [
                 State(self.ID_GRAPH_TABS, 'active_tab'),
@@ -678,6 +686,72 @@ class HomePageBase:
             logger.debug(f'on_select: {selected_data}')
             return [selected_data]
 
+        # ホバーに画像を表示する callback
+        @self.monitor.app.callback(
+            Output(self.ID_GRAPH_TOOLTIP, "show"),
+            Output(self.ID_GRAPH_TOOLTIP, "bbox"),
+            Output(self.ID_GRAPH_TOOLTIP, "children"),
+            Input(self.ID_GRAPH, "hoverData"),
+        )
+        def display_hover(hoverData):
+            if hoverData is None:
+                return False, no_update, no_update
+
+            pt = hoverData["points"][0]
+            bbox = pt["bbox"]
+
+            # get row of the history
+            trial = pt['customdata'][0]
+            row = self.monitor.local_df[self.monitor.local_df['trial'] == trial]
+
+            # === create hovered data ===
+            # get encoded image from history.additional_metadata
+            img_url = None
+
+            # Femtet specified processing
+            metadata = self.history.metadata
+            if metadata[0] != '':
+                # get img path
+                d = json.loads(metadata[0])
+                femprj_path = d['femprj_path']
+                model_name = d['model_name']
+                femprj_result_dir = femprj_path.replace('.femprj', '.Results')
+                img_path = os.path.join(femprj_result_dir, f'{model_name}_trial{trial}.jpg')
+                if os.path.exists(img_path):
+                    # create encoded image
+                    with open(img_path, 'rb') as f:
+                        content = f.read()
+                    encoded_image = base64.b64encode(content).decode('utf-8')
+                    img_url = 'data:image/jpeg;base64, ' + encoded_image
+            html_img = html.Img(src=img_url, style={"width": "200px"}) if img_url is not None else html.Div()
+
+            # parameters
+            pd.options.display.float_format = '{:.4e}'.format
+            parameters = row.iloc[:, np.where(np.array(metadata) == 'prm')[0]]
+            names = parameters.columns
+            values = [f'{value:.3e}' for value in parameters.values.ravel()]
+            data = pd.DataFrame(dict(
+                name=names, value=values
+            ))
+
+            # descript result
+            desc = html.Div([
+                html.H3(f"trial{trial}", style={"color": "darkblue"}),
+                dash_table.DataTable(
+                    columns=[{'name': col, 'id': col} for col in data.columns],
+                    data=data.to_dict('records')
+                ),
+            ])
+
+            # make output
+            children = html.Div([
+                html.Div(html_img, style={'display': 'inline-block', 'margin-right': '10px', 'vertical-align': 'top'}),
+                html.Div(desc, style={'display': 'inline-block', 'margin-right': '10px'})
+            ])
+
+            return True, bbox, children
+
+
     def get_fig_by_tab_id(self, tab_id):
         if tab_id in self.graphs.keys():
             fig_func = self.graphs[tab_id]['fig_func']
@@ -712,8 +786,8 @@ class ResultViewerAppHomePage(HomePageBase):
             '---\n'
             '- 最適化の結果分析画面です。\n'
             '- 凡例をクリックすると、対応する要素の表示/非表示を切り替えます。\n'
-            '- ブラウザを使用しますが、ネットワーク通信は行いません。\n'
-            '- ブラウザを閉じてもプログラムは終了しません。'
+            '- ブラウザを使用しますが、解析結果のインターネット通信は行いません。\n'
+            '- ブラウザを閉じてもプログラムは終了しません。\n'
             '  - コマンドプロンプトを閉じるかコマンドプロンプトに `CTRL+C` を入力してプログラムを終了してください。\n'
         )
         self.contents.children = [
@@ -753,9 +827,10 @@ class ProcessMonitorAppHomePage(HomePageBase):
         note = dcc.Markdown(
             '---\n'
             '- 最適化の結果分析画面です。\n'
-            '- ブラウザを使用しますが、ネットワーク通信は行いません。\n'
+            '- ブラウザを使用しますが、解析結果のインターネット通信は行いません。\n'
             '- この画面を閉じても最適化は中断されません。\n'
             f'- この画面を再び開くにはブラウザのアドレスバーに「localhost:{self.monitor.DEFAULT_PORT}」と入力して下さい。\n'
+            '- __マウスオーバーで表示されるデータを見る場合は、「自動更新を一時停止する」ボタンを押してください。__\n'
         )
 
         self.contents.children = [
@@ -832,7 +907,10 @@ class ProcessMonitorAppHomePage(HomePageBase):
             # 1. interval => figure を更新する
             if (len(self.monitor.local_df) > 0) and (active_tab_id is not None):
                 fig = self.get_fig_by_tab_id(active_tab_id)
-                ret[card_body] = dcc.Graph(figure=fig, id=self.ID_GRAPH)  # list にせんとダメかも
+                ret[card_body] = [
+                    dcc.Graph(figure=fig, id=self.ID_GRAPH, clear_on_unhover=True),
+                    dcc.Tooltip(id=self.ID_GRAPH_TOOLTIP),
+                ]
 
             # 3. btn toggle => (toggle の children を切替) and (interval を切替)
             if toggle_n_clicks % 2 == 1:

{pyfemtet-0.4.7 → pyfemtet-0.4.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.4.7"  # ignored by versioning plugin
+version = "0.4.8"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"

pyfemtet-0.4.7/pyfemtet/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.7"