X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Curve.hxx;h=5747dd8bbc2dce64eb6006d3a7b565b098701345;hb=e38481b5d965c3736d2c8eda39b1a30bd125147b;hp=d5428008528831ac6cba1a87f70bd5e2f322752f;hpb=7e825ec456c9331ef0df1cb59865cc55f0d8516a;p=modules%2Fhydro.git

diff --git a/src/HYDROCurveCreator/CurveCreator_Curve.hxx b/src/HYDROCurveCreator/CurveCreator_Curve.hxx
index d5428008..5747dd8b 100644
--- a/src/HYDROCurveCreator/CurveCreator_Curve.hxx
+++ b/src/HYDROCurveCreator/CurveCreator_Curve.hxx
@@ -34,6 +34,7 @@
 #include <AIS_InteractiveObject.hxx>
 
 #include <list>
+#include <map>
 
 struct CurveCreator_Section;
 class CurveCreator_Displayer;
@@ -69,6 +70,9 @@ public:
   //! Set curve creator Displayer object
   virtual void setDisplayer( CurveCreator_Displayer* theDisplayer );
 
+  //! Return curve creator Displayer object
+  CurveCreator_Displayer* getDisplayer();
+
   //! Remove curve creator Displayer object
   virtual void removeDisplayer();
 
@@ -91,6 +95,13 @@ public:
 
   ListAISObjects constructSection( int theISection ) const;
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool moveSectionInternal(const int theISection,
+                           const int theNewIndex);
+  //! Move section to new position in list
+  virtual bool moveSection(const int theISection,
+                   const int theNewIndex);
+
 protected:
   /** This method updates all undo/redo information required to be updated
    *  after curve modification operation. It returns false if undo/redo
@@ -104,6 +115,9 @@ protected:
 
   void redisplayCurve();
 
+  void convert( const SectionToPointList &thePoints,
+                std::map<int, std::list<int> > &theConvPoints );
+
 public:
   /************   Implementation of INTERFACE methods   ************/
 
@@ -128,9 +142,14 @@ public:
   /***           Section methods               ***/
   /***********************************************/
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool clearInternal();
   //! Clear the polyline (remove all sections)
   virtual bool clear();
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool joinInternal( const int theISectionTo = -1, 
+                             const int theISectionFrom = -1 );
   //! Join range of sections to one section (join all sections if -1 is passed in one of arguments)
   virtual bool join( const int theISectionTo = -1, 
                      const int theISectionFrom = -1 );
@@ -138,23 +157,32 @@ public:
   //! Get number of sections
   virtual int getNbSections() const;
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual int addSectionInternal( const std::string &theName, 
+                                  const CurveCreator::SectionType theType,
+                                  const bool theIsClosed,
+                                  const CurveCreator::Coordinates &thePoints);
   //! Add a new section.
   virtual int addSection( const std::string &theName, 
                            const CurveCreator::SectionType theType,
                            const bool theIsClosed );
-
   //! Add a new section.
   virtual int addSection( const std::string &theName, 
                            const CurveCreator::SectionType theType,
                            const bool theIsClosed,
                            const CurveCreator::Coordinates &thePoints);
-
+  
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool removeSectionInternal( const int theISection );
   //! Removes the given sections.
   virtual bool removeSection( const int theISection );
 
   //! Get "closed" flag of the specified section
   virtual bool isClosed( const int theISection ) const;
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool setClosedInternal( const int theISection, 
+                                  const bool theIsClosed );
   /**
    *  Set "closed" flag of the specified section (all sections if
    *  \a theISection is -1).
@@ -165,6 +193,9 @@ public:
   //! Returns specifyed section name
   virtual std::string getSectionName( const int theISection ) const;
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool setSectionNameInternal( const int theISection, 
+                                       const std::string& theName );
   /** Set name of the specified section */
   virtual bool setSectionName( const int theISection, 
                                const std::string& theName );
@@ -172,6 +203,9 @@ public:
   //! Get type of the specified section
   virtual CurveCreator::SectionType getSectionType( const int theISection ) const;
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool setSectionTypeInternal( const int theISection, 
+                                       const CurveCreator::SectionType theType );
   /**
    *  Set type of the specified section (or all sections
    *  if \a theISection is -1).
@@ -184,6 +218,8 @@ public:
   /***           Point methods                 ***/
   /***********************************************/
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool addPointsInternal( const CurveCreator::SectionsMap &theSectionsMap );
   /**
    *  Add one point to the specified section starting from the given theIPnt index
    *  (or at the end of points if \a theIPnt is -1).
@@ -192,14 +228,24 @@ public:
                           const int theISection,
                           const int theIPnt = -1 );
 
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool setPointInternal( const CurveCreator::SectionsMap &theSectionsMap );
    //! Set coordinates of specified point
   virtual bool setPoint( const int theISection,
                          const int theIPnt,
                          const CurveCreator::Coordinates& theNewCoords );
 
+  //! Set coordinates of specified points from different sections
+  virtual bool setSeveralPoints( const SectionToPointCoordsList &theSectionToPntCoords);
+
+  //! For internal use only! Undo/Redo are not used here.
+  virtual bool removePointsInternal( const SectionToPointList &thePoints );
   /** Remove point with given id */
   virtual bool removePoint( const int theISection, const int theIPnt = -1 );
 
+  //! Remove several points from different sections with given ids
+  virtual bool removeSeveralPoints( const SectionToPointList &theSectionToPntIDs);
+
   //! Get coordinates of specified point
   virtual CurveCreator::Coordinates getPoint( const int theISection, 
                                               const int theIPnt ) const;