From: nds Date: Wed, 1 Feb 2017 12:10:45 +0000 (+0300) Subject: Warnings correction for moc files generation X-Git-Tag: V_2.7.0~294 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b24899c5ff113144ea6498484e6f20da8d6f773e;p=modules%2Fshaper.git Warnings correction for moc files generation Remove FilterFactory as it is not used anymore. --- diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt index 5208b7062..9b896ba5d 100644 --- a/src/CollectionPlugin/CMakeLists.txt +++ b/src/CollectionPlugin/CMakeLists.txt @@ -19,6 +19,10 @@ SET(PROJECT_HEADERS CollectionPlugin_WidgetField.h ) +SET(PROJECT_MOC_HEADERS + CollectionPlugin_WidgetField.h +) + SET(PROJECT_SOURCES CollectionPlugin_Plugin.cpp CollectionPlugin_Group.cpp @@ -37,7 +41,7 @@ SET(TEXT_RESOURCES ) # sources / moc wrappings -QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS}) +QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES}) diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt index 831f62020..e5f3d42a7 100644 --- a/src/Config/CMakeLists.txt +++ b/src/Config/CMakeLists.txt @@ -23,7 +23,6 @@ SET(PROJECT_HEADERS Config_Prop.h Config_PropManager.h Config_AttributeMessage.h - Config_SelectionFilterMessage.h Config_ValidatorReader.h Config_DataModelReader.h Config_Translator.h @@ -42,7 +41,6 @@ SET(PROJECT_SOURCES Config_Prop.cpp Config_PropManager.cpp Config_AttributeMessage.cpp - Config_SelectionFilterMessage.cpp Config_ValidatorReader.cpp Config_DataModelReader.cpp Config_Translator.cpp diff --git a/src/Config/Config_Common.cpp b/src/Config/Config_Common.cpp index cb866a7d5..e6657fe4f 100644 --- a/src/Config/Config_Common.cpp +++ b/src/Config/Config_Common.cpp @@ -61,7 +61,7 @@ bool isAttributeNode(xmlNodePtr theNode) return false; //it should not be a "source" or a "validator" node - bool isLogical = isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NODE_SELFILTER, NULL); + bool isLogical = isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NULL); // here must be only widgets not connected to attributes bool isPagedContainer = isNode(theNode, WDG_TOOLBOX_BOX, WDG_GROUP, @@ -79,7 +79,7 @@ bool isWidgetNode(xmlNodePtr theNode) return false; //it should not be a "source" or a "validator" node - return !isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NODE_SELFILTER, NULL); + return !isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NULL); } // widget api? diff --git a/src/Config/Config_Keywords.h b/src/Config/Config_Keywords.h index 503215422..6b4a1312f 100644 --- a/src/Config/Config_Keywords.h +++ b/src/Config/Config_Keywords.h @@ -18,7 +18,6 @@ const static char* NODE_GROUP = "group"; const static char* NODE_FEATURE = "feature"; const static char* NODE_SOURCE = "source"; const static char* NODE_VALIDATOR = "validator"; -const static char* NODE_SELFILTER = "selection_filter"; const static char* NODE_XMLPARENT = "libxml_parent"; // Property panels @@ -67,7 +66,7 @@ const static char* FEATURE_WHEN_NESTED_ABORT = "abort"; const static char* FEATURE_DOC = WORKBENCH_DOC; const static char* FEATURE_MODAL = "modal"; const static char* FEATURE_AUTO_PREVIEW = "auto_preview"; -// NODE_VALIDATOR properties, NODE_SELFILTER properties +// NODE_VALIDATOR properties const static char* _PARAMETERS = "parameters"; // Widget (attribute) properties diff --git a/src/Config/Config_SelectionFilterMessage.cpp b/src/Config/Config_SelectionFilterMessage.cpp deleted file mode 100644 index cb958cd46..000000000 --- a/src/Config/Config_SelectionFilterMessage.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -/* - * Config_SelectionFilterMessage.cpp - * - * Created on: 08 Jul 2014 - * Author: sbh - */ - -#include - -Config_SelectionFilterMessage::Config_SelectionFilterMessage(const Events_ID theId, - const void* theParent) - : Events_Message(theId, theParent) -{ - mySelectionFilterId = ""; - myFeatureId = ""; - myAttributeId = ""; -} - -Config_SelectionFilterMessage::~Config_SelectionFilterMessage() -{ -} - -const std::string& Config_SelectionFilterMessage::selectionFilterId() const -{ - return mySelectionFilterId; -} - -const std::string& Config_SelectionFilterMessage::featureId() const -{ - return myFeatureId; -} - -void Config_SelectionFilterMessage::setSelectionFilterId(const std::string& theId) -{ - mySelectionFilterId = theId; -} - -const std::string& Config_SelectionFilterMessage::attributeId() const -{ - return myAttributeId; -} - -const std::list& Config_SelectionFilterMessage::parameters() const -{ - return myFilterParameters; -} - -void Config_SelectionFilterMessage::setFeatureId(const std::string& theId) -{ - myFeatureId = theId; -} - -void Config_SelectionFilterMessage::setAttributeId(const std::string& theId) -{ - myAttributeId = theId; -} - -void Config_SelectionFilterMessage::setFilterParameters(const std::list& parameters) -{ - myFilterParameters = parameters; -} - diff --git a/src/Config/Config_SelectionFilterMessage.h b/src/Config/Config_SelectionFilterMessage.h deleted file mode 100644 index ed661b93c..000000000 --- a/src/Config/Config_SelectionFilterMessage.h +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -/* - * Config_SelectionFilterMessage.h - * - * Created on: 08 Jul 2014 - * Author: sbh - */ - -#ifndef CONFIG_SELECTIONFILTERMESSAGE_H_ -#define CONFIG_SELECTIONFILTERMESSAGE_H_ - -#include -#include - -#include -#include - -/// Event ID that Selection Filter is loaded (comes with Config_SelectionFilterMessage) -static const char * EVENT_SELFILTER_LOADED = "SelectionFilterLoaded"; - -/*! - * \class Config_SelectionFilterMessage - * \ingroup Config - * \brief Transmits info about selection filters on "SelectionFilterLoaded" event - */ -class Config_SelectionFilterMessage : public Events_Message -{ - std::string mySelectionFilterId; - std::string myFeatureId; - std::string myAttributeId; - std::list myFilterParameters; - - public: - /*! - * Constructor. - * \param theId - Events_ID of the message - * \param theParent - pointer to the sender - */ - CONFIG_EXPORT Config_SelectionFilterMessage(const Events_ID theId, const void* theParent = 0); - CONFIG_EXPORT virtual ~Config_SelectionFilterMessage(); - - //! Get id of the filter - CONFIG_EXPORT const std::string& selectionFilterId() const; - //! Get id of a feature to which the filter belongs to - CONFIG_EXPORT const std::string& featureId() const; - //! Get id of an attribute to which the filter belongs to - CONFIG_EXPORT const std::string& attributeId() const; - //! Get filter parameters - CONFIG_EXPORT const std::list& parameters() const; - - //! Set id of the filter - CONFIG_EXPORT void setSelectionFilterId(const std::string& theId); - //! Set id of a feature to which the filter belongs to - CONFIG_EXPORT void setFeatureId(const std::string& theId); - //! Set id of an attribute to which the filter belongs to - CONFIG_EXPORT void setAttributeId(const std::string& theId); - //! Get filter parameters - CONFIG_EXPORT void setFilterParameters(const std::list& parameters); -}; - -#endif /* CONFIG_SELECTIONFILTERMESSAGE_H_ */ diff --git a/src/Config/Config_ValidatorReader.cpp b/src/Config/Config_ValidatorReader.cpp index d15293f67..442cf5042 100644 --- a/src/Config/Config_ValidatorReader.cpp +++ b/src/Config/Config_ValidatorReader.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include @@ -37,8 +36,6 @@ void Config_ValidatorReader::processNode(xmlNodePtr theNode) { if (isNode(theNode, NODE_VALIDATOR, NULL)) { processValidator(theNode); - } else if (isNode(theNode, NODE_SELFILTER, NULL)) { - processSelectionFilter(theNode); } else if (isNode(theNode, NODE_FEATURE, NULL)) { storeAttribute(theNode, _ID); } else if (isWidgetNode(theNode)) { @@ -86,24 +83,3 @@ void Config_ValidatorReader::processValidator(xmlNodePtr theNode) } aEvLoop->send(aMessage); } - -void Config_ValidatorReader::processSelectionFilter(xmlNodePtr theNode) -{ - Events_ID aFilterEvent = Events_Loop::eventByName(EVENT_SELFILTER_LOADED); - Events_Loop* aEvLoop = Events_Loop::loop(); - std::shared_ptr aMessage( - new Config_SelectionFilterMessage(aFilterEvent, this)); - std::string aSelectionFilterId; - std::list aParameters; - getParametersInfo(theNode, aSelectionFilterId, aParameters); - aMessage->setSelectionFilterId(aSelectionFilterId); - aMessage->setFilterParameters(aParameters); - std::string aFeatureId = restoreAttribute(NODE_FEATURE, _ID); - aMessage->setFeatureId(aFeatureId); - // parent is attribute (widget) - if (!myCurrentWidget.empty()) { - std::string aParentId = restoreAttribute(myCurrentWidget.c_str(), _ID); - aMessage->setAttributeId(aParentId); - } - aEvLoop->send(aMessage); -} diff --git a/src/Config/Config_ValidatorReader.h b/src/Config/Config_ValidatorReader.h index 59f6acffb..8c44362fb 100644 --- a/src/Config/Config_ValidatorReader.h +++ b/src/Config/Config_ValidatorReader.h @@ -35,8 +35,7 @@ class Config_ValidatorReader : public Config_XMLReader protected: /*! * \brief Allows to customize reader's behavior for a node. Virtual. - * The default implementation process "source", "validator" and - * "selection_filter" nodes. + * The default implementation process "source" and "validator" nodes. */ virtual void processNode(xmlNodePtr aNode); /*! @@ -55,11 +54,6 @@ class Config_ValidatorReader : public Config_XMLReader * Sends ValidatorLoaded event */ void processValidator(xmlNodePtr theNode); - /*! - * \brief Retrieves all the necessary info from the SelectionFilter node. - * Sends SelectionFilterLoaded event - */ - void processSelectionFilter(xmlNodePtr theNode); private: std::string myCurrentWidget; diff --git a/src/Config/Config_WidgetReader.cpp b/src/Config/Config_WidgetReader.cpp index 4a6590c68..a839b9662 100644 --- a/src/Config/Config_WidgetReader.cpp +++ b/src/Config/Config_WidgetReader.cpp @@ -57,7 +57,6 @@ bool Config_WidgetReader::processChildren(xmlNodePtr theNode) { //Read all nodes recursively, source and validator nodes have no children return !isNode(theNode, NODE_VALIDATOR, - NODE_SELFILTER, NODE_SOURCE, NULL); } diff --git a/src/Config/Config_XMLReader.h b/src/Config/Config_XMLReader.h index 851ff1b28..ccb061115 100644 --- a/src/Config/Config_XMLReader.h +++ b/src/Config/Config_XMLReader.h @@ -65,8 +65,7 @@ class Config_XMLReader protected: /*! * \brief Allows to customize reader's behavior for a node. Virtual. - * The default implementation process "source", "validator" and - * "selection_filter" nodes. + * The default implementation process "source" and "validator" nodes. */ virtual void processNode(xmlNodePtr aNode); diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt index 9462688a7..1257a1399 100644 --- a/src/ModuleBase/CMakeLists.txt +++ b/src/ModuleBase/CMakeLists.txt @@ -18,7 +18,6 @@ SET(PROJECT_HEADERS ModuleBase_DoubleSpinBox.h ModuleBase_Events.h ModuleBase_Filter.h - ModuleBase_FilterFactory.h ModuleBase_FilterValidated.h ModuleBase_IErrorMgr.h ModuleBase_IModule.h @@ -78,11 +77,54 @@ SET(PROJECT_HEADERS ModuleBase_ModelDialogWidget.h ) +SET(PROJECT_MOC_HEADERS + ModuleBase_Dialog.h + ModuleBase_DoubleSpinBox.h + ModuleBase_IErrorMgr.h + ModuleBase_IModule.h + ModuleBase_IntSpinBox.h + ModuleBase_IPropertyPanel.h + ModuleBase_IViewer.h + ModuleBase_IWorkshop.h + ModuleBase_LabelValue.h + ModuleBase_ModelDialogWidget.h + ModuleBase_ModelWidget.h + ModuleBase_Operation.h + ModuleBase_OperationAction.h + ModuleBase_OperationFeature.h + ModuleBase_PagedContainer.h + ModuleBase_PageGroupBox.h + ModuleBase_PageWidget.h + ModuleBase_ParamIntSpinBox.h + ModuleBase_ParamSpinBox.h + ModuleBase_Preferences.h + ModuleBase_ToolBox.h + ModuleBase_WidgetAction.h + ModuleBase_WidgetBoolValue.h + ModuleBase_WidgetChoice.h + ModuleBase_WidgetConcealedObjects.h + ModuleBase_WidgetDoubleValue.h + ModuleBase_WidgetEditor.h + ModuleBase_WidgetExprEditor.h + ModuleBase_WidgetFeatureSelector.h + ModuleBase_WidgetFileSelector.h + ModuleBase_WidgetIntValue.h + ModuleBase_WidgetLabel.h + ModuleBase_WidgetLabelValue.h + ModuleBase_WidgetLineEdit.h + ModuleBase_WidgetMultiSelector.h + ModuleBase_WidgetOptionalBox.h + ModuleBase_WidgetSelector.h + ModuleBase_WidgetShapeSelector.h + ModuleBase_WidgetSwitch.h + ModuleBase_WidgetToolbox.h + ModuleBase_WidgetValidated.h +) + SET(PROJECT_SOURCES ModuleBase_ActionInfo.cpp ModuleBase_DoubleSpinBox.cpp ModuleBase_Filter.cpp - ModuleBase_FilterFactory.cpp ModuleBase_FilterValidated.cpp ModuleBase_IErrorMgr.cpp ModuleBase_IModule.cpp @@ -159,7 +201,7 @@ SET(PROJECT_LIBRARIES ) # sources / moc wrappings -QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS}) +QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES}) diff --git a/src/ModuleBase/ModuleBase_FilterFactory.cpp b/src/ModuleBase/ModuleBase_FilterFactory.cpp deleted file mode 100644 index b30ad90f5..000000000 --- a/src/ModuleBase/ModuleBase_FilterFactory.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_FilterFactory.cpp -// Created: 10 Dec 2014 -// Author: Natalia ERMOLAEVA - -#include "ModuleBase_FilterFactory.h" -#include - -//#include -#include -#include -#include -//#include -#include - - -void ModuleBase_FilterFactory::registerFilter(const std::string& theID, - ModuleBase_Filter* theFilter) -{ - if (myIDs.find(theID) != myIDs.end()) { - Events_InfoMessage("ModuleBase_FilterFactory", - "Filter %1 is already registered").arg(theID).send(); - } else { - myIDs[theID] = theFilter; - } -} - -void ModuleBase_FilterFactory::assignFilter(const std::string& theID, - const std::string& theFeatureID, - const std::string& theAttrID, - const std::list& theArguments) -{ - // create feature-structures if not exist - std::map >::iterator aFeature = myAttrs.find( - theFeatureID); - if (aFeature == myAttrs.end()) { - myAttrs[theFeatureID] = std::map(); - aFeature = myAttrs.find(theFeatureID); - } - // add attr-structure if not exist, or generate error if already exist - std::map::iterator anAttr = aFeature->second.find(theAttrID); - if (anAttr == aFeature->second.end()) { - aFeature->second[theAttrID] = AttrFilters(); - } - aFeature->second[theAttrID][theID] = theArguments; -} - -void ModuleBase_FilterFactory::filters(const std::string& theFeatureID, - const std::string& theAttrID, - SelectMgr_ListOfFilter& theFilters/*, - std::list& theFilters/*, - std::list >& theArguments*/) const -{ - SelectMgr_ListOfFilter aFilters; - - std::map >::const_iterator aFeature = - myAttrs.find(theFeatureID); - if (aFeature != myAttrs.cend()) { - std::map::const_iterator anAttr = aFeature->second.find(theAttrID); - if (anAttr != aFeature->second.end()) { - AttrFilters::const_iterator aValIter = anAttr->second.cbegin(); - for (; aValIter != anAttr->second.cend(); aValIter++) { - std::map::const_iterator aFound = myIDs.find( - aValIter->first); - if (aFound == myIDs.end()) { - Events_InfoMessage("ModuleBase_FilterFactory", "Filter %1 was not registered") - .arg(aValIter->first).send(); - } else { - ModuleBase_Filter* aFilter = aFound->second; - aFilter->setArguments(aValIter->second); - //if (aFilter.IsNull()) - // continue; - - theFilters.Append(aFilter->getFilter());//aFound->second); - //theArguments.push_back(aValIter->second); - } - } - } - } -} - -ModuleBase_FilterFactory::ModuleBase_FilterFactory() -{ - //const static std::string kDefaultId = "Model_FeatureFilter"; - //registerFilter(kDefaultId, new Model_FeatureFilter); -} - -const ModuleBase_Filter* ModuleBase_FilterFactory::filter(const std::string& theID) const -{ - std::map::const_iterator aIt = myIDs.find(theID); - if (aIt != myIDs.end()) { - return aIt->second; - } - return NULL; -} diff --git a/src/ModuleBase/ModuleBase_FilterFactory.h b/src/ModuleBase/ModuleBase_FilterFactory.h deleted file mode 100644 index c1a7e3601..000000000 --- a/src/ModuleBase/ModuleBase_FilterFactory.h +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_FilterFactory.h -// Created: 10 Dec 2014 -// Author: Natalia ERMOLAEVA - -#ifndef ModuleBase_FilterFactory_H -#define ModeleBase_SelectionFilterFactory_H - -#include "ModuleBase.h" -#include "ModuleBase_IWorkshop.h" -#include "ModuleBase_Filter.h" - -#include - -#include -#include - -/** - * \ingroup GUI - * Allows to get a selection filter by the feature identifier and - * the attribute identifier (if attribute is validated). - * All accessible filters must be registered by the ID string first. - * The instance of this factory can be get in the Workshop interface. - * Keeps the filter objects alive and just returns one of it by request. - * All the needed information is provided to the filter as an argument, - * this allows to work with them independently from the feature specific object. - */ -class ModuleBase_FilterFactory : public QObject -{ - private: - std::map myIDs; ///< map from ID to registered filter - /// filters IDs to list of arguments - typedef std::map > AttrFilters; - /// filters IDs by feature ID - std::map myFeatures; - /// filters IDs and arguments by feature and attribute IDs - std::map > myAttrs; - - public: - /// Registers the instance of the filter by the ID - MODULEBASE_EXPORT virtual void registerFilter(const std::string& theID, - ModuleBase_Filter* theFilter); - - /// Assigns filter to the attribute of the feature - MODULEBASE_EXPORT virtual void assignFilter(const std::string& theID, - const std::string& theFeatureID, - const std::string& theAttrID, - const std::list& theArguments); - - /// Provides a filter for the attribute, returns NULL if no filter - MODULEBASE_EXPORT void filters(const std::string& theFeatureID, - const std::string& theAttrID, - SelectMgr_ListOfFilter& theFilters) const; - - /// Returns registered filter by its Id - MODULEBASE_EXPORT virtual const ModuleBase_Filter* filter(const std::string& theID) const; - -protected: - ModuleBase_FilterFactory(); - - ~ModuleBase_FilterFactory() {} - - friend class ModuleBase_IWorkshop; - -}; - -#endif //ModuleBase_FilterFactory diff --git a/src/ModuleBase/ModuleBase_IModule.cpp b/src/ModuleBase/ModuleBase_IModule.cpp index 49ade2db4..3a5aebb6a 100644 --- a/src/ModuleBase/ModuleBase_IModule.cpp +++ b/src/ModuleBase/ModuleBase_IModule.cpp @@ -153,7 +153,6 @@ ModuleBase_Operation* ModuleBase_IModule::createOperation(const std::string& the void ModuleBase_IModule::createFeatures() { registerValidators(); - registerFilters(); registerProperties(); Config_ModuleReader aXMLReader = Config_ModuleReader(); diff --git a/src/ModuleBase/ModuleBase_IModule.h b/src/ModuleBase/ModuleBase_IModule.h index 3b395d297..b57291d26 100755 --- a/src/ModuleBase/ModuleBase_IModule.h +++ b/src/ModuleBase/ModuleBase_IModule.h @@ -55,16 +55,16 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject virtual ~ModuleBase_IModule() {} /// Add default selection filters of the module to the current viewer - virtual void activateSelectionFilters() {}; + virtual void activateSelectionFilters() {} /// Remove default selection filters of the module from the current viewer - virtual void deactivateSelectionFilters() {}; + virtual void deactivateSelectionFilters() {} /// Stores the current selection - virtual void storeSelection() {}; + virtual void storeSelection() {} /// Restores the current selection - virtual void restoreSelection() {}; + virtual void restoreSelection() {} /// Reads description of features from XML file virtual void createFeatures(); @@ -349,9 +349,6 @@ protected: /// Register validators for this module virtual void registerValidators() {} - /// Register selection filters for this module - virtual void registerFilters() {} - /// Register properties of this module virtual void registerProperties() {} diff --git a/src/ModuleBase/ModuleBase_IViewer.h b/src/ModuleBase/ModuleBase_IViewer.h index 5331ba020..5e9892324 100644 --- a/src/ModuleBase/ModuleBase_IViewer.h +++ b/src/ModuleBase/ModuleBase_IViewer.h @@ -83,9 +83,6 @@ Q_OBJECT /// \param theFilter a selection filter virtual bool hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) = 0; - /// Remove all selection filters from the viewer - virtual void clearSelectionFilters() = 0; - /// Update current viewer virtual void update() = 0; diff --git a/src/ModuleBase/ModuleBase_IWorkshop.cpp b/src/ModuleBase/ModuleBase_IWorkshop.cpp index 60d1d5fd1..adc7a157f 100644 --- a/src/ModuleBase/ModuleBase_IWorkshop.cpp +++ b/src/ModuleBase/ModuleBase_IWorkshop.cpp @@ -5,7 +5,6 @@ // Author: Natalia ERMOLAEVA #include "ModuleBase_IWorkshop.h" -#include "ModuleBase_FilterFactory.h" ModuleBase_IWorkshop::ModuleBase_IWorkshop(QObject* theParent) : QObject(theParent) @@ -17,9 +16,3 @@ Handle(ModuleBase_FilterValidated) ModuleBase_IWorkshop::validatorFilter() { return myValidatorFilter; } - -ModuleBase_FilterFactory* ModuleBase_IWorkshop::selectionFilters() const -{ - static ModuleBase_FilterFactory* aFactory = new ModuleBase_FilterFactory; - return aFactory; -} diff --git a/src/ModuleBase/ModuleBase_IWorkshop.h b/src/ModuleBase/ModuleBase_IWorkshop.h index 356196f0c..8c5695aa8 100644 --- a/src/ModuleBase/ModuleBase_IWorkshop.h +++ b/src/ModuleBase/ModuleBase_IWorkshop.h @@ -22,7 +22,6 @@ class ModuleBase_ISelection; class ModuleBase_IViewer; class ModuleBase_IPropertyPanel; class ModuleBase_Operation; -class ModuleBase_FilterFactory; class ModuleBase_ViewerPrs; class QMainWindow; @@ -67,9 +66,6 @@ Q_OBJECT /// \return a filter Handle(ModuleBase_FilterValidated) validatorFilter(); - //! Returns the factory of selection filters : the only one instance per application - ModuleBase_FilterFactory* selectionFilters() const; - //! Returns currently active operation virtual ModuleBase_Operation* currentOperation() const = 0; diff --git a/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp b/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp index 4dcbecf71..fb24a1715 100644 --- a/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index 46fc98370..229554900 100644 --- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ModuleBase/ModuleBase_WidgetValidated.cpp b/src/ModuleBase/ModuleBase_WidgetValidated.cpp index b6ce46421..2b18811d7 100644 --- a/src/ModuleBase/ModuleBase_WidgetValidated.cpp +++ b/src/ModuleBase/ModuleBase_WidgetValidated.cpp @@ -1,8 +1,8 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D #include -#include #include +#include #include #include #include diff --git a/src/ParametersPlugin/CMakeLists.txt b/src/ParametersPlugin/CMakeLists.txt index d48ade3a5..939b7673b 100644 --- a/src/ParametersPlugin/CMakeLists.txt +++ b/src/ParametersPlugin/CMakeLists.txt @@ -19,6 +19,10 @@ SET(PROJECT_HEADERS ParametersPlugin_WidgetParamsMgr.h ) +SET(PROJECT_MOC_HEADERS + ParametersPlugin_WidgetParamsMgr.h +) + SET(PROJECT_SOURCES ParametersPlugin_Plugin.cpp ParametersPlugin_Parameter.cpp @@ -67,7 +71,7 @@ SET(TEXT_RESOURCES # ${CMAKE_CURRENT_BINARY_DIR}/ParametersPlugin_automoc.cpp #) # sources / moc wrappings -QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS}) +QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${QM_RESOURCES}) diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt index b9a6dc1f0..ad4506730 100644 --- a/src/PartSet/CMakeLists.txt +++ b/src/PartSet/CMakeLists.txt @@ -10,63 +10,81 @@ INCLUDE_DIRECTORIES(${QT_INCLUDES}) ADD_DEFINITIONS(${QT_DEFINITIONS}) SET(PROJECT_HEADERS - PartSet.h - PartSet_Constants.h - PartSet_CustomPrs.h - PartSet_ExternalObjectsMgr.h - PartSet_Module.h - PartSet_MouseProcessor.h - PartSet_OperationPrs.h - PartSet_OverconstraintListener.h - PartSet_PreviewPlanes.h - PartSet_Tools.h - PartSet_WidgetSketchLabel.h - PartSet_Validators.h - PartSet_WidgetPoint2d.h - PartSet_WidgetEditor.h - PartSet_WidgetMultiSelector.h - PartSet_WidgetPoint2dDistance.h - PartSet_WidgetPoint2DFlyout.h - PartSet_WidgetShapeSelector.h - PartSet_WidgetFileSelector.h - PartSet_Filters.h - PartSet_FilterInfinite.h - PartSet_ResultSketchPrs.h - PartSet_SketcherMgr.h - PartSet_SketcherReetntrantMgr.h - PartSet_MenuMgr.h - PartSet_WidgetSketchCreator.h - PartSet_IconFactory.h - PartSet_WidgetChoice.h - PartSet_WidgetSubShapeSelector.h + PartSet.h + PartSet_Constants.h + PartSet_CustomPrs.h + PartSet_ExternalObjectsMgr.h + PartSet_Module.h + PartSet_MouseProcessor.h + PartSet_OperationPrs.h + PartSet_OverconstraintListener.h + PartSet_PreviewPlanes.h + PartSet_Tools.h + PartSet_WidgetSketchLabel.h + PartSet_Validators.h + PartSet_WidgetPoint2d.h + PartSet_WidgetEditor.h + PartSet_WidgetMultiSelector.h + PartSet_WidgetPoint2dDistance.h + PartSet_WidgetPoint2DFlyout.h + PartSet_WidgetShapeSelector.h + PartSet_WidgetFileSelector.h + PartSet_Filters.h + PartSet_FilterInfinite.h + PartSet_ResultSketchPrs.h + PartSet_SketcherMgr.h + PartSet_SketcherReetntrantMgr.h + PartSet_MenuMgr.h + PartSet_WidgetSketchCreator.h + PartSet_IconFactory.h + PartSet_WidgetChoice.h + PartSet_WidgetSubShapeSelector.h +) + +SET(PROJECT_MOC_HEADERS + PartSet_MenuMgr.h + PartSet_Module.h + PartSet_SketcherMgr.h + PartSet_SketcherReetntrantMgr.h + PartSet_WidgetChoice.h + PartSet_WidgetEditor.h + PartSet_WidgetFileSelector.h + PartSet_WidgetMultiSelector.h + PartSet_WidgetPoint2d.h + PartSet_WidgetPoint2dDistance.h + PartSet_WidgetPoint2DFlyout.h + PartSet_WidgetShapeSelector.h + PartSet_WidgetSketchCreator.h + PartSet_WidgetSketchLabel.h + PartSet_WidgetSubShapeSelector.h ) SET(PROJECT_SOURCES - PartSet_CustomPrs.cpp - PartSet_ExternalObjectsMgr.cpp - PartSet_Module.cpp - PartSet_OperationPrs.cpp - PartSet_OverconstraintListener.cpp - PartSet_PreviewPlanes.cpp - PartSet_Tools.cpp - PartSet_WidgetSketchLabel.cpp - PartSet_Validators.cpp - PartSet_WidgetEditor.cpp - PartSet_WidgetMultiSelector.cpp - PartSet_WidgetPoint2d.cpp - PartSet_WidgetPoint2dDistance.cpp - PartSet_WidgetPoint2DFlyout.cpp - PartSet_WidgetShapeSelector.cpp - PartSet_WidgetFileSelector.cpp - PartSet_Filters.cpp - PartSet_FilterInfinite.cpp - PartSet_ResultSketchPrs.cpp - PartSet_SketcherMgr.cpp - PartSet_SketcherReetntrantMgr.cpp - PartSet_MenuMgr.cpp - PartSet_WidgetSketchCreator.cpp - PartSet_IconFactory.cpp - PartSet_WidgetSubShapeSelector.cpp + PartSet_CustomPrs.cpp + PartSet_ExternalObjectsMgr.cpp + PartSet_Module.cpp + PartSet_OperationPrs.cpp + PartSet_OverconstraintListener.cpp + PartSet_PreviewPlanes.cpp + PartSet_Tools.cpp + PartSet_WidgetSketchLabel.cpp + PartSet_Validators.cpp + PartSet_WidgetEditor.cpp + PartSet_WidgetMultiSelector.cpp + PartSet_WidgetPoint2d.cpp + PartSet_WidgetPoint2dDistance.cpp + PartSet_WidgetPoint2DFlyout.cpp + PartSet_WidgetShapeSelector.cpp + PartSet_WidgetFileSelector.cpp + PartSet_Filters.cpp + PartSet_FilterInfinite.cpp + PartSet_ResultSketchPrs.cpp + PartSet_SketcherMgr.cpp + PartSet_SketcherReetntrantMgr.cpp + PartSet_MenuMgr.cpp + PartSet_WidgetSketchCreator.cpp + PartSet_IconFactory.cpp + PartSet_WidgetSubShapeSelector.cpp ) SET(PROJECT_RESOURCES @@ -74,7 +92,7 @@ SET(PROJECT_RESOURCES ) #SET(TEXT_RESOURCES -# PartSet_msg_fr.ts +# PartSet_msg_fr.ts #) SET(PROJECT_LIBRARIES @@ -89,20 +107,17 @@ SET(PROJECT_LIBRARIES ${CAS_SHAPE} ) -#SET(PROJECT_AUTOMOC -# ${CMAKE_CURRENT_BINARY_DIR}/PartSet_automoc.cpp -#) # sources / moc wrappings -QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS}) +QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) # sources / rcc wrappings QT_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES}) #QT4_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES}) #QT4_CREATE_TRANSLATION(QM_RESOURCES -# ${PROJECT_SOURCES} -# ${TEXT_RESOURCES} -# OPTIONS -extensions cpp -no-recursive -# ) +# ${PROJECT_SOURCES} +# ${TEXT_RESOURCES} +# OPTIONS -extensions cpp -no-recursive +# ) #SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES}) SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES}) @@ -136,12 +151,12 @@ ENDIF(${HAVE_SALOME}) ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS}) ADD_LIBRARY(PartSet SHARED - ${PROJECT_SOURCES} - ${PROJECT_HEADERS} - ${PROJECT_COMPILED_RESOURCES} - ${PROJECT_AUTOMOC} -# ${TEXT_RESOURCES} -# ${QM_RESOURCES} + ${PROJECT_SOURCES} + ${PROJECT_HEADERS} + ${PROJECT_COMPILED_RESOURCES} + ${PROJECT_AUTOMOC} +# ${TEXT_RESOURCES} +# ${QM_RESOURCES} ) # The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index c08cce43c..4fc3b6ab0 100755 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -237,13 +236,6 @@ void PartSet_Module::registerValidators() aFactory->registerValidator("PartSet_ProjectionSelection", new PartSet_ProjectionSelection); } -void PartSet_Module::registerFilters() -{ - //Registering of selection filters - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters(); -} - void PartSet_Module::registerProperties() { Config_PropManager::registerProp(SKETCH_TAB_NAME, "planes_size", "Size", Config_Prop::Double, diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h index 91338d132..f5f897686 100755 --- a/src/PartSet/PartSet_Module.h +++ b/src/PartSet/PartSet_Module.h @@ -379,9 +379,6 @@ protected: /// Register validators for this module virtual void registerValidators(); - /// Register selection filters for this module - virtual void registerFilters(); - /// Register properties of this module virtual void registerProperties(); diff --git a/src/SHAPERGUI/CMakeLists.txt b/src/SHAPERGUI/CMakeLists.txt index 9f7d4620c..d7c2040c2 100644 --- a/src/SHAPERGUI/CMakeLists.txt +++ b/src/SHAPERGUI/CMakeLists.txt @@ -9,29 +9,36 @@ INCLUDE_DIRECTORIES(${QT_INCLUDES}) ADD_DEFINITIONS(${QT_DEFINITIONS}) SET(PROJECT_HEADERS - SHAPER_SHAPERGUI.h - SHAPERGUI.h - SHAPERGUI_DataModel.h - SHAPERGUI_OCCSelector.h - SHAPERGUI_SalomeViewer.h - SHAPERGUI_NestedButton.h + SHAPER_SHAPERGUI.h + SHAPERGUI.h + SHAPERGUI_DataModel.h + SHAPERGUI_OCCSelector.h + SHAPERGUI_SalomeViewer.h + SHAPERGUI_NestedButton.h +) + +SET(PROJECT_MOC_HEADERS + SHAPERGUI.h + SHAPERGUI_DataModel.h + SHAPERGUI_NestedButton.h + SHAPERGUI_SalomeViewer.h ) # sources / moc wrappings -QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS}) +QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) SET(PROJECT_SOURCES - SHAPERGUI.cpp - SHAPERGUI_DataModel.cpp - SHAPERGUI_OCCSelector.cpp - SHAPERGUI_SalomeViewer.cpp - SHAPERGUI_NestedButton.cpp + SHAPERGUI.cpp + SHAPERGUI_DataModel.cpp + SHAPERGUI_OCCSelector.cpp + SHAPERGUI_SalomeViewer.cpp + SHAPERGUI_NestedButton.cpp ) SET(PROJECT_RESOURCES - ${CMAKE_CURRENT_BINARY_DIR}/LightApp.xml - ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml - resources/shaper.png + ${CMAKE_CURRENT_BINARY_DIR}/LightApp.xml + ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml + resources/shaper.png ) SET(PROJECT_LIBRARIES @@ -68,9 +75,9 @@ IF(${HAVE_SALOME}) ENDIF(${HAVE_SALOME}) ADD_LIBRARY(SHAPER SHARED - ${PROJECT_SOURCES} - ${PROJECT_HEADERS} - ${PROJECT_AUTOMOC} + ${PROJECT_SOURCES} + ${PROJECT_HEADERS} + ${PROJECT_AUTOMOC} ) ADD_DEPENDENCIES(SHAPER XGUI) diff --git a/src/SamplePanelPlugin/CMakeLists.txt b/src/SamplePanelPlugin/CMakeLists.txt index 4c9c5eaa8..0f081864a 100755 --- a/src/SamplePanelPlugin/CMakeLists.txt +++ b/src/SamplePanelPlugin/CMakeLists.txt @@ -19,6 +19,11 @@ SET(PROJECT_HEADERS SamplePanelPlugin_WidgetCreator.h ) +SET(PROJECT_MOC_HEADERS + SamplePanelPlugin_ModelWidget.h + SamplePanelPlugin_Panel.h +) + SET(PROJECT_SOURCES SamplePanelPlugin_Feature.cpp SamplePanelPlugin_ModelWidget.cpp @@ -40,7 +45,7 @@ SET(XML_RESOURCES plugin-SamplePanel.xml ) # sources / moc wrappings -QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS}) +QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC}) diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt index 371e6d99d..41cb4c2ee 100644 --- a/src/XGUI/CMakeLists.txt +++ b/src/XGUI/CMakeLists.txt @@ -9,63 +9,83 @@ INCLUDE_DIRECTORIES(${QT_INCLUDES}) ADD_DEFINITIONS(${QT_DEFINITIONS}) SET(PROJECT_HEADERS - XGUI.h - XGUI_ActionsMgr.h - XGUI_ColorDialog.h - XGUI_ContextMenuMgr.h - XGUI_CustomPrs.h - XGUI_DataModel.h - XGUI_DeflectionDialog.h - XGUI_Displayer.h - XGUI_ErrorDialog.h - XGUI_ErrorMgr.h - XGUI_HistoryMenu.h - XGUI_MenuGroup.h - XGUI_MenuMgr.h - XGUI_MenuWorkbench.h - XGUI_ModuleConnector.h - XGUI_ObjectsBrowser.h - XGUI_OperationMgr.h - XGUI_PropertyPanel.h - XGUI_QtEvents.h - XGUI_SalomeConnector.h - XGUI_Selection.h - XGUI_SelectionMgr.h - XGUI_Tools.h - XGUI_ViewerProxy.h - XGUI_Workshop.h - XGUI_WorkshopListener.h + XGUI.h + XGUI_ActionsMgr.h + XGUI_ColorDialog.h + XGUI_ContextMenuMgr.h + XGUI_CustomPrs.h + XGUI_DataModel.h + XGUI_DeflectionDialog.h + XGUI_Displayer.h + XGUI_ErrorDialog.h + XGUI_ErrorMgr.h + XGUI_HistoryMenu.h + XGUI_MenuGroup.h + XGUI_MenuMgr.h + XGUI_MenuWorkbench.h + XGUI_ModuleConnector.h + XGUI_ObjectsBrowser.h + XGUI_OperationMgr.h + XGUI_PropertyPanel.h + XGUI_QtEvents.h + XGUI_SalomeConnector.h + XGUI_Selection.h + XGUI_SelectionMgr.h + XGUI_Tools.h + XGUI_ViewerProxy.h + XGUI_Workshop.h + XGUI_WorkshopListener.h +) + +SET(PROJECT_MOC_HEADERS + XGUI_ActionsMgr.h + XGUI_ColorDialog.h + XGUI_ContextMenuMgr.h + XGUI_DataModel.h + XGUI_DeflectionDialog.h + XGUI_Displayer.h + XGUI_ErrorDialog.h + XGUI_ErrorMgr.h + XGUI_HistoryMenu.h + XGUI_ModuleConnector.h + XGUI_ObjectsBrowser.h + XGUI_OperationMgr.h + XGUI_PropertyPanel.h + XGUI_SelectionMgr.h + XGUI_ViewerProxy.h + XGUI_Workshop.h + XGUI_WorkshopListener.h ) # sources / moc wrappings -QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS}) +QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) SET(PROJECT_SOURCES - XGUI_ActionsMgr.cpp - XGUI_ColorDialog.cpp - XGUI_ContextMenuMgr.cpp - XGUI_CustomPrs.cpp - XGUI_DataModel.cpp - XGUI_DeflectionDialog.cpp - XGUI_Displayer.cpp - XGUI_ErrorDialog.cpp - XGUI_ErrorMgr.cpp - XGUI_HistoryMenu.cpp - XGUI_MenuGroup.cpp - XGUI_MenuMgr.cpp - XGUI_MenuWorkbench.cpp - XGUI_ModuleConnector.cpp - XGUI_ObjectsBrowser.cpp - XGUI_OperationMgr.cpp - XGUI_PropertyPanel.cpp - XGUI_QtEvents.cpp - XGUI_SalomeConnector.cpp - XGUI_Selection.cpp - XGUI_SelectionMgr.cpp - XGUI_Tools.cpp - XGUI_ViewerProxy.cpp - XGUI_Workshop.cpp - XGUI_WorkshopListener.cpp + XGUI_ActionsMgr.cpp + XGUI_ColorDialog.cpp + XGUI_ContextMenuMgr.cpp + XGUI_CustomPrs.cpp + XGUI_DataModel.cpp + XGUI_DeflectionDialog.cpp + XGUI_Displayer.cpp + XGUI_ErrorDialog.cpp + XGUI_ErrorMgr.cpp + XGUI_HistoryMenu.cpp + XGUI_MenuGroup.cpp + XGUI_MenuMgr.cpp + XGUI_MenuWorkbench.cpp + XGUI_ModuleConnector.cpp + XGUI_ObjectsBrowser.cpp + XGUI_OperationMgr.cpp + XGUI_PropertyPanel.cpp + XGUI_QtEvents.cpp + XGUI_SalomeConnector.cpp + XGUI_Selection.cpp + XGUI_SelectionMgr.cpp + XGUI_Tools.cpp + XGUI_ViewerProxy.cpp + XGUI_Workshop.cpp + XGUI_WorkshopListener.cpp ) SET(PROJECT_RESOURCES @@ -73,27 +93,27 @@ SET(PROJECT_RESOURCES ) SET(PREFERENCES_XML - SHAPER.xml + SHAPER.xml ) SET(TEXT_RESOURCES - XGUI_msg_fr.ts + XGUI_msg_fr.ts ) SET(PROJECT_LIBRARIES Events Config - ModelAPI - ModuleBase - ${QT_LIBRARIES} - ${CAS_VIEWER} - ${CAS_KERNEL} - ${CAS_SHAPE} - ${PYTHON_LIBRARIES} - ${PyConsole} - ${PyInterp} - ${suit} - ${qtx} + ModelAPI + ModuleBase + ${QT_LIBRARIES} + ${CAS_VIEWER} + ${CAS_KERNEL} + ${CAS_SHAPE} + ${PYTHON_LIBRARIES} + ${PyConsole} + ${PyInterp} + ${suit} + ${qtx} ) IF(NOT ${HAVE_SALOME}) @@ -110,10 +130,10 @@ ENDIF() QT_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES}) #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES}) # QT4_CREATE_TRANSLATION(QM_RESOURCES -# ${PROJECT_SOURCES} -# ${TEXT_RESOURCES} -# OPTIONS -extensions cpp -no-recursive -# ) +# ${PROJECT_SOURCES} +# ${TEXT_RESOURCES} +# OPTIONS -extensions cpp -no-recursive +# ) SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES}) @@ -161,13 +181,13 @@ INCLUDE_DIRECTORIES(${PROJECT_INCLUDES}) LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR}) ADD_LIBRARY(XGUI SHARED - ${PROJECT_SOURCES} - ${PROJECT_HEADERS} - ${PROJECT_COMPILED_RESOURCES} - ${TEXT_RESOURCES} - ${QM_RESOURCES} - ${PREFERENCES_XML} - ${PROJECT_AUTOMOC} + ${PROJECT_SOURCES} + ${PROJECT_HEADERS} + ${PROJECT_COMPILED_RESOURCES} + ${TEXT_RESOURCES} + ${QM_RESOURCES} + ${PREFERENCES_XML} + ${PROJECT_AUTOMOC} ) ADD_DEPENDENCIES(XGUI ModelAPI) diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 03d602762..527d4423e 100755 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -58,7 +58,6 @@ #include #include -#include #include #include #include @@ -80,7 +79,6 @@ #include #include #include -#include #include #include diff --git a/src/XGUI/XGUI_WorkshopListener.cpp b/src/XGUI/XGUI_WorkshopListener.cpp index 55bfec3d8..11e1d9866 100755 --- a/src/XGUI/XGUI_WorkshopListener.cpp +++ b/src/XGUI/XGUI_WorkshopListener.cpp @@ -39,12 +39,10 @@ #include #include #include -#include #include #include #include -#include #include #include @@ -90,7 +88,6 @@ void XGUI_WorkshopListener::initializeEventListening() aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); aLoop->registerListener(this, Events_LongOp::eventID()); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_PLUGIN_LOADED)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SELFILTER_LOADED)); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_UPDATE_VIEWER_BLOCKED)); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_UPDATE_VIEWER_UNBLOCKED)); @@ -157,17 +154,6 @@ void XGUI_WorkshopListener::processEvent(const std::shared_ptr& } else { QApplication::restoreOverrideCursor(); } - } - else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_SELFILTER_LOADED)) { - std::shared_ptr aMsg = - std::dynamic_pointer_cast(theMessage); - if (aMsg) { - ModuleBase_FilterFactory* aFactory = myWorkshop->selectionFilters(); - if (!aMsg->attributeId().empty()) { - aFactory->assignFilter(aMsg->selectionFilterId(), aMsg->featureId(), aMsg->attributeId(), - aMsg->parameters()); - } - } } else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_UPDATE_VIEWER_BLOCKED)) { // the viewer's update context will not happens until viewer updated is emitted workshop()->displayer()->enableUpdateViewer(false);