Changeset e757cda7 in OpenModelica

Timestamp:

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

Author:

anotheruserofgithub <96748782+anotheruserofgithub@…>

Children:

7aafc15

Parents:

ee088cb

git-author:

anotheruserofgithub <96748782+anotheruserofgithub@…> (03/23/23 09:18:12)

git-committer:

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

Message:

Clean up functions for CAD file checks

Location:

OMEdit/OMEditLIB/Animation

Files:

• AnimationUtil.h (modified) (3 diffs)
• Visualization.cpp (modified) (2 diffs)

OMEdit/OMEditLIB/Animation/AnimationUtil.h

@@ -36 +36 @@
 #define ANIMATIONUTIL_H
 
+#include <QFileInfo>
 #include <QString>
-#include <QRegExp>
-#include <QFileInfo>
 
-#include <QOpenGLContext> // must be included before OSG headers
-
-#include <sys/stat.h>
 #include <string>
-#include <osg/Vec3>
 
 #include "MainWindow.h"
@@ -126 +121 @@
 }
 
-/*! \brief Checks if the type is a cad file
+/*!
+ * \brief Gets the filename of the CAD file
  */
-inline bool isCADType(const std::string& typeName)
+inline std::string extractCADFilename(const std::string& typeName)
 {
-  return ((typeName.size() >= 12 && std::string(typeName.begin(), typeName.begin() + 11) == "modelica://")
-          || (typeName.size() >= 8 && std::string(typeName.begin(), typeName.begin() + 7) == "file://"));
-}
-
-
-inline bool dxfFileType(const std::string& typeName)
-{
-  return typeName.substr(typeName.size()-3) == std::string("dxf");
-}
-
-inline bool stlFileType(const std::string& typeName)
-{
-  return typeName.substr(typeName.size()-3) == std::string("stl");
-}
-
-inline bool objFileType(const std::string& typeName)
-{
-  return typeName.substr(typeName.size()-3) == std::string("obj");
-}
-
-inline bool tdsFileType(const std::string& typeName)
-{
-  return typeName.substr(typeName.size()-3) == std::string("3ds");
-}
-
-
-/*! \brief Get file name of the cad file
- */
-inline std::string extractCADFilename(const std::string& s)
-{
-  QString str(s.c_str());
+  QString str(typeName.c_str());
   if (str.startsWith("modelica://")) {
     const QString absoluteFileName = MainWindow::instance()->getOMCProxy()->uriToFilename(str);
     return absoluteFileName.toStdString();
   } else {
-    std::string fileKey = "file://";
-    std::string s2 = s.substr(fileKey.length(), s.length());
-    return s2;
+    const std::string fileKey = "file://";
+    return typeName.substr(fileKey.length(), typeName.length());
   }
+}
+
+/*!
+ * \brief Checks if the type is a CAD file
+ */
+inline bool isCADFile(const std::string& typeName)
+{
+  return ((typeName.size() >= 12 && std::string(typeName.begin(), typeName.begin() + 11) == "modelica://") ||
+          (typeName.size() >=  8 && std::string(typeName.begin(), typeName.begin() +  7) == "file://"));
+}
+
+inline bool isDXFFile(const std::string& fileName)
+{
+  return fileName.substr(fileName.size() - 3) == "dxf";
+}
+
+inline bool isSTLFile(const std::string& fileName)
+{
+  return fileName.substr(fileName.size() - 3) == "stl";
+}
+
+inline bool isOBJFile(const std::string& fileName)
+{
+  return fileName.substr(fileName.size() - 3) == "obj";
+}
+
+inline bool is3DSFile(const std::string& fileName)
+{
+  return fileName.substr(fileName.size() - 3) == "3ds";
 }
 
@@ -176 +170 @@
 }
 
-
 #endif //ANIMATIONUTIL_H

OMEdit/OMEditLIB/Animation/Visualization.cpp

@@ -318 +318 @@
     shape._type = std::string(expNode->value());
 
-    if (isCADType(shape._type))
+    if (isCADFile(shape._type))
     {
       shape._fileName = extractCADFilename(shape._type);
@@ -329 +329 @@
       }
 
-      if (dxfFileType(shape._fileName)) {
+      if (isDXFFile(shape._fileName)) {
         shape._type = "dxf";
-      } else if (stlFileType(shape._fileName)) {
+      } else if (isSTLFile(shape._fileName)) {
         shape._type = "stl";
-      } else if (objFileType(shape._fileName)) {
+      } else if (isOBJFile(shape._fileName)) {
         shape._type = "obj";
-      } else if (tdsFileType(shape._fileName)) {
+      } else if (is3DSFile(shape._fileName)) {
         shape._type = "3ds";
       }