X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FXGUI%2FXGUI_ErrorMgr.cpp;h=9e379850c166e734290e95753d20f16c45c29c18;hb=0ade576714888ca38bd8e4766ad990773ea41124;hp=97a163665599dc67817db6f2b04ffd5772dd11cf;hpb=b070f5d30325537aa8cf883a55f8d3315115c384;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ErrorMgr.cpp b/src/XGUI/XGUI_ErrorMgr.cpp
index 97a163665..9e379850c 100644
--- a/src/XGUI/XGUI_ErrorMgr.cpp
+++ b/src/XGUI/XGUI_ErrorMgr.cpp
@@ -49,22 +49,40 @@ XGUI_ErrorMgr::~XGUI_ErrorMgr()
 
 void XGUI_ErrorMgr::updateActions(const FeaturePtr& theFeature)
 {
-  QString anError = myWorkshop->module()->getFeatureError(theFeature);
-
   //update Ok Action and header of property panel if the current operation started for the feature
   XGUI_ActionsMgr* anActionsMgr = workshop()->actionsMgr();
   ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
                                       (workshop()->operationMgr()->currentOperation());
   if (aFOperation && aFOperation->feature() == theFeature) {
     QAction* anOkAction = anActionsMgr->operationStateAction(XGUI_ActionsMgr::Accept);
-    updateActionState(anOkAction, theFeature);
+    
+    ModuleBase_ModelWidget* anActiveWidget = activeWidget();
+    bool isApplyEnabledByActiveWidget = false;
+    if (anActiveWidget)
+      isApplyEnabledByActiveWidget = anActiveWidget->getValueState() ==
+                                     ModuleBase_ModelWidget::ModifiedInPP;
+    QString anError = "";
+    QString aWidgetError = "";
+    if (!isApplyEnabledByActiveWidget) {
+      anError = myWorkshop->module()->getFeatureError(theFeature);
+      if (anActiveWidget)
+        aWidgetError = anActiveWidget->getError();
+      if (anError.isEmpty())
+        anError = aWidgetError;
+    }
+    updateActionState(anOkAction, anError);
+    updateToolTip(anActiveWidget, aWidgetError);
   }
 }
 
 void XGUI_ErrorMgr::updateAcceptAllAction(const FeaturePtr& theFeature)
 {
   QString anError = myWorkshop->module()->getFeatureError(theFeature);
-
+  if (anError.isEmpty()) {
+    ModuleBase_ModelWidget* anActiveWidget = activeWidget();
+    if (anActiveWidget)
+      anError = anActiveWidget->getError();
+  }
   XGUI_ActionsMgr* anActionsMgr = workshop()->actionsMgr();
   if (workshop()->isFeatureOfNested(theFeature)) {
     QAction* anAcceptAllAction = anActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll, NULL);
@@ -74,133 +92,49 @@ void XGUI_ErrorMgr::updateAcceptAllAction(const FeaturePtr& theFeature)
   }
 }
 
-bool XGUI_ErrorMgr::canProcessClick(QAction* theAction, const FeaturePtr& theFeature)
+bool XGUI_ErrorMgr::isApplyEnabled() const
 {
-  QString anError = myWorkshop->module()->getFeatureError(theFeature);
-  bool isActionEnabled = anError.isEmpty();
-  if (!isActionEnabled && !anError.isEmpty()) {
-    if (!myErrorDialog) {
-      myErrorDialog = new QDialog(QApplication::desktop(), Qt::Popup);
-      QHBoxLayout* aLay = new QHBoxLayout(myErrorDialog);
-      aLay->setContentsMargins(0, 0, 0, 0);
-
-      QFrame* aMarginWidget = new QFrame(myErrorDialog);
-      aMarginWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);
-
-      aLay->addWidget(aMarginWidget);
-      QHBoxLayout* aMarginLay = new QHBoxLayout(aMarginWidget);
-      aMarginLay->setContentsMargins(4, 4, 4, 4);
-
-      myErrorLabel = new QLabel(aMarginWidget);
-      aMarginLay->addWidget(myErrorLabel);
-    }
-    myErrorLabel->setText(anError);
-    myErrorDialog->move(QCursor::pos());
-    myErrorDialog->show();
+  bool isEnabled = false;
+  XGUI_ActionsMgr* anActionsMgr = workshop()->actionsMgr();
+  ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+                                      (workshop()->operationMgr()->currentOperation());
+  if (aFOperation) {
+    QAction* anOkAction = anActionsMgr->operationStateAction(XGUI_ActionsMgr::Accept);
+    isEnabled = anOkAction && anOkAction->isEnabled();
   }
-  return isActionEnabled;
+  return isEnabled;
 }
 
-void XGUI_ErrorMgr::updateActionState(QAction* theAction, const FeaturePtr& theFeature/*,
-                                      const bool theEnabled*/)
+void XGUI_ErrorMgr::updateActionState(QAction* theAction, const QString& theError)
 {
-  QString anError = myWorkshop->module()->getFeatureError(theFeature);
-  bool anEnabled = anError.isEmpty();
-
-  bool isActionEnabled = theAction->data() != INVALID_VALUE;
-  if (anEnabled  != isActionEnabled) {
-    // update enable state of the button
-    theAction->setIcon(anEnabled ? QIcon(":pictures/button_ok.png"): QIcon(":pictures/button_ok_error.png"));
-    if (anEnabled)
-      theAction->setData("");
-    else
-      theAction->setData(INVALID_VALUE);
-  }
+  bool anEnabled = theError.isEmpty();
+
+  theAction->setEnabled(anEnabled);
   // some operations have no property panel, so it is important to check that it is not null
   if (myPropertyPanel) {
     // update controls error information
     QWidget* aWidget = myPropertyPanel->headerWidget();
     if (aWidget)
-      aWidget->setToolTip(anError);
+      aWidget->setToolTip(theError);
   }
 }
