X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ModelWidget.cpp;h=86fe765daafc4e328d73f14677ec27471f799be4;hb=450d1bd65c11870d3942a30164518037b9a7503e;hp=11a884722518389d0db509315038d050f7762423;hpb=fb22ba72114328242bb0bd465abbca43321dcfe4;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp index 11a884722..86fe765da 100644 --- a/src/ModuleBase/ModuleBase_ModelWidget.cpp +++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp @@ -5,11 +5,13 @@ // Author: Natalia ERMOLAEVA #include "ModuleBase_ModelWidget.h" +#include "ModuleBase_Tools.h" #include #include #include #include +#include #include #include @@ -17,8 +19,6 @@ #include #include -#include -#include #include #include @@ -31,6 +31,8 @@ ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent, myState(Stored), myIsValueStateBlocked(false) { + myIsInternal = theData->getBooleanAttribute(ATTR_INTERNAL, false); + myDefaultValue = theData->getProperty(ATTR_DEFAULT); myUseReset = theData->getBooleanAttribute(ATTR_USE_RESET, true); myIsComputedDefault = theData->getProperty(ATTR_DEFAULT) == DOUBLE_WDG_DEFAULT_COMPUTED; @@ -65,10 +67,6 @@ QString ModuleBase_ModelWidget::getValueStateError() const if (anAttr.get()) { QString anAttributeName = anAttr->id().c_str(); switch (aState) { - case ModuleBase_ModelWidget::ModifiedInPP: - anError = "Attribute \"" + anAttributeName + - "\" modification is not applyed. Please click \"Enter\" or \"Tab\"."; - break; case ModuleBase_ModelWidget::ModifiedInViewer: anError = "Attribute \"" + anAttributeName + "\" is locked by modification value in the viewer."; @@ -76,23 +74,50 @@ QString ModuleBase_ModelWidget::getValueStateError() const case ModuleBase_ModelWidget::Reset: anError = "Attribute \"" + anAttributeName + "\" is not initialized."; break; + case ModuleBase_ModelWidget::ModifiedInPP: // Apply should be enabled in this mode + default: + break; } } } return anError; } +QString ModuleBase_ModelWidget::getError() const +{ + QString anError; + + if (!feature().get()) + return anError; + + std::string anAttributeID = attributeID(); + AttributePtr anAttribute = feature()->attribute(anAttributeID); + if (!anAttribute.get()) + return anError; + + std::string aValidatorID; + std::string anErrorMsg; + + static ModelAPI_ValidatorsFactory* aValidators = ModelAPI_Session::get()->validators(); + if (!aValidators->validate(anAttribute, aValidatorID, anErrorMsg)) { + if (anErrorMsg.empty()) + anErrorMsg = "unknown error."; + anErrorMsg = anAttributeID + " - " + aValidatorID + ": " + anErrorMsg; + } + + anError = QString::fromStdString(anErrorMsg); + if (anError.isEmpty()) + anError = getValueStateError(); + + return anError; +} + void ModuleBase_ModelWidget::enableFocusProcessing() { QList aMyControls = getControls(); foreach(QWidget* eachControl, aMyControls) { - if (myIsObligatory) { eachControl->setFocusPolicy(Qt::StrongFocus); eachControl->installEventFilter(this); - } - else { - eachControl->setFocusPolicy(Qt::NoFocus); - } } } @@ -103,21 +128,10 @@ void ModuleBase_ModelWidget::setHighlighted(bool isHighlighted) QLabel* aLabel = qobject_cast(aWidget); // We won't set the effect to QLabels - it looks ugly if(aLabel) continue; - if(isHighlighted) { - // If effect is the installed on a different widget, setGraphicsEffect() will - // remove the effect from the widget and install it on this widget. - // That's why we create a new effect for each widget - QGraphicsDropShadowEffect* aGlowEffect = new QGraphicsDropShadowEffect(); - aGlowEffect->setOffset(.0); - aGlowEffect->setBlurRadius(10.0); - aGlowEffect->setColor(QColor(0, 170, 255)); // Light-blue color, #00AAFF - aWidget->setGraphicsEffect(aGlowEffect); - } else { - QGraphicsEffect* anEffect = aWidget->graphicsEffect(); - if(anEffect) - anEffect->deleteLater(); - aWidget->setGraphicsEffect(NULL); - } + // If effect is the installed on a different widget, setGraphicsEffect() will + // remove the effect from the widget and install it on this widget. + // That's why we create a new effect for each widget + ModuleBase_Tools::setShadowEffect(aWidget, isHighlighted); } } @@ -136,7 +150,7 @@ bool ModuleBase_ModelWidget::focusTo() for (; anIt != aLast && !isFocusAccepted; anIt++) { QWidget* aWidget = *anIt; if (aWidget && aWidget->focusPolicy() != Qt::NoFocus) { - aWidget->setFocus(); + ModuleBase_Tools::setFocus(aWidget, "ModuleBase_ModelWidget::focusTo()"); isFocusAccepted = true; } } @@ -159,7 +173,7 @@ void ModuleBase_ModelWidget::activate() void ModuleBase_ModelWidget::deactivate() { myIsValueStateBlocked = false; - if (myState == ModifiedInPP) + if (myState == ModifiedInPP || myState == ModifiedInViewer) storeValue(); myState = Stored; } @@ -286,8 +300,11 @@ bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent) aReason == Qt::TabFocusReason || aReason == Qt::BacktabFocusReason || aReason == Qt::OtherFocusReason; // to process widget->setFocus() - if (aMouseOrKey && getControls().contains(aWidget) && getValueState() == ModifiedInPP) - storeValue(); + if (aMouseOrKey && getControls().contains(aWidget)) { + if (getValueState() == ModifiedInPP) { + storeValue(); + } + } } // pass the event on to the parent class