X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_WorkshopListener.h;h=70cca034379a2ef28740cd54f94515edd200e436;hb=4de8d53fef7532b6843d79c970f55ad46f98da62;hp=aad3aa07a0024488f06f9e461e7129227b74236e;hpb=3dfd84103767b529d6b96935a6879432774cd082;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_WorkshopListener.h b/src/XGUI/XGUI_WorkshopListener.h
old mode 100755
new mode 100644
index aad3aa07a..70cca0343
--- a/src/XGUI/XGUI_WorkshopListener.h
+++ b/src/XGUI/XGUI_WorkshopListener.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef XGUI_WORKSHOP_LISTENER_H
@@ -50,7 +49,7 @@ class XGUI_EXPORT XGUI_WorkshopListener : public QObject, public Events_Listener
 public:
   /// Constructor. Used only if the workshop is launched in Salome environment
   /// \param theWorkshop a reference to workshop.
-   XGUI_WorkshopListener(ModuleBase_IWorkshop* theWorkshop);
+   XGUI_WorkshopListener(XGUI_Workshop* theWorkshop);
   virtual ~XGUI_WorkshopListener();
 
   /// Register this class in the events loop for several types of events
@@ -59,13 +58,6 @@ public:
   //! Redefinition of Events_Listener method
   virtual void processEvent(const std::shared_ptr<Events_Message>& theMessage);
 
-  //! Returns state of blocking fitAll command
-  bool isFitAllBlocked() const { return myBlockFitAll; }
-
-  //! Sets state of blocking fitAll command
-  //! \param toBlock a new blocking state
-  void setFitAllBlocked(bool toBlock) { myBlockFitAll = toBlock; }
-
 signals:
   /// Emitted when error in applivation happens
   void errorOccurred(std::shared_ptr<Events_InfoMessage> theMsg);
@@ -98,13 +90,6 @@ protected:
   /// \return true if the object is displayed
   bool displayObject(ObjectPtr theObj);
 
-  /// Answer if the viewer needed to be fit all after the object visualization
-  /// The condition is there is not shown objects and the object is a group or body result
-  /// \param theObject a shown object
-  /// \param theNbOfShownObjects a count of already shown objects in the viewer
-  /// \return true if fit all should be done
-  bool neededFitAll(ObjectPtr theObject, const int theNbOfShownObjects);
-
   /// Calls the module method of cusomize object for the feature of the current operation
   /// Perform cusomize if the force redisplay flag is true or the list of objects contains the
   /// current operation feature
@@ -112,16 +97,18 @@ protected:
   ///                   if forced redisplay is false
   /// \param theForceRedisplay a flag to customize object even always
   /// \return true if the object is modified
-  bool customizeCurrentObject(const std::set<ObjectPtr>& theObjects, bool theForceRedisplay);
+  bool customizeFeature(const std::set<ObjectPtr>& theObjects, bool theForceRedisplay);
 
   /// Returns the workshop
   XGUI_Workshop* workshop() const;
 
 private:
-  ModuleBase_IWorkshop* myWorkshop; // the current workshop
+
+  void setDisplayed(ObjectPtr theObject, const bool theIsLoadedScript, bool& theDisplayed);
+
+  XGUI_Workshop* myWorkshop; // the current workshop
 
   bool myUpdatePrefs;
-  bool myBlockFitAll;
 };
 
 #endif