Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

[modules/shaper.git] / src / XGUI / XGUI_Tools.cpp

diff --git a/src/XGUI/XGUI_Tools.cpp b/src/XGUI/XGUI_Tools.cpp
index 5a6edb29d77ba150e2aee93dcfa16d4ea399317f..26672cd89bc4cdf295c2152632fe497bdb6c8048 100644 (file)
--- a/src/XGUI/XGUI_Tools.cpp
+++ b/src/XGUI/XGUI_Tools.cpp
@@ -1,83 +1,74 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 #include "XGUI_Tools.h"
 
-#include <QDir>
-
-
-//******************************************************************
-QString library( const QString& str )
-{
-  QString path = dir( str, false );
-  QString name = file( str, false );
-  QString ext  = extension( str );
-
-#ifndef WIN32
-  if ( !name.startsWith( "lib" ) )
-    name = QString( "lib" ) + name;
-#endif
+#include <TopoDS_Shape.hxx>
+#include <ModelAPI_Object.h>
+#include <GeomAPI_Shape.h>
 
-#ifdef WIN32
-  QString libExt( "dll" );
-#else
-  QString libExt( "so" );
-#endif
-
-  if ( ext.toLower() != QString( "so" ) && ext.toLower() != QString( "dll" ) )
-  {
-    if ( !name.isEmpty() && !ext.isEmpty() )
-      name += QString( "." );
-    name += ext;
-  }
-
-  ext = libExt;
-
-  QString fileName = addSlash( path ) + name + QString( "." ) + ext;
+#include <QDir>
 
-  return fileName;
-}
+#include <iostream>
+#include <sstream>
 
+namespace XGUI_Tools {
 //******************************************************************
-QString dir( const QString& path, bool isAbs )
+QString dir(const QString& path, bool isAbs)
 {
-  QDir aDir = QFileInfo( path ).dir();
+  QDir aDir = QFileInfo(path).dir();
   QString dirPath = isAbs ? aDir.absolutePath() : aDir.path();
-  if ( dirPath == QString( "." ) )
+  if (dirPath == QString("."))
     dirPath = QString();
   return dirPath;
 }
 
-
 //******************************************************************
-QString file( const QString& path, bool withExt )
+QString file(const QString& path, bool withExt)
 {
   QString fPath = path;
-  while ( !fPath.isEmpty() && ( fPath[fPath.length() - 1] =='\\' || fPath[fPath.length() - 1] == '/' ) )
-    fPath.remove( fPath.length() - 1, 1 );
+  while (!fPath.isEmpty() && (fPath[fPath.length() - 1] == '\\' || fPath[fPath.length() - 1] == '/'))
+    fPath.remove(fPath.length() - 1, 1);
 
-  if ( withExt )
-    return QFileInfo( fPath ).fileName();
+  if (withExt)
+    return QFileInfo(fPath).fileName();
   else
-    return QFileInfo( fPath ).completeBaseName();
+    return QFileInfo(fPath).completeBaseName();
 }
 
 //******************************************************************
-QString extension( const QString& path, bool full )
+QString addSlash(const QString& path)
 {
-  return full ? QFileInfo( path ).completeSuffix() : QFileInfo( path ).suffix();
+  QString res = path;
+  if (!res.isEmpty() && res.at(res.length() - 1) != QChar('/')
+      && res.at(res.length() - 1) != QChar('\\'))
+    res += QDir::separator();
+  return res;
 }
 
 //******************************************************************
-QString addSlash( const QString& path )
+bool isModelObject(FeaturePtr theFeature)
 {
-  QString res = path;
-  if ( !res.isEmpty() && res.at( res.length() - 1 ) != QChar( '/' ) &&
-       res.at( res.length() - 1 ) != QChar( '\\' ) )
-  res += QDir::separator();
-  return res;
+  return theFeature && !theFeature->data();
 }
 
 //******************************************************************
-QRect makeRect( const int x1, const int y1, const int x2, const int y2 )
-{  
-  return QRect( qMin( x1, x2 ), qMin( y1, y2 ), qAbs( x2 - x1 ), qAbs( y2 - y1 ) );
+std::string featureInfo(FeaturePtr theFeature)
+{
+  std::ostringstream aStream;
+  if (theFeature)
+    aStream << theFeature.get() << " " << theFeature->getKind();
+  return QString(aStream.str().c_str()).toStdString();
+}
+
+//******************************************************************
+/*FeaturePtr realFeature(const FeaturePtr theFeature)
+ {
+ if (theFeature->data()) {
+ return theFeature;
+ } else {
+ ObjectPtr aObject = std::dynamic_pointer_cast<ModelAPI_Object>(theFeature);
+ return aObject->featureRef();
+ }
+ }*/
+
 }