X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Tools.cpp;h=1d87b4ae22475427772f15b6eefe99eb075f9f67;hb=5fd2e5839ff05612b8258e55f1eaa8f1bf0d92ae;hp=6639a548af29b5a294a5a29f05ff89e3db655e71;hpb=0c46f6519b30378dd74a1337697f774060adb4c1;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp
index 6639a548a..1d87b4ae2 100644
--- a/src/ModuleBase/ModuleBase_Tools.cpp
+++ b/src/ModuleBase/ModuleBase_Tools.cpp
@@ -8,6 +8,11 @@
 
 #include <ModelAPI_Result.h>
 #include <ModelAPI_Data.h>
+#include <ModelAPI_Attribute.h>
+#include <ModelAPI_AttributeRefAttr.h>
+
+#include <GeomDataAPI_Point2D.h>
+#include <Events_Error.h>
 
 #include <QWidget>
 #include <QLayout>
@@ -109,7 +114,7 @@ void setSpinValue(QDoubleSpinBox* theSpin, double theValue)
   theSpin->blockSignals(isBlocked);
 }
 
-QString objectInfo(const ObjectPtr& theObj)
+QString objectInfo(const ObjectPtr& theObj, const bool isUseAttributesInfo)
 {
   ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
   FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObj);
@@ -121,11 +126,60 @@ QString objectInfo(const ObjectPtr& theObj)
   if (aFeature.get()) {
     aFeatureStr.append(QString(": %1").arg(aFeature->getKind().c_str()).toStdString().c_str());
     if (aFeature->data().get() && aFeature->data()->isValid())
-      aFeatureStr.append(QString("(name=%1)").arg(aFeature->data()->name().c_str()).toStdString().c_str());
+      aFeatureStr.append(QString(", name=%1").arg(aFeature->data()->name().c_str()).toStdString()
+                                                                                       .c_str());
+    if (isUseAttributesInfo) {
+      std::list<AttributePtr> anAttrs = aFeature->data()->attributes("");
+      std::list<AttributePtr>::const_iterator anIt = anAttrs.begin(), aLast = anAttrs.end();
+      QStringList aValues;
+      for(; anIt != aLast; anIt++) {
+        AttributePtr anAttr = *anIt;
+        QString aValue = "not defined";
+        std::string aType = anAttr->attributeType();
+        if (aType == GeomDataAPI_Point2D::typeId()) {
+          std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+                                                                                         anAttr);
+          if (aPoint.get())
+            aValue = QString("(%1, %2)").arg(aPoint->x()).arg(aPoint->y());
+        }
+        else if (aType == ModelAPI_AttributeRefAttr::typeId()) {
+        }
+
+        aValues.push_back(QString("%1: %2").arg(anAttr->id().c_str()).arg(aValue).toStdString().c_str());
+      }
+      if (!aValues.empty())
+        aFeatureStr.append(QString(", attributes: %1").arg(aValues.join(", ").toStdString().c_str()));
+    }
   }
+
   return aFeatureStr;
 }
 
+typedef QMap<QString, TopAbs_ShapeEnum> ShapeTypes;
+static ShapeTypes MyShapeTypes;
+
+TopAbs_ShapeEnum shapeType(const QString& theType)
+{
+  if (MyShapeTypes.count() == 0) {
+    MyShapeTypes["face"] = TopAbs_FACE;
+    MyShapeTypes["faces"] = TopAbs_FACE;
+    MyShapeTypes["vertex"] = TopAbs_VERTEX;
+    MyShapeTypes["vertices"] = TopAbs_VERTEX;
+    MyShapeTypes["wire"] = TopAbs_WIRE;
+    MyShapeTypes["edge"] = TopAbs_EDGE;
+    MyShapeTypes["edges"] = TopAbs_EDGE;
+    MyShapeTypes["shell"] = TopAbs_SHELL;
+    MyShapeTypes["solid"] = TopAbs_SOLID;
+    MyShapeTypes["solids"] = TopAbs_SOLID;
+  }
+  QString aType = theType.toLower();
+  if (MyShapeTypes.contains(aType))
+    return MyShapeTypes[aType];
+  Events_Error::send("Shape type defined in XML is not implemented!");
+  return TopAbs_SHAPE;
+}
+
+
 }