X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Tools.cpp;h=26672cd89bc4cdf295c2152632fe497bdb6c8048;hb=965adcb3288bda478cdd045d4b2f90c92980d099;hp=5cf560636b93be6c263d9eea048d6b664f0c32b6;hpb=aee13db814508b4899bf67f4530d4831c0ddc499;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Tools.cpp b/src/XGUI/XGUI_Tools.cpp index 5cf560636..26672cd89 100644 --- a/src/XGUI/XGUI_Tools.cpp +++ b/src/XGUI/XGUI_Tools.cpp @@ -1,15 +1,17 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + #include "XGUI_Tools.h" #include #include +#include #include #include #include -namespace XGUI_Tools -{ +namespace XGUI_Tools { //****************************************************************** QString dir(const QString& path, bool isAbs) { @@ -24,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) @@ -33,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) { @@ -49,12 +45,6 @@ QString addSlash(const QString& path) return res; } -//****************************************************************** -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(FeaturePtr theFeature) { @@ -64,21 +54,21 @@ bool isModelObject(FeaturePtr 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 = boost::dynamic_pointer_cast(theFeature); - return aObject->featureRef(); - } -} +/*FeaturePtr realFeature(const FeaturePtr theFeature) + { + if (theFeature->data()) { + return theFeature; + } else { + ObjectPtr aObject = std::dynamic_pointer_cast(theFeature); + return aObject->featureRef(); + } + }*/ }