ticket:4975 Fixed handling of simulation options.

Start with the default simulation options, then apply the experiment and __OpenModelica_simulationFlags annotation. After that all the user changes of simulation options are stored inside OMEdit.
OpenModelica · Jul 12, 2018 · 857e886 · 857e886
1 parent bcacb27
commit 857e886
Show file tree

Hide file tree

Showing 33 changed files with 758 additions and 623 deletions.
diff --git a/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp
@@ -34,6 +34,7 @@
 
 #include "MainWindow.h"
 #include "LineAnnotation.h"
+#include "Modeling/ItemDelegate.h"
 #include "Modeling/Commands.h"
 
 #include <QMessageBox>

diff --git a/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp
@@ -36,7 +36,6 @@
 #include "Util/Helper.h"
 #include "MainWindow.h"
 #include "Options/OptionsDialog.h"
-#include "Modeling/ModelWidgetContainer.h"
 #include "ShapePropertiesDialog.h"
 #include "Modeling/Commands.h"
 #include "Component/ComponentProperties.h"

diff --git a/OMEdit/OMEditGUI/Debugger/Attach/AttachToProcessDialog.cpp b/OMEdit/OMEditGUI/Debugger/Attach/AttachToProcessDialog.cpp
@@ -33,11 +33,13 @@
 
 #include "AttachToProcessDialog.h"
 #include "Modeling/LibraryTreeWidget.h"
+#include "Modeling/ItemDelegate.h"
 #include "Options/OptionsDialog.h"
 #include "Debugger/GDB/GDBAdapter.h"
 
 #include <QHeaderView>
 #include <QMessageBox>
