X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_IModule.cpp;h=a4fb017577a7bc20c8d46fd5d92e489cdc418fa6;hb=8cd56d486b6e96b8814002f9f0f4acadd6cea11b;hp=2994da26d18154cd9885e4bf0722e3804c0e3097;hpb=72c4913ec2fb7b25caf65d14eb1152f9625ab6ce;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_IModule.cpp b/src/ModuleBase/ModuleBase_IModule.cpp index 2994da26d..a4fb01757 100644 --- a/src/ModuleBase/ModuleBase_IModule.cpp +++ b/src/ModuleBase/ModuleBase_IModule.cpp @@ -12,7 +12,6 @@ #include -#include #include #include #include @@ -67,54 +66,11 @@ void ModuleBase_IModule::sendOperation(ModuleBase_Operation* theOperation) Events_Loop::loop()->send(aMessage); } -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 -} - QString ModuleBase_IModule::getFeatureError(const FeaturePtr& theFeature) { return ModelAPI_Tools::getFeatureError(theFeature).c_str(); } -QString ModuleBase_IModule::getWidgetError(ModuleBase_ModelWidget* theWidget) -{ - QString anError; - - if (!theWidget || !theWidget->feature().get()) - return anError; - - std::string anAttributeID = theWidget->attributeID(); - AttributePtr anAttribute = theWidget->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 = theWidget->getValueStateError(); - - return anError; -} - void ModuleBase_IModule::grantedOperationIds(ModuleBase_Operation* theOperation, QStringList& theIds) const { @@ -173,6 +129,7 @@ void ModuleBase_IModule::createFeatures() void ModuleBase_IModule::actionCreated(QAction* theFeature) { + theFeature->setStatusTip(theFeature->text()); connect(theFeature, SIGNAL(triggered(bool)), this, SLOT(onFeatureTriggered())); }