Skip to content

Commit 7594116

Browse files
authored
Merge f2097e0 into 1897c63
2 parents 1897c63 + f2097e0 commit 7594116

22 files changed

+1200
-784
lines changed

pulse/interface/handler/geometry_handler.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ def set_length_unit(self, unit):
4343
self.length_unit = unit
4444

4545
def create_geometry(self):
46+
4647
gmsh.initialize("", False)
4748
gmsh.option.setNumber("General.Terminal",0)
4849
gmsh.option.setNumber("General.Verbosity", 0)

pulse/interface/main_window.py

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
from pulse.interface.handler.geometry_handler import GeometryHandler
1616
from pulse.interface.user_input.render.clip_plane_widget import ClipPlaneWidget
1717

18+
from pulse.interface.user_input.project.loading_screen import LoadingScreen
19+
1820
from opps.interface.viewer_3d.render_widgets.editor_render_widget import EditorRenderWidget
1921
from opps.io.pcf.pcf_exporter import PCFExporter
2022
from opps.io.pcf.pcf_handler import PCFHandler
2123

24+
from time import time
25+
2226
import os
2327
import sys
2428
import qdarktheme
@@ -178,14 +182,17 @@ def disable_workspace_selector_and_geometry_editor(self, _bool):
178182
def _create_layout(self):
179183

180184
self.opv_widget = OPVUi(self.project, self)
185+
self.opv_widget.opvAnalysisRenderer._createPlayer()
186+
181187
self.model_and_analysis_setup_widget = ModelAndAnalysisSetupWidget(self)
182188
self.results_viewer_wigdet = ResultsViewerWidget()
183-
self.opv_widget.opvAnalysisRenderer._createPlayer()
184189
self.input_widget = InputUi(self)
185190

186191
editor = app().geometry_toolbox.editor
187192
self.mesh_widget = MeshRenderWidget()
188-
self.geometry_widget = EditorRenderWidget(editor)
193+
194+
self.geometry_widget = EditorRenderWidget(editor)
195+
189196
self.geometry_widget.set_theme("light")
190197

191198
self.render_widgets_stack.addWidget(self.mesh_widget)
@@ -203,19 +210,25 @@ def _create_layout(self):
203210
self.opv_widget.plot_entities_with_cross_section()
204211

205212
def configure_window(self):
206-
213+
214+
# t0 = time()
207215
self._load_icons()
208216
self._config_window()
209217
self._define_qt_variables()
210218
self._connect_actions()
219+
211220
self._create_layout()
221+
212222
self._create_workspaces_toolbar()
213223
self._update_recent_projects()
214224
self._add_mesh_toolbar()
215225

216226
self.plot_entities()
217227
self.use_structural_setup_workspace()
218228
self.load_user_preferences()
229+
230+
# dt = time() - t0
231+
# print(f"Time to load interface: {dt} [s]")
219232
self.load_recent_project()
220233

221234
# public
@@ -381,10 +394,6 @@ def update_plot_entities_with_cross_section(self):
381394

382395
if key != [False, False, True, False]:
383396
self.plot_entities_with_cross_section()
384-
385-
def plot_raw_geometry(self):
386-
# self.use_structural_setup_workspace()
387-
self.action_show_points.setChecked()
388397

389398
def plot_geometry_editor(self):
390399
self.use_geometry_workspace()
@@ -396,15 +405,19 @@ def set_window_title(self, msg=""):
396405
self.setWindowTitle(title)
397406

398407
def load_recent_project(self):
408+
# t0 = time()
399409
if self.config.open_last_project and self.config.haveRecentProjects():
400410
self.import_project_call(self.config.getMostRecentProjectDir())
401411
elif self.input_widget.get_started():
402-
self.update() # update the renders before change the view
412+
# self.update() # update the renders before change the view
413+
# self.opv_widget.updatePlots()
403414
self.action_front_view_callback()
404415
self._update_recent_projects()
405416
self.set_window_title(self.file.project_name)
406417
else:
407418
self.disable_workspace_selector_and_geometry_editor(True)
419+
# dt = time() - t0
420+
# print(f"Elapsed time to load_recent_project: {dt}s")
408421

409422
# internal
410423
def _update_recent_projects(self):
@@ -587,9 +600,8 @@ def action_clip_plane_callback(self):
587600

588601
def action_zoom_callback(self):
589602
if self.get_current_workspace() == Workspace.GEOMETRY:
590-
self.opv_widget.opvGeometryRenderer.resetCamera()
591603
self.update()
592-
604+
593605
elif self.get_current_workspace() == Workspace.STRUCTURAL_SETUP:
594606
self.opv_widget.opvRenderer.resetCamera()
595607
self.opv_widget.opvRenderer.update()
@@ -603,7 +615,7 @@ def action_zoom_callback(self):
603615
else:
604616
self.opv_widget.opvRenderer.resetCamera()
605617
self.opv_widget.opvRenderer.update()
606-
618+
607619
def set_clip_plane_configs(self):
608620
if self.get_current_workspace() == Workspace.RESULTS:
609621
if self.opv_widget.opvAnalysisRenderer.getInUse():
@@ -791,7 +803,7 @@ def set_theme(self, theme):
791803
icons.change_icon_color_for_widgets(widgets, icon_color)
792804

793805
# TODO: Connect this via signaling
794-
self.geometry_widget.set_theme("light")
806+
self.geometry_widget.set_theme(theme)
795807

796808
def update_themes_in_file(self, theme):
797809
if self.update_theme:

0 commit comments

Comments
 (0)