From: nds <nds@opencascade.com>
Date: Mon, 21 Dec 2015 11:58:49 +0000 (+0300)
Subject: #1151 distance on preselected entity
X-Git-Tag: V_2.1.0~128
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f69985715f8aee363f8e4dc18879011791982842;p=modules%2Fshaper.git

#1151 distance on preselected entity
---

diff --git a/src/PartSet/PartSet_SketcherMgr.cpp b/src/PartSet/PartSet_SketcherMgr.cpp
index f46ae2c61..eddc693bd 100755
--- a/src/PartSet/PartSet_SketcherMgr.cpp
+++ b/src/PartSet/PartSet_SketcherMgr.cpp
@@ -984,55 +984,66 @@ void PartSet_SketcherMgr::operationActivatedByPreselection()
                                                                             (anOperation);
     if (aFOperation) {
       if (PartSet_SketcherMgr::isDistanceOperation(aFOperation)) {
-        // Activate dimension value editing on double click
-        ModuleBase_IPropertyPanel* aPanel = aFOperation->propertyPanel();
-        QList<ModuleBase_ModelWidget*> aWidgets = aPanel->modelWidgets();
-        // Find corresponded widget to activate value editing
-        foreach (ModuleBase_ModelWidget* aWgt, aWidgets) {
-          if (aWgt->attributeID() == "ConstraintValue") {
-            FeaturePtr aFeature = aFOperation->feature();
-            // the featue should be displayed in order to find the AIS text position,
-            // the place where the editor will be shown
-            aFeature->setDisplayed(true);
-            /// the execute is necessary to perform in the feature compute for flyout position
-            aFeature->execute();
-
-            Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
-            Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
-
-            PartSet_WidgetEditor* anEditor = dynamic_cast<PartSet_WidgetEditor*>(aWgt);
-            if (anEditor) {
-              int aX = 0, anY = 0;
-
-              ModuleBase_IWorkshop* aWorkshop = myModule->workshop();
-              XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(aWorkshop);
-              XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
-              AISObjectPtr anAIS = aDisplayer->getAISObject(aFeature);
-              Handle(AIS_InteractiveObject) anAISIO;
-              if (anAIS.get() != NULL) {
-                anAISIO = anAIS->impl<Handle(AIS_InteractiveObject)>();
-              }
-              if (anAIS.get() != NULL) {
-                Handle(AIS_InteractiveObject) anAISIO = anAIS->impl<Handle(AIS_InteractiveObject)>();
-
-                if (!anAISIO.IsNull()) {
-                  Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast(anAISIO);
-                  if (!aDim.IsNull()) {
-                    gp_Pnt aPosition = aDim->GetTextPosition();
-
-                    ModuleBase_IViewer* aViewer = aWorkshop->viewer();
-                    Handle(V3d_View) aView = aViewer->activeView();
-                    int aCX, aCY;
-                    aView->Convert(aPosition.X(), aPosition.Y(), aPosition.Z(), aCX, aCY);
-
-                    QWidget* aViewPort = aViewer->activeViewPort();
-                    QPoint aGlPoint = aViewPort->mapToGlobal(QPoint(aCX, aCY));
-                    aX = aGlPoint.x();
-                    anY = aGlPoint.y();
+        FeaturePtr aFeature = aFOperation->feature();
+        // editor is shown only if all attribute references are filled by preseletion
+        bool anAllRefAttrInitialized = true;
+
+        std::list<AttributePtr> aRefAttrs = aFeature->data()->attributes(
+                                                    ModelAPI_AttributeRefAttr::typeId());
+        std::list<AttributePtr>::const_iterator anIt = aRefAttrs.begin(), aLast = aRefAttrs.end();
+        for (; anIt != aLast && anAllRefAttrInitialized; anIt++) {
+          anAllRefAttrInitialized = (*anIt)->isInitialized();
+        }
+        if (anAllRefAttrInitialized) {
+          // Activate dimension value editing on double click
+          ModuleBase_IPropertyPanel* aPanel = aFOperation->propertyPanel();
+          QList<ModuleBase_ModelWidget*> aWidgets = aPanel->modelWidgets();
+          // Find corresponded widget to activate value editing
+          foreach (ModuleBase_ModelWidget* aWgt, aWidgets) {
+            if (aWgt->attributeID() == "ConstraintValue") {
+              // the featue should be displayed in order to find the AIS text position,
+              // the place where the editor will be shown
+              aFeature->setDisplayed(true);
+              /// the execute is necessary to perform in the feature compute for flyout position
+              aFeature->execute();
+
+              Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
+              Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
+
+              PartSet_WidgetEditor* anEditor = dynamic_cast<PartSet_WidgetEditor*>(aWgt);
+              if (anEditor) {
+                int aX = 0, anY = 0;
+
+                ModuleBase_IWorkshop* aWorkshop = myModule->workshop();
+                XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(aWorkshop);
+                XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
+                AISObjectPtr anAIS = aDisplayer->getAISObject(aFeature);
+                Handle(AIS_InteractiveObject) anAISIO;
+                if (anAIS.get() != NULL) {
+                  anAISIO = anAIS->impl<Handle(AIS_InteractiveObject)>();
+                }
+                if (anAIS.get() != NULL) {
+                  Handle(AIS_InteractiveObject) anAISIO = anAIS->impl<Handle(AIS_InteractiveObject)>();
+
+                  if (!anAISIO.IsNull()) {
+                    Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast(anAISIO);
+                    if (!aDim.IsNull()) {
+                      gp_Pnt aPosition = aDim->GetTextPosition();
+
+                      ModuleBase_IViewer* aViewer = aWorkshop->viewer();
+                      Handle(V3d_View) aView = aViewer->activeView();
+                      int aCX, aCY;
+                      aView->Convert(aPosition.X(), aPosition.Y(), aPosition.Z(), aCX, aCY);
+
+                      QWidget* aViewPort = aViewer->activeViewPort();
+                      QPoint aGlPoint = aViewPort->mapToGlobal(QPoint(aCX, aCY));
+                      aX = aGlPoint.x();
+                      anY = aGlPoint.y();
+                    }
                   }
+                  anEditor->setCursorPosition(aX, anY);
+                  anEditor->showPopupEditor(false);
                 }
-                anEditor->setCursorPosition(aX, anY);
-                anEditor->showPopupEditor(false);
               }
             }
           }