#include <ModuleBase_WidgetFactory.h>
#include <ModuleBase_OperationFeature.h>
#include <ModuleBase_OperationAction.h>
+#include <ModuleBase_PagedContainer.h>
+#include <ModuleBase_WidgetValidated.h>
#include <Config_Common.h>
#include <Config_FeatureMessage.h>
QIntList aModes;
module()->activeSelectionModes(aModes);
aDisplayer->activateObjects(aModes, aDisplayed);
+ myOperationMgr->activate();
}
void XGUI_Workshop::deactivateModule()
XGUI_Displayer* aDisplayer = displayer();
QObjectPtrList aDisplayed = aDisplayer->displayedObjects();
aDisplayer->deactivateObjects(aDisplayed, true);
+
+ myOperationMgr->deactivate();
}
//******************************************************
return;
showPropertyPanel();
- QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
- ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myModuleConnector);
-
myPropertyPanel->cleanContent();
- aFactory.createWidget(myPropertyPanel->contentWidget());
- QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
+ QList<ModuleBase_ModelWidget*> aWidgets;
+ if (!module()->createWidgets(theOperation, aWidgets)) {
+ QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
+ ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myModuleConnector);
+ aFactory.createWidget(myPropertyPanel->contentWidget());
+ aWidgets = aFactory.getModelWidgets();
+ }
// check compatibility of feature and widgets
FeaturePtr aFeature = aFOperation->feature();
const QList<ModuleBase_ModelWidget*>& aWidgets = aPropertyPanel->modelWidgets();
foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
myModule->connectToPropertyPanel(aWidget, isToConnect);
- if (isToConnect) {
+ if (isToConnect) {
connect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int)));
+ connect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onValuesChanged()));
}
else {
disconnect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int)));
+ disconnect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onValuesChanged()));
}
}
}
myModule->widgetStateChanged(thePreviousState);
}
+//******************************************************
+void XGUI_Workshop::onValuesChanged()
+{
+ ModuleBase_ModelWidget* aSenderWidget = (ModuleBase_ModelWidget*)(sender());
+ if (!aSenderWidget || aSenderWidget->canSetValue())
+ return;
+
+ ModuleBase_ModelWidget* anActiveWidget = 0;
+ ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+ if (anOperation) {
+ ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
+ if (aPanel)
+ anActiveWidget = aPanel->activeWidget();
+ }
+ if (anActiveWidget) {
+ ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
+ (anActiveWidget);
+ aWidgetValidated->clearValidatedCash();
+ }
+}
+
ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule)
{
QString libName = QString::fromStdString(library(theModule.toStdString()));
connect(myPropertyPanel, SIGNAL(keyReleased(QObject*, QKeyEvent*)),
myOperationMgr, SLOT(onKeyReleased(QObject*, QKeyEvent*)));
- connect(myPropertyPanel, SIGNAL(enterClicked()),
- myOperationMgr, SLOT(onProcessEnter()));
+ connect(myPropertyPanel, SIGNAL(enterClicked(QObject*)),
+ myOperationMgr, SLOT(onProcessEnter(QObject*)));
}
//******************************************************
QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
if (!abortAllOperations())
return;
- // It is necessary to clear selection in order to avoid selection changed event during
- // deletion and negative consequences connected with processing of already deleted items
- mySelector->clearSelection();
// check whether the object can be deleted. There should not be parts which are not loaded
if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects))
return;
// 3. delete objects
std::set<FeaturePtr> anIgnoredFeatures;
- if (deleteFeatures(anObjects, anIgnoredFeatures, desktop(), true)) {
- operationMgr()->commitOperation();
- }
- else {
- operationMgr()->abortOperation(operationMgr()->currentOperation());
+ std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
+ findReferences(anObjects, aDirectRefFeatures, aIndirectRefFeatures);
+
+ bool doDeleteReferences = true;
+ if (isDeleteFeatureWithReferences(anObjects, aDirectRefFeatures, aIndirectRefFeatures,
+ desktop(), doDeleteReferences)) {
+ // It is necessary to clear selection in order to avoid selection changed event during
+ // deletion and negative consequences connected with processing of already deleted items
+ mySelector->clearSelection();
+ if (deleteFeaturesInternal(anObjects, aDirectRefFeatures, aIndirectRefFeatures,
+ anIgnoredFeatures, doDeleteReferences))
+ operationMgr()->commitOperation();
+ else
+ operationMgr()->abortOperation(operationMgr()->currentOperation());
}
}
}
//**************************************************************
-bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theList,
- const std::set<FeaturePtr>& theIgnoredFeatures,
- QWidget* theParent,
- const bool theAskAboutDeleteReferences)
+void XGUI_Workshop::findReferences(const QObjectPtrList& theList,
+ std::set<FeaturePtr>& aDirectRefFeatures,
+ std::set<FeaturePtr>& aIndirectRefFeatures)
{
-#ifdef DEBUG_DELETE
- QStringList aDInfo;
- QObjectPtrList::const_iterator aDIt = theList.begin(), aDLast = theList.end();
- for (; aDIt != aDLast; ++aDIt) {
- aDInfo.append(ModuleBase_Tools::objectInfo((*aDIt)));
- }
- QString anInfoStr = aDInfo.join(", ");
- qDebug(QString("deleteFeatures: %1, %2").arg(theList.size()).arg(anInfoStr).toStdString().c_str());
-#endif
-
- // 1. find all referenced features
- std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
foreach (ObjectPtr aDeletedObj, theList) {
std::set<FeaturePtr> alreadyProcessed;
XGUI_Tools::refsToFeatureInAllDocuments(aDeletedObj, aDeletedObj, theList, aDirectRefFeatures,
std::inserter(aDifference, aDifference.begin()));
aIndirectRefFeatures = aDifference;
}
+}
- bool doDeleteReferences = true;
+bool XGUI_Workshop::isDeleteFeatureWithReferences(const QObjectPtrList& theList,
+ const std::set<FeaturePtr>& aDirectRefFeatures,
+ const std::set<FeaturePtr>& aIndirectRefFeatures,
+ QWidget* theParent,
+ bool& doDeleteReferences)
+{
+ doDeleteReferences = true;
- // 2. warn about the references remove, break the delete operation if the user chose it
- if (theAskAboutDeleteReferences && !aDirectRefFeatures.empty()) {
+ if (!aDirectRefFeatures.empty()) {
QStringList aDirectRefNames;
foreach (const FeaturePtr& aFeature, aDirectRefFeatures)
aDirectRefNames.append(aFeature->name().c_str());
doDeleteReferences = false;
}
}
+ return true;
+}
- // 3. remove referenced features
+bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theFeatures,
+ const std::set<FeaturePtr>& theIgnoredFeatures)
+{
+ std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
+ findReferences(theFeatures, aDirectRefFeatures, aIndirectRefFeatures);
+ return deleteFeaturesInternal(theFeatures, aDirectRefFeatures, aIndirectRefFeatures,
+ theIgnoredFeatures);
+}
+
+bool XGUI_Workshop::deleteFeaturesInternal(const QObjectPtrList& theList,
+ const std::set<FeaturePtr>& aDirectRefFeatures,
+ const std::set<FeaturePtr>& aIndirectRefFeatures,
+ const std::set<FeaturePtr>& theIgnoredFeatures,
+ const bool doDeleteReferences)
+{
if (doDeleteReferences) {
std::set<FeaturePtr> aFeaturesToDelete = aDirectRefFeatures;
aFeaturesToDelete.insert(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end());
