]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Warnings correction for moc files generation
authornds <nds@opencascade.com>
Wed, 1 Feb 2017 12:10:45 +0000 (15:10 +0300)
committernds <nds@opencascade.com>
Wed, 1 Feb 2017 12:11:11 +0000 (15:11 +0300)
Remove FilterFactory as it is not used anymore.

30 files changed:
src/CollectionPlugin/CMakeLists.txt
src/Config/CMakeLists.txt
src/Config/Config_Common.cpp
src/Config/Config_Keywords.h
src/Config/Config_SelectionFilterMessage.cpp [deleted file]
src/Config/Config_SelectionFilterMessage.h [deleted file]
src/Config/Config_ValidatorReader.cpp
src/Config/Config_ValidatorReader.h
src/Config/Config_WidgetReader.cpp
src/Config/Config_XMLReader.h
src/ModuleBase/CMakeLists.txt
src/ModuleBase/ModuleBase_FilterFactory.cpp [deleted file]
src/ModuleBase/ModuleBase_FilterFactory.h [deleted file]
src/ModuleBase/ModuleBase_IModule.cpp
src/ModuleBase/ModuleBase_IModule.h
src/ModuleBase/ModuleBase_IViewer.h
src/ModuleBase/ModuleBase_IWorkshop.cpp
src/ModuleBase/ModuleBase_IWorkshop.h
src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp
src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
src/ModuleBase/ModuleBase_WidgetValidated.cpp
src/ParametersPlugin/CMakeLists.txt
src/PartSet/CMakeLists.txt
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.h
src/SHAPERGUI/CMakeLists.txt
src/SamplePanelPlugin/CMakeLists.txt
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_WorkshopListener.cpp

index 5208b70622a067551451919188ede9d13aa72c98..9b896ba5df58794edc942872a41f1d8072464deb 100644 (file)
@@ -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})
 
index 831f62020162a31695440230b84bc2034865adbb..e5f3d42a71c96283705d0661193ad6da11484928 100644 (file)
@@ -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
index cb866a7d55dbca72facd4af0cd0c8c825b8f3d0d..e6657fe4f1663822901ba26c62f7dfd521352eb3 100644 (file)
@@ -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?
index 503215422131cb418e995957ff35aaf21e283dbd..6b4a1312f49a902d794ae9ce18e1d68c4b9dc260 100644 (file)
@@ -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 (file)
index cb958cd..0000000
+++ /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.h>
-
-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<std::string>& 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<std::string>& parameters)
-{
-  myFilterParameters = parameters;
-}
-
diff --git a/src/Config/Config_SelectionFilterMessage.h b/src/Config/Config_SelectionFilterMessage.h
deleted file mode 100644 (file)
index ed661b9..0000000
+++ /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 <Events_Message.h>
-#include <Config_def.h>
-
-#include <list>
-#include <string>
-
-/// 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<std::string> 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<std::string>& 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<std::string>& parameters);
-};
-
-#endif /* CONFIG_SELECTIONFILTERMESSAGE_H_ */
index d15293f6758f18168e946f9be2ca90661ad25615..442cf5042828e1706169e5a7c2029788ca3bc6a5 100644 (file)
@@ -11,7 +11,6 @@
 #include <Config_Keywords.h>
 #include <Config_Common.h>
 #include <Config_ValidatorMessage.h>
-#include <Config_SelectionFilterMessage.h>
 #include <Config_PropManager.h>
 
 #include <Events_Loop.h>
@@ -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<Config_SelectionFilterMessage> aMessage(
-      new Config_SelectionFilterMessage(aFilterEvent, this));
-  std::string aSelectionFilterId;
-  std::list<std::string> 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);
-}
index 59f6acffb0fc9d63dc6ed0bc672166c3d22b96f5..8c44362fb1269dfad203f805312c8b07c36af9c5 100644 (file)
@@ -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;
index 4a6590c68a20446a7300d17e4da827ca498b5730..a839b9662492366c16eb3494192bc6a07c396eea 100644 (file)
@@ -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);
 }
 
