+ tab widget for simulation parameter refactored + wrong orig paramet…

…ers corrected
chrxh · Aug 24, 2024 · 3790482 · 3790482
1 parent 9f85da3
commit 3790482
Show file tree

Hide file tree

Showing 4 changed files with 1,908 additions and 1,870 deletions.
diff --git a/source/Gui/RadiationSourcesWindow.cpp b/source/Gui/RadiationSourcesWindow.cpp
@@ -21,34 +21,34 @@ void _RadiationSourcesWindow::processIntern()
 {
     auto parameters = _simController->getSimulationParameters();
 
-    std::optional<bool> scheduleAddTab;
-    std::optional<int> scheduleDelTabAtIndex;
+    std::optional<bool> scheduleAppendTab;
+    std::optional<int> scheduleDeleteTabAtIndex;
 
     if (ImGui::BeginTabBar("##ParticleSources", ImGuiTabBarFlags_AutoSelectNewTabs | ImGuiTabBarFlags_FittingPolicyResizeDown)) {
 
         if (parameters.numRadiationSources < MAX_RADIATION_SOURCES) {
 
             //add source
             if (ImGui::TabItemButton("+", ImGuiTabItemFlags_Trailing | ImGuiTabItemFlags_NoTooltip)) {
-                scheduleAddTab = true;
+                scheduleAppendTab = true;
             }
             AlienImGui::Tooltip("Add source");
         }
 
         for (int tab = 0; tab < parameters.numRadiationSources; ++tab) {
             if (!processTab(tab)) {
-                scheduleDelTabAtIndex = tab;
+                scheduleDeleteTabAtIndex = tab;
             }
         }
 
         ImGui::EndTabBar();
     }
 
-    if (scheduleAddTab.has_value()) {
-        processAppendTab();
+    if (scheduleAppendTab.has_value()) {
+        onAppendTab();
     }
-    if (scheduleDelTabAtIndex.has_value()) {
-        processDelTab(scheduleDelTabAtIndex.value());
+    if (scheduleDeleteTabAtIndex.has_value()) {
+        onDeleteTab(scheduleDeleteTabAtIndex.value());
     }
 }
 
@@ -171,7 +171,7 @@ bool _RadiationSourcesWindow::processTab(int index)
     return isOpen;
 }
 
-void _RadiationSourcesWindow::processAppendTab()
+void _RadiationSourcesWindow::onAppendTab()
 {
     auto parameters = _simController->getSimulationParameters();
     auto origParameters = _simController->getOriginalSimulationParameters();
@@ -186,7 +186,7 @@ void _RadiationSourcesWindow::processAppendTab()
     _simController->setOriginalSimulationParameters(origParameters);
 }
 
-void _RadiationSourcesWindow::processDelTab(int index)
+void _RadiationSourcesWindow::onDeleteTab(int index)
 {
     auto parameters = _simController->getSimulationParameters();
     auto origParameters = _simController->getOriginalSimulationParameters();

diff --git a/source/Gui/RadiationSourcesWindow.h b/source/Gui/RadiationSourcesWindow.h
@@ -12,9 +12,9 @@ class _RadiationSourcesWindow : public _AlienWindow
 private:
     void processIntern() override;
 
-    bool processTab(int index); //return false if tab is closed
-    void processAppendTab();
-    void processDelTab(int index);
+    bool processTab(int index); //return false if tab should be closed
+    void onAppendTab();
+    void onDeleteTab(int index);
 
     RadiationSource createParticleSource() const;