Take the export counts settings from the analysis config

Remove the count interval, the counting event, the file stem and the
suffix badge from the ExportCountsDialog and read them through use cases
instead, so a project configures them once. The interval stays a choice,
but only when more than one is configured. The file stem is composed of
save name and save suffix the way a cli run composes it; a project that
names no export keeps the suggested stem, so exporting works without
configuring a name first.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: schubsen

OTAnalytics/application/resources/resource_manager.py

@@ -109,7 +109,6 @@ class ExportCountsDialogKeys(ResourceKey):
     LABEL_END_DATE = "label-end-date"
     LABEL_END_TIME = "label-end-time"
     LABEL_INTERVAL_MINUTES = "label-interval-minutes"
-    LABEL_COUNTING_EVENT = "label-counting-event"
     LABEL_OUTPUT_FILE = "label-output-file"
 
 
@@ -248,7 +247,6 @@ class WorkspaceKeys(ResourceKey):
     FileChooserDialogKeys.LABEL_DIRECTORY: "Directory",
     FileChooserDialogKeys.LABEL_BROWSE: "Browse",
     ExportCountsDialogKeys.LABEL_INTERVAL_MINUTES: "Interval (minutes)",
-    ExportCountsDialogKeys.LABEL_COUNTING_EVENT: "Counting Event",
     ExportCountsDialogKeys.LABEL_OUTPUT_FILE: "Output File",
     ExportCountsDialogKeys.LABEL_EXPORT_COUNTS: "Export Counts",
     ExportCountsDialogKeys.LABEL_TIME_RANGE: "Time Range",

OTAnalytics/plugin_ui/nicegui_application.py

@@ -13,6 +13,7 @@
     RefuseAnyProjectLocation,
     ValidateProjectLocation,
 )
