Simulator updated with last Kjell improvements

companion/src/CMakeLists.txt

@@ -96,7 +96,7 @@ include_directories(
 add_subdirectory(modeledit)
 add_subdirectory(simulation)
 
-SET( companion_SRCS
+set(companion_SRCS
   eeprominterface.cpp
   hexinterface.cpp
   flashinterface.cpp
@@ -142,12 +142,12 @@ SET( companion_SRCS
   downloaddialog.cpp
   splashlibrary.cpp
   mainwindow.cpp
-     main.cpp
+  companion.cpp
   modelconfigdialog.cpp
   qcustomplot.cpp
 )
 
-SET( companion_MOC_HDRS
+set(companion_MOC_HDRS
   avroutputdialog.h
   apppreferencesdialog.h
   fwpreferencesdialog.h
@@ -171,7 +171,7 @@ SET( companion_MOC_HDRS
   helpers.h
 )
      
-SET( companion_UIS
+set(companion_UIS
   mdichild.ui
   avroutputdialog.ui
   comparedialog.ui
@@ -190,7 +190,7 @@ SET( companion_UIS
   modelconfigdialog.ui
 )
 
-SET( companion_RCS
+set(companion_RCS
   companion.qrc
   ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
 )
@@ -316,7 +316,8 @@ set(simu_SRCS
   file.cpp # TODO not needed
   modeledit/node.cpp
   modeledit/edge.cpp # TODO not needed
-  simulation/main.cpp
+  appdata.cpp
+  simulator.cpp
 )
 
 set(simu_HDRS

companion/src/appdata.cpp

@@ -3,6 +3,9 @@
 
 #include "appdata.h"
 
+// Global data and storage object
+AppData g;
+
 // ** CompStoreObj class********************
 void CompStoreObj::clear (const QString tag1, const QString tag2, const QString tag3)
 {

companion/src/appdata.h

@@ -235,7 +235,6 @@ private:
     int _theme;
     int _warningId;
 
-
   public:
     // All the get definitions
     QStringList recentFiles();

companion/src/companion.cpp

@@ -74,9 +74,6 @@ class MyProxyStyle : public QProxyStyle
  };
 #endif
 
-// Global data and storge object
-AppData g;
-
 int main(int argc, char *argv[])
 {
   Q_INIT_RESOURCE(companion);