Merge Dev_2.1.0 with PythonAPI branch

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

diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp
index 5d3643ab79a3b882a54a400c0a2f00b11c53dade..d33467c7e883cacdbf53e1a68fb6b07c31a90518 100755 (executable)
--- a/src/ModuleBase/ModuleBase_Tools.cpp
+++ b/src/ModuleBase/ModuleBase_Tools.cpp
@@ -34,6 +34,8 @@
 
 const double tolerance = 1e-7;
 
+//#define DEBUG_ACTIVATE_WINDOW
+//#define DEBUG_SET_FOCUS
 
 namespace ModuleBase_Tools {
 
@@ -71,6 +73,24 @@ void zeroMargins(QLayout* theLayout)
   theLayout->setSpacing(5);
 }
 
+void activateWindow(QWidget* theWidget, const QString& theInfo)
+{
+  theWidget->activateWindow();
+
+#ifdef DEBUG_ACTIVATE_WINDOW
+  qDebug(QString("activateWindow: %1").arg(theInfo).toStdString().c_str());
+#endif
+}
+
+void setFocus(QWidget* theWidget, const QString& theInfo)
+{
+  theWidget->setFocus();
+
+#ifdef DEBUG_SET_FOCUS
+  qDebug(QString("setFocus: %1").arg(theInfo).toStdString().c_str());
+#endif
+}
+
 QPixmap composite(const QString& theAdditionalIcon, const QString& theIcon)
 {
   QImage anIcon(theIcon);
@@ -245,11 +265,11 @@ void checkObjects(const QObjectPtrList& theObjects, bool& hasResult, bool& hasFe
     ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
     ResultParameterPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aResult);
 
-    hasResult = (aResult.get() != NULL);
-    hasFeature = (aFeature.get() != NULL);
-    hasParameter = (aConstruction.get() != NULL);
+    hasResult |= (aResult.get() != NULL);
+    hasFeature |= (aFeature.get() != NULL);
+    hasParameter |= (aConstruction.get() != NULL);
     if (hasFeature) 
-      hasSubFeature = (ModelAPI_Tools::compositeOwner(aFeature) != NULL);
+      hasSubFeature |= (ModelAPI_Tools::compositeOwner(aFeature) != NULL);
     if (hasFeature && hasResult  && hasParameter && hasSubFeature)
       break;
   }
@@ -258,7 +278,10 @@ void checkObjects(const QObjectPtrList& theObjects, bool& hasResult, bool& hasFe
 void setDefaultDeviationCoefficient(const TopoDS_Shape& theShape,
                                     const Handle(Prs3d_Drawer)& theDrawer)
 {
-  if (!theShape.IsNull() && theShape.ShapeType() == TopAbs_EDGE)
+  if (theShape.IsNull())
+    return;
+  TopAbs_ShapeEnum aType = theShape.ShapeType();
+  if ((aType == TopAbs_EDGE) || (aType == TopAbs_WIRE)) 
     theDrawer->SetDeviationCoefficient(1.e-4);
 }