Skip to content

Commit a8ec036

Browse files
committed
Update button visibility when new images loaded
Signed-off-by: Patrick Avery <patrick.avery@kitware.com>
1 parent ae710db commit a8ec036

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

hexrdgui/image_mode_widget.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from hexrdgui.constants import PolarXAxisType, ViewType
99
from hexrdgui.create_hedm_instrument import create_hedm_instrument
1010
from hexrdgui.hexrd_config import HexrdConfig
11+
from hexrdgui.image_load_manager import ImageLoadManager
1112
from hexrdgui.ui_loader import UiLoader
1213
from hexrdgui.utils import block_signals
1314

@@ -146,6 +147,9 @@ def setup_connections(self):
146147
self.ui.stereo_project_from_polar.toggled.connect(
147148
HexrdConfig().set_stereo_project_from_polar)
148149

150+
ImageLoadManager().new_images_loaded.connect(
151+
self.update_visibility_states)
152+
149153
def enable_image_mode_widget(self, b):
150154
self.ui.tab_widget.setEnabled(b)
151155

hexrdgui/main_window.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@
9090

9191
class MainWindow(QObject):
9292

93-
# Emitted when new images are loaded
94-
new_images_loaded = Signal()
95-
9693
# Emitted when a new mask is added
9794
new_mask_added = Signal(str)
9895

@@ -273,7 +270,6 @@ def setup_connections(self):
273270
self.ui.action_run_fit_grains.triggered.connect(
274271
self.on_action_run_fit_grains_triggered)
275272
self.ui.action_run_wppf.triggered.connect(self.run_wppf)
276-
self.new_images_loaded.connect(self.images_loaded)
277273
self.ui.image_tab_widget.update_needed.connect(self.update_all)
278274
self.ui.image_tab_widget.new_mouse_position.connect(
279275
self.new_mouse_position)
@@ -340,7 +336,7 @@ def setup_connections(self):
340336
self.on_physics_package_modified)
341337

342338
ImageLoadManager().update_needed.connect(self.update_all)
343-
ImageLoadManager().new_images_loaded.connect(self.new_images_loaded)
339+
ImageLoadManager().new_images_loaded.connect(self.images_loaded)
344340
ImageLoadManager().images_transformed.connect(self.update_config_gui)
345341
ImageLoadManager().live_update_status.connect(self.set_live_update)
346342
ImageLoadManager().state_updated.connect(
@@ -529,7 +525,8 @@ def load_dummy_images(self):
529525
ImageFileManager().load_dummy_images()
530526
self.update_all(clear_canvases=True)
531527
self.ui.action_transform_detectors.setEnabled(False)
532-
self.new_images_loaded.emit()
528+
# Manually indicate that new images were loaded
529+
ImageLoadManager().new_images_loaded.emit()
533530

534531
def open_image_file(self):
535532
images_dir = HexrdConfig().images_dir

0 commit comments

Comments
 (0)