Changeset 7aafc15 in OpenModelica

Timestamp:

2023-03-27T11:28:24+02:00 (13 months ago)

Author:

anotheruserofgithub <96748782+anotheruserofgithub@…>

Parents:

e757cda7

git-author:

anotheruserofgithub <96748782+anotheruserofgithub@…> (03/23/23 09:52:56)

git-committer:

anotheruserofgithub <96748782+anotheruserofgithub@…> (03/27/23 11:28:24)

Message:

Add helper functions for CAD type checks

Location:

OMEdit/OMEditLIB/Animation

Files:

• AnimationUtil.h (modified) (1 diff)
• ViewerWidget.cpp (modified) (3 diffs)
• ViewerWidget.h (modified) (1 diff)
• Visualization.cpp (modified) (9 diffs)

OMEdit/OMEditLIB/Animation/AnimationUtil.h

@@ -165 +165 @@
 }
 
+inline bool isDXFType(const std::string& type)
+{
+  return type == "DXF";
+}
+
+inline bool isSTLType(const std::string& type)
+{
+  return type == "STL";
+}
+
+inline bool isOBJType(const std::string& type)
+{
+  return type == "OBJ";
+}
+
+inline bool is3DSType(const std::string& type)
+{
+  return type == "3DS";
+}
+
+inline bool isCADType(const std::string& type)
+{
+  return isDXFType(type) || isSTLType(type) || isOBJType(type) || is3DSType(type);
+}
+
+inline bool isSimpleCADType(const std::string& type)
+{
+  return isDXFType(type) || isSTLType(type);
+}
+
+inline bool isAdvancedCADType(const std::string& type)
+{
+  return isOBJType(type) || is3DSType(type);
+}
+
 inline const char* boolToString(bool b)
 {

OMEdit/OMEditLIB/Animation/ViewerWidget.cpp

@@ -404 +404 @@
     if (mpSelectedVisualizer->isShape()) {
       ShapeObject* shape = mpSelectedVisualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0) {
-        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.compare("dxf") == 0 ? "DXF" : "STL");
+      if (isSimpleCADType(shape->_type)) {
+        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.c_str());
         MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg,
                                                               Helper::scriptingKind, Helper::notificationLevel));
@@ -427 +427 @@
     if (mpSelectedVisualizer->isShape()) {
       ShapeObject* shape = mpSelectedVisualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0) {
-        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.compare("dxf") == 0 ? "DXF" : "STL");
+      if (isSimpleCADType(shape->_type)) {
+        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.c_str());
         MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg,
                                                               Helper::scriptingKind, Helper::notificationLevel));
@@ -455 +455 @@
     if (mpSelectedVisualizer->isShape()) {
       ShapeObject* shape = mpSelectedVisualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0) {
-        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.compare("dxf") == 0 ? "DXF" : "STL");
+      if (isSimpleCADType(shape->_type)) {
+        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.c_str());
         MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg,
                                                               Helper::scriptingKind, Helper::notificationLevel));

OMEdit/OMEditLIB/Animation/ViewerWidget.h

@@ -48 +48 @@
 
 #include "AbstractAnimationWindow.h"
+#include "AnimationUtil.h"
 #include "Util/Helper.h"
 

OMEdit/OMEditLIB/Animation/Visualization.cpp

@@ -330 +330 @@
 
       if (isDXFFile(shape._fileName)) {
-        shape._type = "dxf";
+        shape._type = "DXF";
       } else if (isSTLFile(shape._fileName)) {
-        shape._type = "stl";
+        shape._type = "STL";
       } else if (isOBJFile(shape._fileName)) {
-        shape._type = "obj";
+        shape._type = "OBJ";
       } else if (is3DSFile(shape._fileName)) {
-        shape._type = "3ds";
+        shape._type = "3DS";
       }
     }
@@ -796 +796 @@
         // Store the radius of relevant shapes
         for (ShapeObject& shape : relevantShapes) {
-          // Consider OpenSceneGraph shape drawables only
-          if (shape._type.compare("dxf") == 0 || shape._type.compare("stl") == 0 ||
-              shape._type.compare("obj") == 0 || shape._type.compare("3ds") == 0) {
+          // Consider OSG shape drawables only
+          if (isCADType(shape._type)) {
             continue;
           }
@@ -1288 +1287 @@
     transf->setName(shape._id);
 
-    if (shape._type.compare("obj") == 0 or shape._type.compare("3ds") == 0)
+    if (isAdvancedCADType(shape._type))
     { //advanced cad node
       //std::cout<<"It's an advanced cad and the filename is "<<shape._fileName<<std::endl;
@@ -1299 +1298 @@
       }
     }
-    else if (shape._type.compare("stl") == 0)
+    else if (isSTLType(shape._type))
     { //stl node
       //std::cout<<"It's a stl and the filename is "<<shape._fileName<<std::endl;
@@ -1312 +1311 @@
       }
     }
-    else if (shape._type.compare("dxf") == 0)
+    else if (isDXFType(shape._type))
     { //geode with dxf drawable
       //std::cout<<"It's a dxf and the filename is "<<shape._fileName<<std::endl;
@@ -1430 +1429 @@
      {
       ShapeObject* shape = _visualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0 or
-          shape->_type.compare("obj") == 0 or shape->_type.compare("3ds") == 0)
+      if (isCADType(shape->_type))
       {
         //it's a cad file so we have to rescale the underlying geometry vertices
@@ -1568 +1566 @@
     if (_visualizer->isShape()) {
       ShapeObject* shape = _visualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0 or
-          shape->_type.compare("obj") == 0 or shape->_type.compare("3ds") == 0) {
+      if (isCADType(shape->_type)) {
         osg::ref_ptr<osg::Transform> transformNode = shape->getTransformNode();
         if (transformNode.valid() && transformNode->getNumChildren() > 0) {
@@ -1576 +1573 @@
             stateSet = cad->getOrCreateStateSet();
             geometryColors = !shape->getVisualProperties()->getColor().custom();
-            is3DSShape = shape->_type.compare("3ds") == 0;
+            is3DSShape = is3DSType(shape->_type);
           }
         }
@@ -1891 +1888 @@
 
   osg::Matrix3 T0;
-  if (type == "dxf" || type == "stl" || type == "obj" || type == "3ds")
+  if (isCADType(type))
   {
     T0 = osg::Matrix3(dirs._lDir[0], dirs._lDir[1], dirs._lDir[2],