Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / PartSet / PartSet_Module.h

diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h
index 627d088b15bf30c63627d5b317449d3a1191d41b..58e0995798c4a7cf5b4d5ab7a63542aade1da237 100644 (file)
--- a/src/PartSet/PartSet_Module.h
+++ b/src/PartSet/PartSet_Module.h
@@ -21,6 +21,7 @@ class PartSet_Listener;
 class ModelAPI_Feature;
 class XGUI_ViewerPrs;
 class ModuleBase_Operation;
+class GeomAPI_AISObject;
 
 class PARTSET_EXPORT PartSet_Module: public ModuleBase_IModule
 {
@@ -55,13 +56,13 @@ public:
   /// \param theFeature the feature instance to be displayed
   /// \param isDisplay the state whether the presentation should be displayed or erased
   /// \param isUpdateViewer the flag whether the viewer should be updated
-  void visualizePreview(FeaturePtr theFeature, bool isDisplay,
-                        const bool isUpdateViewer = true);
+  //void visualizePreview(FeaturePtr theFeature, bool isDisplay,
+  //                      const bool isUpdateViewer = true);
 
   /// Activates the feature in the displayer
   /// \param theFeature the feature instance to be displayed
   /// \param isUpdateViewer the flag whether the viewer should be updated
-  void activateFeature(FeaturePtr theFeature,
+  void activateFeature(ObjectPtr theFeature,
                        const bool isUpdateViewer);
 
   /// Updates current operation preview, if it has it.
@@ -112,7 +113,7 @@ public slots:
   /// SLOT, to fit all current viewer
   void onFitAllView();
 
-  void onLaunchOperation(std::string theName, FeaturePtr theFeature);
+  void onLaunchOperation(std::string theName, ObjectPtr theFeature);
 
   /// SLOT, to switch on/off the multi selection in the viewer
   /// \param theEnabled the enabled state
@@ -121,11 +122,11 @@ public slots:
   /// SLOT, to stop or start selection mode for the features
   /// \param theFeatures a list of features to be disabled
   /// \param theToStop the boolean state whether it it stopped or non stopped
-  void onStopSelection(const QFeatureList& theFeatures, const bool isStop);
+  void onStopSelection(const QList<ObjectPtr>& theFeatures, const bool isStop);
 
   /// SLOT, to set selection
   /// \param theFeatures a list of features to be selected
-  void onSetSelection(const QFeatureList& theFeatures);
+  void onSetSelection(const QList<ObjectPtr>& theFeatures);
 
   /// SLOT, to close the viewer local context
   void onCloseLocalContext();
@@ -133,13 +134,12 @@ public slots:
   /// SLOT, to visualize the feature in another local context mode
   /// \param theFeature the feature to be put in another local context mode
   /// \param theMode the mode appeared on the feature
-  void onFeatureConstructed(FeaturePtr theFeature,
-                            int theMode);
+  void onFeatureConstructed(ObjectPtr theFeature, int theMode);
 
   /// Slot which reacts to the point 2d set to the feature. Creates a constraint
   /// \param the feature
   /// \param the attribute of the feature
-  void onStorePoint2D(FeaturePtr theFeature, const std::string& theAttribute);
+  void onStorePoint2D(ObjectPtr theFeature, const std::string& theAttribute);
 
 protected:
   /// Creates a new operation