Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore selection in the viewer by multi selector widget activation.
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_Tools.cpp
diff --git
a/src/XGUI/XGUI_Tools.cpp
b/src/XGUI/XGUI_Tools.cpp
index 3148bc274b06024ee92ff0c92168b7826726455b..42ddf7318fdcc02e4f6521763f192386bd5dc4b9 100644
(file)
--- 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 "XGUI_Tools.h"
#include <TopoDS_Shape.hxx>
+#include <ModelAPI_Object.h>
+#include <ModelAPI_Result.h>
+#include <ModelAPI_ResultParameter.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Feature.h>
+#include <GeomAPI_Shape.h>
#include <QDir>
#include <iostream>
#include <sstream>
#include <QDir>
#include <iostream>
#include <sstream>
-namespace XGUI_Tools
-{
+namespace XGUI_Tools {
//******************************************************************
QString dir(const QString& path, bool isAbs)
{
//******************************************************************
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;
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)
fPath.remove(fPath.length() - 1, 1);
if (withExt)
@@
-33,12
+38,6
@@
QString file(const QString& path, bool withExt)
return QFileInfo(fPath).completeBaseName();
}
return QFileInfo(fPath).completeBaseName();
}
-//******************************************************************
-QString extension(const QString& path, bool full)
-{
- return full ? QFileInfo(path).completeSuffix() : QFileInfo(path).suffix();
-}
-
//******************************************************************
QString addSlash(const QString& path)
{
//******************************************************************
QString addSlash(const QString& path)
{
@@
-49,12
+48,6
@@
QString addSlash(const QString& path)
return res;
}
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)
{
//******************************************************************
bool isModelObject(FeaturePtr theFeature)
{
@@
-64,10
+57,23
@@
bool isModelObject(FeaturePtr theFeature)
//******************************************************************
std::string featureInfo(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();
}
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();
+ }
+ }*/
+
+
+
+}