Constriction type for all sketch entities

[modules/shaper.git] / src / XGUI / XGUI_Workshop.cpp

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 633b08dc2902516c45f1f4bc5a683b88b26a0864..7a7a820620845e76e33582eae1dac9610d84bff5 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -54,6 +54,7 @@
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_IViewer.h>
 #include<ModuleBase_FilterFactory.h>
+#include <ModuleBase_PageBase.h>
 
 #include <Config_Common.h>
 #include <Config_FeatureMessage.h>
@@ -647,7 +648,6 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation)
 
   myPropertyPanel->cleanContent();
   aFactory.createWidget(myPropertyPanel->contentWidget());
-  ModuleBase_Tools::zeroMargins(myPropertyPanel->contentWidget());
 
   QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
   foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
@@ -1335,7 +1335,6 @@ These features will be deleted also. Would you like to continue?")).arg(aNames),
       return;
   }
 
-  SessionPtr aMgr = ModelAPI_Session::get();
   QString aDescription = tr("Delete %1");
   QStringList aObjectNames;
   foreach (ObjectPtr aObj, theList) {
@@ -1344,6 +1343,7 @@ These features will be deleted also. Would you like to continue?")).arg(aNames),
     aObjectNames << QString::fromStdString(aObj->data()->name());
   }
   aDescription = aDescription.arg(aObjectNames.join(", "));
+  SessionPtr aMgr = ModelAPI_Session::get();
   aMgr->startOperation(aDescription.toStdString());
   std::set<FeaturePtr>::const_iterator anIt = aRefFeatures.begin(),
                                        aLast = aRefFeatures.end();
@@ -1405,40 +1405,81 @@ bool XGUI_Workshop::canChangeColor() const
 
 //**************************************************************
 #include <QDialog>
+#include <QDialogButtonBox>
 #include <QHBoxLayout>
-#include <QLineEdit>
+#include <QtxColorButton.h>
+#include <ModelAPI_AttributeColor.h>
 void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects)
 {
-  // 1. find the initial value of the material
-  std::string aFirstValue = "";
-  foreach(ObjectPtr anObj, theObjects)
-  {
+  // 1. find the initial value of the color
+  AttributeColorPtr aColorAttr;
+  foreach(ObjectPtr anObj, theObjects) {
     ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
-    if (aResult.get() == NULL)
-      continue;
+    if (aResult.get() != NULL) {
+      AttributePtr anAttr = aResult->data()->attribute(ModelAPI_Result::COLOR_ID());
+      if (anAttr.get() != NULL)
+        aColorAttr = std::dynamic_pointer_cast<ModelAPI_AttributeColor>(anAttr);
+    }
   }
+  // there is no object with the color attribute
+  if (aColorAttr.get() == NULL)
+    return;
+  int aRed, aGreen, aBlue;
+  aColorAttr->values(aRed, aGreen, aBlue);
 
   // 2. show the dialog to change the value
-  QDialog aDlg;
-  QHBoxLayout* aLay = new QHBoxLayout(&aDlg);
+  QDialog* aDlg = new QDialog();
+  QVBoxLayout* aLay = new QVBoxLayout(aDlg);
+
+  QtxColorButton* aColorBtn = new QtxColorButton(aDlg);
+  aColorBtn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
-  QLineEdit* anEditor = new QLineEdit("QString::number(theValue)", &aDlg);
-  anEditor->setText(aFirstValue.c_str());
-  anEditor->selectAll();
-  aLay->addWidget(anEditor);
+  aLay->addWidget(aColorBtn);
+  aColorBtn->setColor(QColor(aRed, aGreen, aBlue));
 
-  QPoint aPoint = QCursor::pos();
-  aDlg.move(aPoint);
+  QDialogButtonBox* aButtons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
+                                                    Qt::Horizontal, aDlg);
+  connect(aButtons, SIGNAL(accepted()), aDlg, SLOT(accept()));
+  connect(aButtons, SIGNAL(rejected()), aDlg, SLOT(reject()));
+  aLay->addWidget(aButtons);
 
-  bool isDone = aDlg.exec() == QDialog::Accepted;
+  aDlg->move(QCursor::pos());
+  bool isDone = aDlg->exec() == QDialog::Accepted;
   if (!isDone)
     return;
 
-  std::string aValue = anEditor->text().toStdString();
+  QColor aColorResult = aColorBtn->color();
+  int aRedResult = aColorResult.red(),
+      aGreenResult = aColorResult.green(),
+      aBlueResult = aColorResult.blue();
+
+  if (aRedResult == aRed && aGreenResult == aGreen && aBlueResult == aBlue)
+    return;
 
   // 3. abort the previous operation and start a new one
+  if(!isActiveOperationAborted())
+    return;
+  SessionPtr aMgr = ModelAPI_Session::get();
+  QString aDescription = contextMenuMgr()->action("DELETE_CMD")->text();
+  aMgr->startOperation(aDescription.toStdString());
 
   // 4. set the value to all results
+  static Events_ID EVENT_DISP = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
+  foreach(ObjectPtr anObj, theObjects) {
+    ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
+    if (aResult.get() != NULL) {
+      AttributePtr anAttr = aResult->data()->attribute(ModelAPI_Result::COLOR_ID());
+      if (anAttr.get() != NULL) {
+        aColorAttr = std::dynamic_pointer_cast<ModelAPI_AttributeColor>(anAttr);
+        if (aColorAttr.get() != NULL) {
+          aColorAttr->setValues(aRedResult, aGreenResult, aBlueResult);
+          ModelAPI_EventCreator::get()->sendUpdated(anObj, EVENT_DISP);
+        }
+      }
+    }
+  }
+  aMgr->finishOperation();
+  updateCommandStatus();
 }
 
 //**************************************************************