From: nds <nds@opencascade.com>
Date: Thu, 10 Dec 2015 08:14:52 +0000 (+0300)
Subject: #1042 Sometimes when setting distance constraints, the input field is not displayed... 
X-Git-Tag: V_2.1.0~197
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=60998d94a6dc8dd334a5050ddc671376f63549fa;p=modules%2Fshaper.git

#1042 Sometimes when setting distance constraints, the input field is not displayed in the 3D view

Code correction: moving the sketch functionality in the sketch manager.
---

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index 68d855a48..f919207fa 100755
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -473,77 +473,11 @@ void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* the
   anOpMgr->onKeyReleased(theEvent);
 }
 
-#include <XGUI_SalomeConnector.h>
 void PartSet_Module::onOperationActivatedByPreselection()
 {
   if (!mySketchReentrantMgr->canBeCommittedByPreselection())
     return;
-
-  ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
-  if(anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
-    // Set final definitions if they are necessary
-    //propertyPanelDefined(aOperation);
-    /// Commit sketcher operations automatically
-    ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
-                                                                            (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;
-              XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
-              XGUI_Workshop* aWorkshop = aConnector->workshop();
-              XGUI_Displayer* aDisplayer = aWorkshop->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 = myWorkshop->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);
-              }
-            }
-          }
-        }
-      }
-    }
-    anOperation->commit();
-  }
+  mySketchMgr->operationActivatedByPreselection();
 }
 
 ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
diff --git a/src/PartSet/PartSet_SketcherMgr.cpp b/src/PartSet/PartSet_SketcherMgr.cpp
index c308eea3a..f46ae2c61 100755
--- a/src/PartSet/PartSet_SketcherMgr.cpp
+++ b/src/PartSet/PartSet_SketcherMgr.cpp
@@ -68,6 +68,7 @@
 
 //#include <AIS_DimensionSelectionMode.hxx>
 #include <AIS_Shape.hxx>
+#include <AIS_Dimension.hxx>
 
 #include <ModelAPI_Events.h>
 #include <ModelAPI_Session.h>
@@ -972,6 +973,76 @@ void PartSet_SketcherMgr::commitNestedSketch(ModuleBase_Operation* theOperation)
   }
 }
 
+void PartSet_SketcherMgr::operationActivatedByPreselection()
+{
+  ModuleBase_Operation* anOperation = getCurrentOperation();
+  if(anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
+    // Set final definitions if they are necessary
+    //propertyPanelDefined(aOperation);
+    /// Commit sketcher operations automatically
+    ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+                                                                            (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();
+                  }
+                }
+                anEditor->setCursorPosition(aX, anY);
+                anEditor->showPopupEditor(false);
+              }
+            }
+          }
+        }
+      }
+    }
+    anOperation->commit();
+  }
+}
+
 bool PartSet_SketcherMgr::canUndo() const
 {
   return isNestedCreateOperation(getCurrentOperation());
diff --git a/src/PartSet/PartSet_SketcherMgr.h b/src/PartSet/PartSet_SketcherMgr.h
index 5d31e7d4a..71ba10312 100644
--- a/src/PartSet/PartSet_SketcherMgr.h
+++ b/src/PartSet/PartSet_SketcherMgr.h
@@ -133,6 +133,10 @@ public:
   /// \param theOperation a committed operation
   void commitNestedSketch(ModuleBase_Operation* theOperation);
 
+  /// Commit the operation if it is possible. If the operation is dimention constraint,
+  /// it gives widget editor to input dimention value
+  void operationActivatedByPreselection();
+
   /// Returns True if there are available Undos and the sketch manager allows undo
   /// \return the boolean result
   bool canUndo() const;