-
-/*const char* toString(ModelAPI_ExecState theExecState) 
-{
-#define TO_STRING(__NAME__) case __NAME__: return #__NAME__;
-  switch (theExecState) {
-  TO_STRING(ModelAPI_StateDone)
-  TO_STRING(ModelAPI_StateMustBeUpdated)
-  TO_STRING(ModelAPI_StateExecFailed)
-  TO_STRING(ModelAPI_StateInvalidArgument)
-  TO_STRING(ModelAPI_StateNothing)
-  default: return "Unknown ExecState.";
-  }
-#undef TO_STRING
-}*/
-
-/*void XGUI_ErrorMgr::onValidationStateChanged()
-{
-  XGUI_OperationMgr* anOperationMgr = dynamic_cast<XGUI_OperationMgr*>(sender());
-  if (!anOperationMgr)
-    return;
-  ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
-                                                  (anOperationMgr->currentOperation());
-  if (!myPropertyPanel || !aFOperation)
-    return;
-
-  FeaturePtr aFeature = aFOperation->feature();
-  QString anError = getFeatureError(aFeature);
-
-  QWidget* aWidget = myPropertyPanel->headerWidget();
-  if (aWidget) {
-    aWidget->setToolTip(anError);
-    aWidget->setStyleSheet(anError.isEmpty() ? "" : "background-color:pink;");
-  }
-}*/
-
-/*QString XGUI_ErrorMgr::getFeatureError(const FeaturePtr& theFeature) const
-{
-  QString anError;
-  // get feature
-  if (!theFeature.get() || !theFeature->data()->isValid())
-    return anError;
-
-  // set error indication
-  anError = QString::fromStdString(theFeature->error());
-  if (anError.isEmpty()) {
-    bool isDone = ( theFeature->data()->execState() == ModelAPI_StateDone
-                 || theFeature->data()->execState() == ModelAPI_StateMustBeUpdated );
-    if (!isDone)
-      anError = toString(theFeature->data()->execState());
-  }
-
-  return anError;
-}*/
-
 void XGUI_ErrorMgr::onWidgetChanged()
 {
-  static ModelAPI_ValidatorsFactory* aValidators = ModelAPI_Session::get()->validators();
-
   ModuleBase_ModelWidget* aModelWidget = dynamic_cast<ModuleBase_ModelWidget*>(sender());
   if (!aModelWidget || !aModelWidget->feature().get())
     return;
 
-  std::string anAttributeID = aModelWidget->attributeID();
-  AttributePtr anAttribute = aModelWidget->feature()->attribute(anAttributeID);
-  if (!anAttribute.get())
-    return;
+  QString aWidgetError = aModelWidget->getError();
+  updateToolTip(aModelWidget, aWidgetError);
+}
 
-  std::string aValidatorID;
-  std::string anErrorMsg;
-  if (!aValidators->validate(anAttribute, aValidatorID, anErrorMsg)) {
-    if (anErrorMsg.empty())
-      anErrorMsg = "unknown error.";
-    anErrorMsg = anAttributeID + " - " + aValidatorID + ": " + anErrorMsg;
-  }
+void XGUI_ErrorMgr::updateToolTip(ModuleBase_ModelWidget* theWidget,
+                                  const QString& theError)
+{
+  if (!theWidget)
+    return;
 
-  QString anError = QString::fromStdString(anErrorMsg);
-  QList<QWidget*> aWidgetList = aModelWidget->getControls();
+  QList<QWidget*> aWidgetList = theWidget->getControls();
   foreach(QWidget* aWidget, aWidgetList) {
     QLabel* aLabel = qobject_cast<QLabel*>(aWidget);
     // We won't set the effect to QLabels - it looks ugly
@@ -209,10 +143,10 @@ void XGUI_ErrorMgr::onWidgetChanged()
     // Get the original tool tip of the widget
     QString aTTip = aWidget->toolTip().section("Errors:\n", 0, 0).trimmed();
     // Add the error message into the tool tip
-    if (!anError.isEmpty()) {
+    if (!theError.isEmpty()) {
       if (!aTTip.isEmpty())
         aTTip.append('\n');
-      aTTip += "Errors:\n" + anError;
+      aTTip += "Errors:\n" + theError;
     }
     aWidget->setToolTip(aTTip);
     //aWidget->setStyleSheet(anError.isEmpty() ? "" : "background-color:pink;");
@@ -224,3 +158,19 @@ XGUI_Workshop* XGUI_ErrorMgr::workshop() const
   XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
   return aConnector->workshop();
 }
+
+ModuleBase_ModelWidget* XGUI_ErrorMgr::activeWidget() const
+{
+  ModuleBase_ModelWidget* anActiveWidget = 0;
+
+  ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+                                      (workshop()->operationMgr()->currentOperation());
+  if (aFOperation) {
+    ModuleBase_IPropertyPanel* aPropertyPanel = aFOperation->propertyPanel();
+    if (aPropertyPanel) {
+      anActiveWidget = aPropertyPanel->activeWidget();
+    }
+  }
+  return anActiveWidget;
+}
+