Skip to content

Commit 852e3a4

Browse files
committed
Move buttons to sidepanel or window menus
1 parent 3427fa9 commit 852e3a4

26 files changed

+341
-478
lines changed

src/ert/gui/main.py

+4-58
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import logging
44
import os
55
import sys
6-
import webbrowser
76
from signal import SIG_DFL, SIGINT, signal
87
from typing import Optional, Tuple
98

@@ -14,7 +13,7 @@
1413

1514
from collections import Counter
1615

17-
from qtpy.QtCore import QDir, Qt
16+
from qtpy.QtCore import QDir
1817
from qtpy.QtGui import QIcon
1918
from qtpy.QtWidgets import QApplication, QWidget
2019

@@ -24,27 +23,17 @@
2423
capture_validation,
2524
)
2625
from ert.gui.main_window import ErtMainWindow
27-
from ert.gui.simulation import ExperimentPanel
2826
from ert.gui.tools.event_viewer import (
29-
EventViewerTool,
3027
GUILogHandler,
3128
add_gui_log_handler,
3229
)
33-
from ert.gui.tools.export import ExportTool
34-
from ert.gui.tools.load_results import LoadResultsTool
35-
from ert.gui.tools.manage_experiments import ManageExperimentsTool
36-
from ert.gui.tools.plot import PlotTool
37-
from ert.gui.tools.plugins import PluginHandler, PluginsTool
38-
from ert.gui.tools.workflows import WorkflowsTool
39-
from ert.libres_facade import LibresFacade
4030
from ert.namespace import Namespace
4131
from ert.plugins import ErtPluginManager
4232
from ert.services import StorageService
4333
from ert.storage import ErtStorageException, Storage, open_storage
4434
from ert.storage.local_storage import local_storage_set_ert_config
4535

4636
from .suggestor import Suggestor
47-
from .summarypanel import SummaryPanel
4837

4938

5039
def run_gui(args: Namespace, plugin_manager: Optional[ErtPluginManager] = None) -> int:
@@ -167,59 +156,16 @@ def continue_action() -> None:
167156
)
168157

169158

170-
def _clicked_help_button(menu_label: str, link: str) -> None:
171-
logger = logging.getLogger(__name__)
172-
logger.info(f"Pressed help button {menu_label}")
173-
webbrowser.open(link)
174-
175-
176-
def _clicked_about_button(about_dialog: QWidget) -> None:
177-
logger = logging.getLogger(__name__)
178-
logger.info("Pressed help button About")
179-
about_dialog.show()
180-
181-
182159
def _setup_main_window(
183-
config: ErtConfig,
160+
ert_config: ErtConfig,
184161
args: Namespace,
185162
log_handler: GUILogHandler,
186163
storage: Storage,
187164
plugin_manager: Optional[ErtPluginManager] = None,
188165
) -> ErtMainWindow:
189166
# window reference must be kept until app.exec returns:
190-
facade = LibresFacade(config)
191-
config_file = args.config
192-
window = ErtMainWindow(config_file, plugin_manager)
167+
window = ErtMainWindow(args.config, ert_config, plugin_manager, log_handler)
193168
window.notifier.set_storage(storage)
194-
window.setWidget(
195-
ExperimentPanel(
196-
config, window.notifier, config_file, facade.get_ensemble_size()
197-
)
198-
)
199-
200-
plugin_handler = PluginHandler(
201-
window.notifier,
202-
[wfj for wfj in config.workflow_jobs.values() if wfj.is_plugin()],
203-
window,
204-
)
205-
206-
window.addDock(
207-
"Configuration summary",
208-
SummaryPanel(config),
209-
area=Qt.DockWidgetArea.BottomDockWidgetArea,
210-
)
211-
window.addTool(PlotTool(config_file, window))
212-
window.addTool(ExportTool(config, window.notifier))
213-
window.addTool(WorkflowsTool(config, window.notifier))
214-
window.addTool(
215-
ManageExperimentsTool(
216-
config, window.notifier, config.model_config.num_realizations
217-
)
218-
)
219-
window.addTool(PluginsTool(plugin_handler, window.notifier, config))
220-
window.addTool(LoadResultsTool(facade, window.notifier))
221-
event_viewer = EventViewerTool(log_handler, config_file)
222-
window.addTool(event_viewer)
223-
window.close_signal.connect(event_viewer.close_wnd)
169+
window.post_init()
224170
window.adjustSize()
225171
return window

0 commit comments

Comments
 (0)