index 851ff1b28c617c473dc4a830be518cfbd69d4125..ccb0611154dd7d9d1267c8b83dba05a691296f31 100644 (file)
@@ -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);
 
index 9462688a7d3e66fcda65a5f36f0be7f0df645bc1..1257a139937e9bc116c916187a542d2ec48850ca 100644 (file)
@@ -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 (file)
index b30ad90..0000000
+++ /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 <ModuleBase_Filter.h>
-
-//#include <Model_FeatureValidator.h>
-#include <ModelAPI_Feature.h>
-#include <ModelAPI_Attribute.h>
-#include <ModelAPI_Data.h>
-//#include <ModelAPI_AttributeValidator.h>
-#include <Events_InfoMessage.h>
-
-
-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<std::string>& theArguments)
-{
-  // create feature-structures if not exist
-  std::map<std::string, std::map<std::string, AttrFilters> >::iterator aFeature = myAttrs.find(
-    theFeatureID);
-  if (aFeature == myAttrs.end()) {
-    myAttrs[theFeatureID] = std::map<std::string, AttrFilters>();
-    aFeature = myAttrs.find(theFeatureID);
-  }
-  // add attr-structure if not exist, or generate error if already exist
-  std::map<std::string, AttrFilters>::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<ModuleBase_Filter*>& theFilters/*,
-                                        std::list<std::list<std::string> >& theArguments*/) const
-{
-  SelectMgr_ListOfFilter aFilters;
-
-  std::map<std::string, std::map<std::string, AttrFilters> >::const_iterator aFeature =
-    myAttrs.find(theFeatureID);
-  if (aFeature != myAttrs.cend()) {
-    std::map<std::string, AttrFilters>::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<std::string, ModuleBase_Filter*>::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<std::string, ModuleBase_Filter*>::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 (file)
index c1a7e36..0000000
+++ /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 <SelectMgr_ListOfFilter.hxx>
-
-#include <map>
-#include <set>
-
-/**
- * \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<std::string, ModuleBase_Filter*> myIDs;  ///< map from ID to registered filter
-  /// filters IDs to list of arguments
-  typedef std::map<std::string, std::list<std::string> > AttrFilters;
-  /// filters IDs by feature ID
-  std::map<std::string, AttrFilters> myFeatures;
-  /// filters IDs and arguments by feature and attribute IDs
-  std::map<std::string, std::map<std::string, AttrFilters> > 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<std::string>& 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
index 49ade2db45e3e1bc0ef18372a33db362706ca147..3a5aebb6a90e49f14dc750114f84b0c3c20a0ab4 100644 (file)
@@ -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();
index 3b395d297297b3a5fb6e39cdb00f705ce940b483..b57291d2615e31deba45cffd279967de61f1cf77 100755 (executable)
@@ -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() {}
 
index 5331ba0208b008608a8d956c7bb335551d75cb7f..5e989232480beedb819f6636c9b57c5eae2cdc8f 100644 (file)
@@ -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;
 
index 60d1d5fd15e1299790d19ce78bdf9c3a9c61b470..adc7a157f0f3c993c698154c21377a9b37ce5b25 100644 (file)
@@ -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;
-}
index 356196f0c99c477a29a169e9238013d35c44a09c..8c5695aa8f3106da72a5f562cbb6478612dec100 100644 (file)
@@ -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;
 
index 4dcbecf714aac75d12b8fc0ab17c9c7228ec3bcf..fb24a1715c064ec293dda8c839cb0c21a46126f0 100644 (file)
@@ -11,7 +11,6 @@
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_IViewer.h>
 #include <ModuleBase_Tools.h>
-#include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_Filter.h>
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_ViewerPrs.h>
index 46fc98370adee4d886d1cd61bee8afb68bb1dc78..22955490032bc9e558c61f4426170c01c4a1f25d 100644 (file)
@@ -10,7 +10,6 @@
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_IViewer.h>
 #include <ModuleBase_Tools.h>
-#include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_Filter.h>
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_ViewerPrs.h>
index b6ce46421a2604b77805073d95956e9b2a098fb2..2b18811d70987cf8898e9196f084c3e4db3247a7 100644 (file)
@@ -1,8 +1,8 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
 #include <ModuleBase_WidgetValidated.h>
-#include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_IViewer.h>
+#include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_ISelection.h>
 #include <ModuleBase_WidgetSelectorStore.h>
 #include <ModuleBase_ViewerPrs.h>
index d48ade3a59ad92d8643f15079e682304fab1f555..939b7673b1eb9243cd0f51f868d0be443ade3e67 100644 (file)
@@ -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})
index b9a6dc1f0880bfc1be44ba8715c96cc63af2efc8..ad4506730dfdca54a4b15e905642ff3242d8ade2 100644 (file)
@@ -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
index c08cce43cc3d981b83b9114dab31a5bcb13417d9..4fc3b6ab0c559bea32490b2f63efac028656fe6d 100755 (executable)
@@ -37,7 +37,6 @@
 #include <ModuleBase_IPropertyPanel.h>
 #include <ModuleBase_WidgetEditor.h>
 #include <ModuleBase_WidgetValidated.h>
-#include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_OperationFeature.h>
 #include <ModuleBase_WidgetFactory.h>
@@ -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<XGUI_ModuleConnector*>(workshop());
-  ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters();
-}
-
 void PartSet_Module::registerProperties()
 {
   Config_PropManager::registerProp(SKETCH_TAB_NAME, "planes_size", "Size", Config_Prop::Double,
index 91338d132c19fe5a108eabf18dafc273a53a86b8..f5f8976869d1bbd05ea684142cde789d114eb559 100755 (executable)
@@ -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();
 
index 9f7d4620c7e9b1aeb94bb1c1dca74e8376c9034e..d7c2040c2bd5a28ea490226b397f092a5c835cb5 100644 (file)
@@ -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)
index 4c9c5eaa87c507da296d93c5dfa3b8ae66c2f260..0f081864a4b55eb0c2b6ef061f1078cacde89e9d 100755 (executable)
@@ -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})
 
index 371e6d99d16a52261376f994f5fd85140e0bfc7c..41cb4c2eec324b9c5d1dc1bd3d9255c45ede47ee 100644 (file)
@@ -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)
index 03d602762a4a56d3e3e16431dbaa507ee12e5558..527d4423e2d22002bbc3d1ab9afa6c2826499db6 100755 (executable)
@@ -58,7 +58,6 @@
 #include <Events_InfoMessage.h>
 #include <Events_LongOp.h>
 
-#include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_IViewer.h>
 #include <ModuleBase_Operation.h>
@@ -80,7 +79,6 @@
 #include <Config_ModuleReader.h>
 #include <Config_PointerMessage.h>
 #include <Config_PropManager.h>
-#include <Config_SelectionFilterMessage.h>
 #include <Config_DataModelReader.h>
 #include <Config_Translator.h>
 
index 55bfec3d85754df63afe4cab8a32a06b266336b8..11e1d9866b551d8d32ed0f39f02d9acfc4708f84 100755 (executable)
 #include <ModuleBase_OperationFeature.h>
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_IViewer.h>
-#include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_WidgetSelector.h>
 
 #include <Config_FeatureMessage.h>
 #include <Config_PointerMessage.h>
-#include <Config_SelectionFilterMessage.h>
 #include <Config_Keywords.h>
 #include <Events_InfoMessage.h>
 
@@ -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<Events_Message>&
     } else {
       QApplication::restoreOverrideCursor();
     }
-  }
-  else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_SELFILTER_LOADED)) {
-    std::shared_ptr<Config_SelectionFilterMessage> aMsg =
-      std::dynamic_pointer_cast<Config_SelectionFilterMessage>(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);