Fixed merge conflicts.

Conflicts: OMEdit/OMEditGUI/Animation/Shapes.h OMEdit/OMEditGUI/Animation/Visualizer.h OMEdit/OMEditGUI/Animation/VisualizerMAT.h OMEdit/OMEditGUI/OMEditGUI.pro
OpenModelica · Nov 4, 2016 · e2917fe · e2917fe
2 parents 0a6f4ea + 9e0b740
commit e2917fe
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 37 deletions.
diff --git a/OMEdit/OMEditGUI/Animation/Shapes.h b/OMEdit/OMEditGUI/Animation/Shapes.h
@@ -36,10 +36,7 @@
 
 #include <iostream>
 
-#include "util/read_matlab4.h"
-#include "util/read_csv.h"
 #include "rapidxml.hpp"
-//#include "fmilib.h"
 #include <osg/Vec3f>
 #include <osg/Matrix>
 #include <osg/Uniform>
@@ -48,26 +45,26 @@
 class ShapeObjectAttribute
 {
  public:
-	ShapeObjectAttribute();
-	ShapeObjectAttribute(float value);
-	~ShapeObjectAttribute() = default;
-	std::string getValueString() const;
+  ShapeObjectAttribute();
+  ShapeObjectAttribute(float value);
+  ~ShapeObjectAttribute() = default;
+  std::string getValueString() const;
  public:
-	bool isConst;
-	float exp;
-	std::string cref;
-	//fmi1_value_reference_t fmuValueRef;
+  bool isConst;
+  float exp;
+  std::string cref;
+  //fmi1_value_reference_t fmuValueRef;
 };
 
 class ShapeObject
 {
  public:
-	ShapeObject();
-	~ShapeObject() = default;
-	ShapeObject(const ShapeObject&) = default;
-	ShapeObject& operator=(const ShapeObject&) = default;
-	void dumpVisAttributes() const;
-	//void fetchVisAttributes(rapidxml::xml_node<>* node, ModelicaMatReader matReader,/* fmi1_import_t* fmu,*/ double time, bool useFMU);
+  ShapeObject();
+  ~ShapeObject() = default;
+  ShapeObject(const ShapeObject&) = default;
+  ShapeObject& operator=(const ShapeObject&) = default;
+  void dumpVisAttributes() const;
+  //void fetchVisAttributes(rapidxml::xml_node<>* node, ModelicaMatReader matReader,/* fmi1_import_t* fmu,*/ double time, bool useFMU);
  public:
   std::string _id;
   std::string _type;

diff --git a/OMEdit/OMEditGUI/Animation/Visualizer.h b/OMEdit/OMEditGUI/Animation/Visualizer.h
@@ -66,7 +66,6 @@ class UpdateVisitor : public osg::NodeVisitor
   UpdateVisitor& operator=(const UpdateVisitor& uv) = delete;
   virtual void apply(osg::Geode& node);
   virtual void apply(osg::MatrixTransform& node);
-
 public:
   ShapeObject _shape;
 };

diff --git a/OMEdit/OMEditGUI/Animation/VisualizerMAT.h b/OMEdit/OMEditGUI/Animation/VisualizerMAT.h
@@ -36,6 +36,7 @@
 #define VISUALIZERMAT_H
 
 #include "Visualizer.h"
+#include "util/read_matlab4.h"
 
 class VisualizerMAT : public VisualizerAbstract
 {

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -95,6 +95,7 @@ win32 {
     $$(OMBUILDDIR)/include/omc/antlr3 $$(OMBUILDDIR)/include/omc/c
 
   RC_FILE = rc_omedit.rc
+  CONFIG += osg
 } else { # Unix libraries and includes
   include(OMEdit.config)
   # On unix we use backtrace of execinfo.h which requires -rdynamic
@@ -129,14 +130,6 @@ SOURCES += main.cpp \
   Editors/MetaModelEditor.cpp \
   Editors/MetaModelicaEditor.cpp \
   Plotting/PlotWindowContainer.cpp \
-  ../../osgQt/GraphicsWindowQt.cpp \
-  Animation/AnimationWindow.cpp \
-  Animation/ExtraShapes.cpp \
-  Animation/Visualizer.cpp \
-  Animation/VisualizerMAT.cpp \
-  Animation/VisualizerCSV.cpp \
-  Animation/Shapes.cpp \
-  Animation/TimeManager.cpp \
   Component/Component.cpp \
   Annotations/ShapeAnnotation.cpp \
   Component/CornerItem.cpp \
@@ -200,17 +193,6 @@ HEADERS  += Util/Helper.h \
   Editors/MetaModelEditor.h \
   Editors/MetaModelicaEditor.h \
   #$$OPENMODELICAHOME/../OMCompiler/3rdParty/FMIL/build/fmilib.h \
-  ../../osgQt/OMEdit_GraphicsWindowQt.h \
-  ../../osgQt/Export \
-  Animation/AnimationWindow.h \
-  Animation/AnimationUtil.h \
-  Animation/ExtraShapes.h \
-  Animation/Visualizer.h \
-  Animation/VisualizerMAT.h \
-  Animation/VisualizerCSV.h \
-  Animation/Shapes.h \
-  Animation/TimeManager.h \
-  Animation/rapidxml.hpp \
   Plotting/PlotWindowContainer.h \
   Component/Component.h \
   Annotations/ShapeAnnotation.h \
@@ -256,6 +238,30 @@ HEADERS  += Util/Helper.h \
   CrashReport/backtrace.h \
   CrashReport/CrashReportDialog.h
 
+CONFIG(osg) {
+
+SOURCES += Animation/AnimationWindow.cpp \
+  Animation/ExtraShapes.cpp \
+  Animation/Visualizer.cpp \
+  Animation/VisualizerMAT.cpp \
+  Animation/VisualizerCSV.cpp \
+  Animation/Shapes.cpp \
+  Animation/TimeManager.cpp \
+  ../../osgQt/GraphicsWindowQt.cpp \
+
+HEADERS += Animation/AnimationWindow.h \
+  Animation/AnimationUtil.h \
+  Animation/ExtraShapes.h \
+  Animation/Visualizer.h \
+  Animation/VisualizerMAT.h \
+  Animation/VisualizerCSV.h \
+  Animation/Shapes.h \
+  Animation/TimeManager.h \
+  Animation/rapidxml.hpp \
+  ../../osgQt/OMEdit_GraphicsWindowQt.h \
+  ../../osgQt/Export
+}
+
 LIBS += -lqjson
 INCLUDEPATH += ../../qjson/build/include