+#include <QGridLayout>
 
 /*!
  * \class AttachToProcessDialog

diff --git a/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointDialog.cpp b/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointDialog.cpp
@@ -34,13 +34,16 @@
 #include "BreakpointDialog.h"
 #include "MainWindow.h"
 #include "BreakpointsWidget.h"
+#include "BreakpointMarker.h"
 #include "Util/Helper.h"
 #include "Util/Utilities.h"
 #include "Modeling/LibraryTreeWidget.h"
 #include "Modeling/ModelicaClassDialog.h"
+#include "Modeling/ModelWidgetContainer.h"
 
 #include <limits>
 #include <QMessageBox>
+#include <QGridLayout>
 
 /*!
  * \class BreakpointDialog

diff --git a/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointsWidget.cpp b/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointsWidget.cpp
@@ -37,6 +37,7 @@
 #include "Debugger/GDB/CommandFactory.h"
 #include "Util/Helper.h"
 #include "Modeling/ModelWidgetContainer.h"
+#include "Modeling/ItemDelegate.h"
 
 #include <QGridLayout>
 #include <QMenu>

diff --git a/OMEdit/OMEditGUI/Debugger/DebuggerConfigurationsDialog.cpp b/OMEdit/OMEditGUI/Debugger/DebuggerConfigurationsDialog.cpp
@@ -33,6 +33,7 @@
 
 #include "DebuggerConfigurationsDialog.h"
 #include "Modeling/LibraryTreeWidget.h"
+#include "Modeling/ItemDelegate.h"
 #include "Debugger/GDB/GDBAdapter.h"
 #include "Util/Helper.h"
 #include "Util/StringHandler.h"

diff --git a/OMEdit/OMEditGUI/Debugger/GDB/GDBAdapter.cpp b/OMEdit/OMEditGUI/Debugger/GDB/GDBAdapter.cpp
@@ -1401,7 +1401,7 @@ void GDBAdapter::handleGDBProcessStarted()
  */
 void GDBAdapter::handleGDBProcessStartedForSimulation()
 {
-  QFileInfo resultFileInfo(QString(mSimulationOptions.getWorkingDirectory()).append("/").append(mSimulationOptions.getResultFileName()));
+  QFileInfo resultFileInfo(QString(mSimulationOptions.getWorkingDirectory()).append("/").append(mSimulationOptions.getFullResultFileName()));
   if (resultFileInfo.exists()) {
     mResultFileLastModifiedDateTime = resultFileInfo.lastModified();
   }

diff --git a/OMEdit/OMEditGUI/Debugger/Locals/LocalsWidget.cpp b/OMEdit/OMEditGUI/Debugger/Locals/LocalsWidget.cpp
@@ -34,12 +34,17 @@
 #include "Debugger/Locals/LocalsWidget.h"
 #include "MainWindow.h"
 #include "Modeling/LibraryTreeWidget.h"
+#include "Modeling/ItemDelegate.h"
 #include "Debugger/GDB/GDBAdapter.h"
 #include "Debugger/StackFrames/StackFramesWidget.h"
 #include "Debugger/Locals/ModelicaValue.h"
 #include "Debugger/GDB/CommandFactory.h"
 #include "Util/Helper.h"
 
+#include <QSplitter>
+#include <QGridLayout>
+#include <QHBoxLayout>
+
 /*!
  * \class LocalsTreeItem
  * \brief Contains the information about the local variable.

diff --git a/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.cpp b/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.cpp
@@ -35,12 +35,14 @@
 #include "Options/OptionsDialog.h"
 #include "MainWindow.h"
 #include "Modeling/LibraryTreeWidget.h"
+#include "Modeling/ItemDelegate.h"
 #include "Debugger/GDB/GDBAdapter.h"
 #include "Debugger/GDB/CommandFactory.h"
 #include "Debugger/Locals/LocalsWidget.h"
 
 #include <QMenu>
 #include <QMessageBox>
+#include <QHBoxLayout>
 
 StackFrameItem::StackFrameItem(QString level, QString address, QString function, QString line, QString file, QString fullName, StackFramesTreeWidget *pStackFramesTreeWidget)
   : QTreeWidgetItem(pStackFramesTreeWidget)

diff --git a/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp b/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp
@@ -35,14 +35,18 @@
 #include "ModelicaEditor.h"
 #include "MainWindow.h"
 #include "OMC/OMCProxy.h"
+#include "Modeling/LibraryTreeWidget.h"
+#include "Modeling/ModelWidgetContainer.h"
 #include "Options/OptionsDialog.h"
 #include "Debugger/Breakpoints/BreakpointMarker.h"
 #include "Util/Helper.h"
 #include "Options/NotificationsDialog.h"
+
 #include <QCompleter>
 #include <QMenu>
 #include <QMessageBox>
 
+
 /*!
  * \class ModelicaEditor
  * \brief An editor for Modelica Text.

diff --git a/OMEdit/OMEditGUI/FMI/ImportFMUDialog.cpp b/OMEdit/OMEditGUI/FMI/ImportFMUDialog.cpp
@@ -43,6 +43,7 @@
 #include "Git/CommitChangesDialog.h"
 
 #include <QMessageBox>
+#include <QGridLayout>
 
 /*!
  * \class ImportFMUDialog

diff --git a/OMEdit/OMEditGUI/FMI/ImportFMUModelDescriptionDialog.cpp b/OMEdit/OMEditGUI/FMI/ImportFMUModelDescriptionDialog.cpp
@@ -36,12 +36,14 @@
 #include "MainWindow.h"
 #include "OMC/OMCProxy.h"
 #include "Modeling/LibraryTreeWidget.h"
+#include "Modeling/ModelWidgetContainer.h"
 #include "Options/OptionsDialog.h"
 #include "Git/CommitChangesDialog.h"
 #include "Util/Helper.h"
 #include "Util/StringHandler.h"
 
 #include <QMessageBox>
+#include <QGridLayout>
 
 /*!
  * \class ImportFMUModelDescriptionDialog

diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -36,6 +36,7 @@
 #include "MainWindow.h"
 /* Keep PlotWindowContainer on top to include OSG first */
 #include "Plotting/PlotWindowContainer.h"
+#include "Modeling/ModelWidgetContainer.h"
 #include "Options/OptionsDialog.h"
 #include "Modeling/MessagesWidget.h"
 #include "Modeling/LibraryTreeWidget.h"