X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Tools.cpp;h=42ddf7318fdcc02e4f6521763f192386bd5dc4b9;hb=6f77dfcd9833cdba0c583e6218350f1f7043eb8b;hp=339d08369551b6128bcff4b93083563a4150848e;hpb=057e426145a26c02a1c5d6e1c220f92a17d8e53d;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Tools.cpp b/src/XGUI/XGUI_Tools.cpp
index 339d08369..42ddf7318 100644
--- a/src/XGUI/XGUI_Tools.cpp
+++ b/src/XGUI/XGUI_Tools.cpp
@@ -1,15 +1,20 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 #include "XGUI_Tools.h"
 
 #include <TopoDS_Shape.hxx>
+#include <ModelAPI_Object.h>
+#include <ModelAPI_Result.h>
+#include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_Feature.h>
+#include <GeomAPI_Shape.h>
 
 #include <QDir>
 
 #include <iostream>
 #include <sstream>
 
-namespace XGUI_Tools
-{
+namespace XGUI_Tools {
 //******************************************************************
 QString dir(const QString& path, bool isAbs)
 {
@@ -24,7 +29,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)
@@ -33,12 +38,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)
 {
@@ -50,24 +49,31 @@ QString addSlash(const QString& path)
 }
 
 //******************************************************************
-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));
-}
-
-//******************************************************************
-bool isModelObject(boost::shared_ptr<ModelAPI_Feature> theFeature)
+bool isModelObject(FeaturePtr theFeature)
 {
   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();
 }
 
-}
\ No newline at end of file
+//******************************************************************
+/*FeaturePtr realFeature(const FeaturePtr theFeature)
+ {
+ if (theFeature->data()) {
+ return theFeature;
+ } else {
+ ObjectPtr aObject = std::dynamic_pointer_cast<ModelAPI_Object>(theFeature);
+ return aObject->featureRef();
+ }
+ }*/
+
+
+
+}