+from OTAnalytics.application.state import CurrentExportConfigState
 from OTAnalytics.application.upload_otconfig import NoOtconfigUpload, UploadOtconfig
 from OTAnalytics.application.use_cases.ask_for_load_window import AskForLoadWindow
 from OTAnalytics.application.use_cases.provide_input_files import (
@@ -261,57 +262,172 @@ def visualization_offset_slider_form(self) -> VisualizationOffSetSliderForm:
     def project_form(self) -> ProjectForm:
         return ProjectForm(self.view_model, self.resource_manager)
 
+    @cached_property
+    def get_do_events_of_current_analysis_config(
+        self,
+    ) -> GetDoEventsOfCurrentAnalysisConfig:
+        return GetDoEventsOfCurrentAnalysisConfig(
+            self.current_static_analysis_config_state
+        )
+
+    @cached_property
+    def get_do_counting_of_current_analysis_config(
+        self,
+    ) -> GetDoCountingOfCurrentAnalysisConfig:
+        return GetDoCountingOfCurrentAnalysisConfig(
+            self.current_static_analysis_config_state
+        )
+
+    @cached_property
+    def get_save_name_of_current_analysis_config(
+        self,
+    ) -> GetSaveNameOfCurrentAnalysisConfig:
+        return GetSaveNameOfCurrentAnalysisConfig(self.current_export_config_state)
+
+    @cached_property
+    def get_save_suffix_of_current_analysis_config(
+        self,
+    ) -> GetSaveSuffixOfCurrentAnalysisConfig:
+        return GetSaveSuffixOfCurrentAnalysisConfig(self.current_export_config_state)
+
+    @cached_property
+    def get_event_formats_of_current_analysis_config(
+        self,
+    ) -> GetEventFormatsOfCurrentAnalysisConfig:
+        return GetEventFormatsOfCurrentAnalysisConfig(self.current_export_config_state)
+
+    @cached_property
+    def get_count_intervals_of_current_analysis_config(
+        self,
+    ) -> GetCountIntervalsOfCurrentAnalysisConfig:
+        return GetCountIntervalsOfCurrentAnalysisConfig(
+            self.current_export_config_state
+        )
+
+    @cached_property
+    def get_counting_event_of_current_analysis_config(
+        self,
+    ) -> GetCountingEventOfCurrentAnalysisConfig:
+        return GetCountingEventOfCurrentAnalysisConfig(self.current_export_config_state)
+
+    @cached_property
+    def get_num_processes_of_current_analysis_config(
+        self,
+    ) -> GetNumProcessesOfCurrentAnalysisConfig:
+        return GetNumProcessesOfCurrentAnalysisConfig(
+            self.current_static_analysis_config_state
+        )
+
+    @cached_property
+    def get_logfile_of_current_analysis_config(
+        self,
+    ) -> GetLogfileOfCurrentAnalysisConfig:
+        return GetLogfileOfCurrentAnalysisConfig(
+            self.current_static_analysis_config_state
+        )
+
+    @cached_property
+    def set_do_events_in_current_analysis_config(
+        self,
+    ) -> SetDoEventsInCurrentAnalysisConfig:
+        return SetDoEventsInCurrentAnalysisConfig(
+            self.current_static_analysis_config_state,
+            self.static_analysis_config_changed,
+        )
+
+    @cached_property
+    def set_do_counting_in_current_analysis_config(
+        self,
+    ) -> SetDoCountingInCurrentAnalysisConfig:
+        return SetDoCountingInCurrentAnalysisConfig(
+            self.current_static_analysis_config_state,
+            self.static_analysis_config_changed,
+        )
+
+    @cached_property
+    def set_save_name_in_current_analysis_config(
+        self,
+    ) -> SetSaveNameInCurrentAnalysisConfig:
+        return SetSaveNameInCurrentAnalysisConfig(
+            self.current_export_config_state, self.static_analysis_config_changed
+        )
+
+    @cached_property
+    def set_save_suffix_in_current_analysis_config(
+        self,
+    ) -> SetSaveSuffixInCurrentAnalysisConfig:
+        return SetSaveSuffixInCurrentAnalysisConfig(
+            self.current_export_config_state, self.static_analysis_config_changed
+        )
+
+    @cached_property
+    def set_event_formats_in_current_analysis_config(
+        self,
+    ) -> SetEventFormatsInCurrentAnalysisConfig:
+        return SetEventFormatsInCurrentAnalysisConfig(
+            self.current_export_config_state, self.static_analysis_config_changed
+        )
+
+    @cached_property
+    def set_count_intervals_in_current_analysis_config(
+        self,
+    ) -> SetCountIntervalsInCurrentAnalysisConfig:
+        return SetCountIntervalsInCurrentAnalysisConfig(
+            self.current_export_config_state, self.static_analysis_config_changed
+        )
+
+    @cached_property
+    def set_counting_event_in_current_analysis_config(
+        self,
+    ) -> SetCountingEventInCurrentAnalysisConfig:
+        return SetCountingEventInCurrentAnalysisConfig(
+            self.current_export_config_state, self.static_analysis_config_changed
+        )
+
+    @cached_property
+    def set_num_processes_in_current_analysis_config(
+        self,
+    ) -> SetNumProcessesInCurrentAnalysisConfig:
+        return SetNumProcessesInCurrentAnalysisConfig(
+            self.current_static_analysis_config_state,
+            self.static_analysis_config_changed,
+        )
+
+    @cached_property
+    def set_logfile_in_current_analysis_config(
+        self,
+    ) -> SetLogfileInCurrentAnalysisConfig:
+        return SetLogfileInCurrentAnalysisConfig(
+            self.current_static_analysis_config_state,
+            self.static_analysis_config_changed,
+        )
+
+    @cached_property
+    def current_export_config_state(self) -> CurrentExportConfigState:
+        return self.current_static_analysis_config_state.export_config
+
     @cached_property
     def static_analysis_config_form(self) -> StaticAnalysisConfigForm:
-        analysis_config_state = self.current_static_analysis_config_state
-        export_config_state = analysis_config_state.export_config
-        config_changed = self.static_analysis_config_changed
         return StaticAnalysisConfigForm(
             resource_manager=self.resource_manager,
-            get_do_events=GetDoEventsOfCurrentAnalysisConfig(analysis_config_state),
-            set_do_events=SetDoEventsInCurrentAnalysisConfig(
-                analysis_config_state, config_changed
-            ),
-            get_do_counting=GetDoCountingOfCurrentAnalysisConfig(analysis_config_state),
-            set_do_counting=SetDoCountingInCurrentAnalysisConfig(
-                analysis_config_state, config_changed
-            ),
-            get_save_name=GetSaveNameOfCurrentAnalysisConfig(export_config_state),
-            set_save_name=SetSaveNameInCurrentAnalysisConfig(
-                export_config_state, config_changed
-            ),
-            get_save_suffix=GetSaveSuffixOfCurrentAnalysisConfig(export_config_state),
-            set_save_suffix=SetSaveSuffixInCurrentAnalysisConfig(
-                export_config_state, config_changed
-            ),
-            get_event_formats=GetEventFormatsOfCurrentAnalysisConfig(
-                export_config_state
-            ),
-            set_event_formats=SetEventFormatsInCurrentAnalysisConfig(
-                export_config_state, config_changed
-            ),
-            get_count_intervals=GetCountIntervalsOfCurrentAnalysisConfig(
-                export_config_state
-            ),
-            set_count_intervals=SetCountIntervalsInCurrentAnalysisConfig(
-                export_config_state, config_changed
-            ),
-            get_counting_event=GetCountingEventOfCurrentAnalysisConfig(
-                export_config_state
-            ),
-            set_counting_event=SetCountingEventInCurrentAnalysisConfig(
-                export_config_state, config_changed
-            ),
-            get_num_processes=GetNumProcessesOfCurrentAnalysisConfig(
-                analysis_config_state
-            ),
-            set_num_processes=SetNumProcessesInCurrentAnalysisConfig(
-                analysis_config_state, config_changed
-            ),
-            get_logfile=GetLogfileOfCurrentAnalysisConfig(analysis_config_state),
-            set_logfile=SetLogfileInCurrentAnalysisConfig(
-                analysis_config_state, config_changed
-            ),
+            get_do_events=self.get_do_events_of_current_analysis_config,
+            set_do_events=self.set_do_events_in_current_analysis_config,
+            get_do_counting=self.get_do_counting_of_current_analysis_config,
+            set_do_counting=self.set_do_counting_in_current_analysis_config,
+            get_save_name=self.get_save_name_of_current_analysis_config,
+            set_save_name=self.set_save_name_in_current_analysis_config,
+            get_save_suffix=self.get_save_suffix_of_current_analysis_config,
+            set_save_suffix=self.set_save_suffix_in_current_analysis_config,
+            get_event_formats=self.get_event_formats_of_current_analysis_config,
+            set_event_formats=self.set_event_formats_in_current_analysis_config,
+            get_count_intervals=self.get_count_intervals_of_current_analysis_config,
+            set_count_intervals=self.set_count_intervals_in_current_analysis_config,
+            get_counting_event=self.get_counting_event_of_current_analysis_config,
+            set_counting_event=self.set_counting_event_in_current_analysis_config,
+            get_num_processes=self.get_num_processes_of_current_analysis_config,
+            set_num_processes=self.set_num_processes_in_current_analysis_config,
+            get_logfile=self.get_logfile_of_current_analysis_config,
+            set_logfile=self.set_logfile_in_current_analysis_config,
         )
 
     @cached_property
@@ -351,7 +467,12 @@ def track_statistic_form(self) -> TrackStatisticForm:
     @cached_property
     def ui_factory(self) -> UiFactory:
         return NiceGuiUiFactory(
-            self.resource_manager, self.run_config.file_picker_directory
+            self.resource_manager,
+            get_count_intervals=self.get_count_intervals_of_current_analysis_config,
+            get_counting_event=self.get_counting_event_of_current_analysis_config,
+            get_save_name=self.get_save_name_of_current_analysis_config,
+            get_save_suffix=self.get_save_suffix_of_current_analysis_config,
+            base_directory=self.run_config.file_picker_directory,
         )
 
     @cached_property