Rectangle correction to have coincidence with point/line selected for the first point...

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetShapeSelector.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 27b99ab853e266076c6125929484eff434e75157..b68e282b69630d35b31d42bb8790a3f5064adf2e 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -160,13 +160,6 @@ QList<ModuleBase_ViewerPrs> ModuleBase_WidgetShapeSelector::getAttributeSelectio
   return aSelected;
 }
 
-//********************************************************************
-void ModuleBase_WidgetShapeSelector::clearAttribute()
-{
-  // In order to make reselection possible, set empty object and shape should be done
-  setObject(ObjectPtr(), std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape()));
-}
-
 //********************************************************************
 bool ModuleBase_WidgetShapeSelector::restoreValueCustom()
 {
@@ -212,7 +205,10 @@ GeomShapePtr ModuleBase_WidgetShapeSelector::getShape() const
   if (aType == ModelAPI_AttributeReference::typeId()) {
   } else if (aType == ModelAPI_AttributeRefAttr::typeId()) {
     AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
-    aShape = myWorkshop->module()->findShape(aRefAttr);
+    if (aRefAttr.get() && !aRefAttr->isObject()) {
+      AttributePtr anAttribute = aRefAttr->attr();
+      aShape = myWorkshop->module()->findShape(anAttribute);
+    }
   } else if (aType == ModelAPI_AttributeSelection::typeId()) {
     AttributeSelectionPtr aSelectAttr = aData->selection(attributeID());
     aShape = aSelectAttr->value();
@@ -243,7 +239,7 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName()
       AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
       if (aRefAttr && aRefAttr->attr().get() != NULL) {
         //myIsObject = aRefAttr->isObject();
-        std::string anAttrName = generateName(aRefAttr->attr());
+        std::string anAttrName = generateName(aRefAttr->attr(), myWorkshop);
         myTextLine->setText(QString::fromStdString(anAttrName));
       }
       else {