X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FXGUI%2FXGUI_Tools.cpp;h=26672cd89bc4cdf295c2152632fe497bdb6c8048;hb=c2651507a52942e0632863b1e5e384396a285d25;hp=8ce0a36ac0bcb25349a31bd518513a43d995496f;hpb=e3cdcd3e1329acba45cd12baf064345ab94fd98b;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Tools.cpp b/src/XGUI/XGUI_Tools.cpp
index 8ce0a36ac..26672cd89 100644
--- a/src/XGUI/XGUI_Tools.cpp
+++ b/src/XGUI/XGUI_Tools.cpp
@@ -1,13 +1,17 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 #include "XGUI_Tools.h"
 
 #include <TopoDS_Shape.hxx>
-#include <ModelAPI_Feature.h>
+#include <ModelAPI_Object.h>
+#include <GeomAPI_Shape.h>
 
 #include <QDir>
 
 #include <iostream>
 #include <sstream>
 
+namespace XGUI_Tools {
 //******************************************************************
 QString dir(const QString& path, bool isAbs)
 {
@@ -22,7 +26,7 @@ QString dir(const QString& path, bool isAbs)
 QString file(const QString& path, bool withExt)
 {
   QString fPath = path;
-  while(!fPath.isEmpty() && (fPath[fPath.length() - 1] == '\\' || fPath[fPath.length() - 1] == '/'))
+  while (!fPath.isEmpty() && (fPath[fPath.length() - 1] == '\\' || fPath[fPath.length() - 1] == '/'))
     fPath.remove(fPath.length() - 1, 1);
 
   if (withExt)
@@ -31,12 +35,6 @@ QString file(const QString& path, bool withExt)
     return QFileInfo(fPath).completeBaseName();
 }
 
-//******************************************************************
-QString extension(const QString& path, bool full)
-{
-  return full ? QFileInfo(path).completeSuffix() : QFileInfo(path).suffix();
-}
-
 //******************************************************************
 QString addSlash(const QString& path)
 {
@@ -48,17 +46,29 @@ QString addSlash(const QString& path)
 }
 
 //******************************************************************
-QRect makeRect(const int x1, const int y1, const int x2, const int y2)
+bool isModelObject(FeaturePtr theFeature)
 {
-  return QRect(qMin(x1, x2), qMin(y1, y2), qAbs(x2 - x1), qAbs(y2 - y1));
+  return theFeature && !theFeature->data();
 }
 
 //******************************************************************
-std::string featureInfo(boost::shared_ptr<ModelAPI_Feature> theFeature)
+std::string featureInfo(FeaturePtr theFeature)
 {
-  std::ostringstream aStream; 
+  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();
+ }
+ }*/
+
+}