X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=b8c78602c9726a482baac5d078488197c274f0e8;hb=031179ada6681b874314c450eeda806f9f8abd28;hp=b167f5a47d31f3afc287d0df3afee39e6442c80b;hpb=24f9658d6e124a268c6a3abcf24f07aa2dc6d268;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index b167f5a47..b8c78602c 100644
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -55,10 +55,10 @@
 
 
 PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
-                                                     ModuleBase_IWorkshop* theWorkshop,
-                                                     const Config_WidgetAPI* theData,
-                                                     const std::string& theParentId,
-                                                     bool toShowConstraints)
+                        ModuleBase_IWorkshop* theWorkshop,
+                        const Config_WidgetAPI* theData,
+                        const std::string& theParentId,
+                        const QMap<PartSet_Tools::ConstraintVisibleState, bool>& toShowConstraints)
 : ModuleBase_WidgetValidated(theParent, theWorkshop, theData, theParentId),
   myPreviewDisplayed(false)
 {
@@ -102,10 +102,23 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
 
   aLayout->addWidget(aViewBox);
 
-  myShowConstraints = new QCheckBox(tr("Show constraints"), this);
-  connect(myShowConstraints, SIGNAL(toggled(bool)), this, SIGNAL(showConstraintToggled(bool)));
-  myShowConstraints->setChecked(toShowConstraints);
-  aLayout->addWidget(myShowConstraints);
+  QMap<PartSet_Tools::ConstraintVisibleState, QString> aStates;
+  aStates[PartSet_Tools::Geometrical] = tr("Show geometrical constraints");
+  aStates[PartSet_Tools::Dimensional] = tr("Show dimensional constraints");
+
+  QMap<PartSet_Tools::ConstraintVisibleState, QString>::const_iterator anIt = aStates.begin(),
+                                                        aLast = aStates.end();
+  for (; anIt != aLast; anIt++) {
+    QCheckBox* aShowConstraints = new QCheckBox(anIt.value(), this);
+    connect(aShowConstraints, SIGNAL(toggled(bool)), this, SLOT(onShowConstraint(bool)));
+    aLayout->addWidget(aShowConstraints);
+
+    PartSet_Tools::ConstraintVisibleState aState = anIt.key();
+    myShowConstraints[aState] = aShowConstraints;
+
+    if (toShowConstraints.contains(aState))
+      aShowConstraints->setChecked(toShowConstraints[aState]);
+  }
 
   myStackWidget->addWidget(aSecondWgt);
   //setLayout(aLayout);
@@ -154,6 +167,45 @@ void PartSet_WidgetSketchLabel::onSelectionChanged()
   }
 }
 
+void PartSet_WidgetSketchLabel::onShowConstraint(bool theOn)
+{
+  QCheckBox* aSenderCheckBox = qobject_cast<QCheckBox*>(sender());
+
+  QMap<PartSet_Tools::ConstraintVisibleState, QCheckBox*>::const_iterator
+                          anIt = myShowConstraints.begin(), aLast = myShowConstraints.end();
+
+  PartSet_Tools::ConstraintVisibleState aState = PartSet_Tools::Geometrical;
+  bool aFound = false;
+  for (; anIt != aLast && !aFound; anIt++) {
+    aFound = anIt.value() == aSenderCheckBox;
+    if (aFound)
+      aState = anIt.key();
+  }
+  if (aFound)
+    emit showConstraintToggled(theOn, aState);
+}
+
+void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isFlushesActived,
+                                               bool& isAttributeSetInitializedBlocked)
+{
+  ModuleBase_WidgetValidated::blockAttribute(theToBlock, isFlushesActived,
+                                             isAttributeSetInitializedBlocked);
+  // We do not restore the previous state of isAttributeSetInitializedBlocked for each of
+  // attributes. It it is necessary, these states should be append to the method attributes
+  // or stored in the widget
+
+  std::list<AttributePtr> anAttributes = myFeature->data()->attributes("");
+  std::list<AttributePtr>::const_iterator anIt = anAttributes.begin(), aLast = anAttributes.end();
+  QStringList aValues;
+  for(; anIt != aLast; anIt++) {
+    AttributePtr anAttribute = *anIt;
+    if (theToBlock)
+      anAttribute->blockSetInitialized(true);
+    else
+      anAttribute->blockSetInitialized(isAttributeSetInitializedBlocked);
+  }
+}
+
 void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs)
 {
   // 1. hide main planes if they have been displayed
@@ -235,7 +287,7 @@ std::shared_ptr<GeomAPI_Pln> PartSet_WidgetSketchLabel::plane() const
 
 bool PartSet_WidgetSketchLabel::focusTo()
 {
-  myStackWidget->setFocus();
+  ModuleBase_Tools::setFocus(myStackWidget, "PartSet_WidgetSketchLabel::focusTo()");
   return true;
 }
 
@@ -338,10 +390,13 @@ void PartSet_WidgetSketchLabel::activateCustom()
 void PartSet_WidgetSketchLabel::deactivate()
 {
   ModuleBase_ModelWidget::deactivate();
+  bool aHidePreview = myPreviewDisplayed;
   erasePreviewPlanes();
   activateSelection(false);
 
   activateFilters(false);
+  if (aHidePreview)
+    myWorkshop->viewer()->update();
 }
 
 void PartSet_WidgetSketchLabel::activateSelection(bool toActivate)
@@ -470,12 +525,6 @@ std::shared_ptr<GeomAPI_Dir> PartSet_WidgetSketchLabel::setSketchPlane(const Top
   return aDir;
 }
 
-void PartSet_WidgetSketchLabel::showConstraints(bool theOn)
-{
-  myShowConstraints->setChecked(theOn);
-  emit showConstraintToggled(theOn);
-}
-
 XGUI_Workshop* PartSet_WidgetSketchLabel::workshop() const
 {
   XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);