X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Curve.cxx;h=0c6c45be4b9bb85032d42816ef96cd575d0aabac;hb=c363fc5c3541669e07cf4d991cc1e94253147ac1;hp=cab312d69de6ff42e1f9ab33befe6897d88770ca;hpb=1c7e2cd6a209334f05f76aaf952881636ba0969c;p=modules%2Fhydro.git

diff --git a/src/HYDROCurveCreator/CurveCreator_Curve.cxx b/src/HYDROCurveCreator/CurveCreator_Curve.cxx
index cab312d6..0c6c45be 100644
--- a/src/HYDROCurveCreator/CurveCreator_Curve.cxx
+++ b/src/HYDROCurveCreator/CurveCreator_Curve.cxx
@@ -28,9 +28,8 @@
 #include "CurveCreator_Displayer.h"
 #include "CurveCreator_Utils.h"
 
-#include <AIS_Point.hxx>
-#include <AIS_Line.hxx>
 #include <AIS_Shape.hxx>
+#include <AIS_InteractiveObject.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Lin.hxx>
@@ -40,8 +39,6 @@
 
 #include <stdio.h>
 
-//#define AIS_CURVE_DISPLAY
-
 //=======================================================================
 // function: Constructor
 // purpose:
@@ -50,14 +47,12 @@ CurveCreator_Curve::CurveCreator_Curve( const CurveCreator::Dimension theDimensi
 : myIsLocked  (false),
   myDimension (theDimension),
   myDisplayer (NULL),
+  myAISShape  (NULL),
   myNbUndos   (0),
   myNbRedos   (0),
   myUndoDepth (-1),
   myOpLevel(0)
 {
-#ifdef AIS_CURVE_DISPLAY
-  myAISCurve = new CurveCreator_AISCurve( this );
-#endif
 }
 
 //=======================================================================
@@ -107,10 +102,6 @@ std::string CurveCreator_Curve::getUniqSectionName() const
 void CurveCreator_Curve::setDisplayer( CurveCreator_Displayer* theDisplayer )
 {
   myDisplayer = theDisplayer;
-  
-#ifdef AIS_CURVE_DISPLAY
-  myDisplayer->displayAIS( myAISCurve, false );
-#endif
 }
 
 //=======================================================================
@@ -182,61 +173,6 @@ int CurveCreator_Curve::toICoord(const int theIPnt) const
   return theIPnt * myDimension;
 }
 
-//#define USE_COMPOUND
-std::vector<Handle_AIS_InteractiveObject> CurveCreator_Curve::constructSection( int theISection ) const
-{
-  std::vector<Handle_AIS_InteractiveObject> aSectionRepresentation;
-  CurveCreator::SectionType aSectType = getSectionType( theISection );
-
-  bool isShapeConstruct = false;
-#ifdef USE_COMPOUND
-  isShapeConstruct = true;
-#else
-  isShapeConstruct = aSectType == CurveCreator::Spline;
-#endif
-
-  if ( isShapeConstruct ) {
-    TopoDS_Shape aShape;
-    CurveCreator_Utils::constructShape( this, theISection, aShape );
-    AIS_Shape* anAISShape = new AIS_Shape( aShape );
-    //aShape->SetSelectionMode( AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_VERTEX ) );
-    aSectionRepresentation.push_back( anAISShape );
-    if ( aSectType != CurveCreator::Spline )
-      return aSectionRepresentation;
-  }
-
-  int aPointSize = getNbPoints( theISection );
-  bool aSectIsClosed = isClosed( theISection );
-  if( aSectType == CurveCreator::Polyline )
-  {
-    int iPoint = 0; 
-    for( ; iPoint < ( aPointSize - 1 ) ; iPoint++ ){
-      Handle_AIS_Point anAISPnt = getAISPoint(theISection, iPoint);
-      aSectionRepresentation.push_back( anAISPnt );
-      Handle_AIS_Line aLine = getAISLine( theISection, iPoint, iPoint+1 );
-      aSectionRepresentation.push_back( aLine );
-    }
-    if( aPointSize != 0 ){
-      Handle_AIS_Point anAISPnt = getAISPoint(theISection, iPoint); 
-      aSectionRepresentation.push_back( anAISPnt );
-      if( isClosed(theISection) && ( aPointSize > 1 ) ){
-        Handle_AIS_Line aLine = getAISLine( theISection, iPoint, 0 );
-        aSectionRepresentation.push_back( aLine );
-      }
-    }
-  }
-  else if( aSectType == CurveCreator::Spline )
-  {
-    std::vector<double> aPoints;
-    for( int iPoint = 0; iPoint < aPointSize; iPoint++ )
-    {
-      Handle_AIS_Point anAISPnt = getAISPoint( theISection, iPoint );
-      aSectionRepresentation.push_back( anAISPnt );
-    }
-  }
-  return aSectionRepresentation;
-}
-
 //=======================================================================
 // function: setUndoDepth
 // purpose:
@@ -295,35 +231,6 @@ int CurveCreator_Curve::getUndoDepth() const
   return myUndoDepth;
 }
 
-Handle_AIS_Point CurveCreator_Curve::getAISPoint( int theISection, int theIPoint ) const
-{
-  double anX, anY, aZ;
-  getCoordinates( theISection, theIPoint, anX, anY, aZ );
-  gp_Pnt aPoint( anX, anY, aZ);
-
-  AIS_Point* aPnt = new AIS_Point( new Geom_CartesianPoint(aPoint));
-  return aPnt;
-}
-
-Handle_AIS_Line CurveCreator_Curve::getAISLine( int theISection, int theIPoint1, int theIPoint2 ) const
-{
-  double anX, anY, aZ;
-  getCoordinates( theISection, theIPoint1, anX, anY, aZ );
-  gp_Pnt aPoint1( anX, anY, aZ);
-
-  double anX2, anY2, aZ2;
-  getCoordinates( theISection, theIPoint2, anX2, anY2, aZ2 );
-//MTN to avoid crash during line construction
-  if( ( anX == anX2 ) && ( anY == anY2 ) && (aZ == aZ2 ) ){
-    aZ2 += 1e-7;
-  }
-
-  gp_Pnt aPoint2( anX2, anY2, aZ2 );
-
-  AIS_Line* aLine = new AIS_Line( new Geom_CartesianPoint(aPoint1), new Geom_CartesianPoint(aPoint2) );
-  return aLine;
-}
-
 void CurveCreator_Curve::getCoordinates( int theISection, int theIPoint, double& theX, double& theY, double& theZ ) const
 {
   CurveCreator::Coordinates aCoords = getPoint( theISection, theIPoint );
@@ -338,26 +245,10 @@ void CurveCreator_Curve::getCoordinates( int theISection, int theIPoint, double&
 void CurveCreator_Curve::redisplayCurve()
 {
   if( myDisplayer ) {
-#ifdef AIS_CURVE_DISPLAY
-    myDisplayer->redisplayAIS(myAISCurve, false);
-#else
-    myDisplayer->erase( false );
-//#ifndef USE_COMPOUND
-    myDisplayer->display( constructWire(), true );
-//#else
-    /*std::vector<Handle_AIS_InteractiveObject> anAISObjects = constructWire();
-    int aSelMode = AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_VERTEX );
-    Handle(AIS_InteractiveContext) aContext = myDisplayer->getAISContext();
-    for( int i = 0 ; i < anAISObjects.size() ; i++ ){
-      Handle_AIS_InteractiveObject anAISObject = anAISObjects[i];
-      //anAISObject->SetSelectionMode( aSelMode );
-      aContext->Display( anAISObject, Standard_False );
-      //aContext->Display( anAISObject, 0, aSelMode, Standard_False, Standard_True );
-    }
-      aContext->UpdateCurrentViewer();
-    */
-//#endif
-#endif
+    myDisplayer->eraseAll( false );
+    myAISShape = NULL;
+
+    myDisplayer->display( getAISObject( true ), true );
   }
 }
 
@@ -403,25 +294,6 @@ bool CurveCreator_Curve::moveSection(const int theISection,
   return res;
 }
 
-void CurveCreator_Curve::convert( const SectionToPointList& thePoints,
-                                  std::map< int, std::list<int> >& theConvPoints )
-{
-  theConvPoints.clear();
-
-  SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end();
-  std::list<int> aPoints;
-  int aSectionId, aPointId;
-  for ( ; anIt != aLast; anIt++ ) {
-    aSectionId = anIt->first;
-    aPointId = anIt->second;
-    aPoints.clear();
-    if ( theConvPoints.find( aSectionId ) != theConvPoints.end() )
-      aPoints = theConvPoints[aSectionId];
-    aPoints.push_back( aPointId );
-    theConvPoints[aSectionId] = aPoints;
-  }
-}
-
 /************   Implementation of INTERFACE methods   ************/
 
 /***********************************************/
@@ -475,8 +347,10 @@ bool CurveCreator_Curve::redo()
 bool CurveCreator_Curve::clearInternal()
 {
   // erase curve from the viewer
-  if( myDisplayer )
-    myDisplayer->erase( true );
+  if( myDisplayer ) {
+    myDisplayer->eraseAll( true );
+    myAISShape = NULL;
+  }
   // Delete all allocated data.
   int i = 0;
   const int aNbSections = getNbSections();
@@ -957,34 +831,19 @@ bool CurveCreator_Curve::setSeveralPoints( const SectionToPointCoordsList &theSe
 //! For internal use only! Undo/Redo are not used here.
 bool CurveCreator_Curve::removePointsInternal( const SectionToPointList &thePoints )
 {
-  bool res = false;
+  bool aRes = false;
   std::map<int, std::list<int> > aConvPoints;
   convert( thePoints, aConvPoints );
   std::map<int, std::list<int> >::const_iterator anIt = aConvPoints.begin(),
                                           aLast = aConvPoints.end();
-  CurveCreator_Section *aSection = 0;
   for ( ; anIt != aLast; anIt++ ) {
     int aSectionId = anIt->first;
-    aSection = mySections.at(aSectionId);
-    if( aSection ) {
-      std::list<int> aSectionPoints = anIt->second;
-      aSectionPoints.sort();
-      std::list<int>::const_reverse_iterator aPntIt = aSectionPoints.rbegin();
-      for( ; aPntIt != aSectionPoints.rend(); aPntIt++ ){
-        int aPntIndx = *aPntIt;
-        CurveCreator::Coordinates::iterator aFirstPosition;
-        if(aPntIndx == -1)
-          aFirstPosition = aSection->myPoints.end() - getDimension();
-        else
-          aFirstPosition = aSection->myPoints.begin() + toICoord(aPntIndx);
-        aSection->myPoints.erase( aFirstPosition, aFirstPosition + getDimension() );
-        res = true;
-      }
-    }
+    aRes = removeSectionPoints(aSectionId, anIt->second);
   }
-  if(res)
+  if( aRes)
     redisplayCurve();
-  return res;
+
+  return aRes;
 }
 
 //! Remove point with given id
@@ -1048,27 +907,63 @@ CurveCreator::Coordinates CurveCreator_Curve::getPoints( const int theISection )
   return aCoords;
 }
 
+void CurveCreator_Curve::constructAISObject()
+{
+  TopoDS_Shape aShape;
+  CurveCreator_Utils::constructShape( this, aShape );
 
-/***********************************************/
-/***       Presentation methods              ***/
-/***********************************************/
-std::vector<Handle_AIS_InteractiveObject> CurveCreator_Curve::constructWire() const
+  myAISShape = new AIS_Shape( aShape );
+}
+
+Handle(AIS_InteractiveObject) CurveCreator_Curve::getAISObject( const bool theNeedToBuild ) const
 {
-  std::vector<Handle_AIS_InteractiveObject> aCurveRepresentation;
-  std::vector<Handle_AIS_InteractiveObject> aSectionObjects;
-  for( int iSection = 0 ; iSection < getNbSections() ; iSection++ ){
-    aSectionObjects = constructSection( iSection );
-    for( int iObject = 0 ; iObject < aSectionObjects.size() ; iObject++ ){
-      aCurveRepresentation.push_back( aSectionObjects.at(iObject) );
-    }
+  if ( !myAISShape && theNeedToBuild ) {
+    CurveCreator_Curve* aCurve = (CurveCreator_Curve*)this;
+    aCurve->constructAISObject();
+  }
+  return myAISShape;
+}
+
+bool CurveCreator_Curve::removeSectionPoints( const int theSectionId,
+                                              const std::list<int>& thePointIds )
+{
+  bool aRes = false;
+
+  CurveCreator_Section *aSection = mySections.at( theSectionId );
+  if ( !aSection )
+    return aRes;
+
+  std::list<int> aSectionPoints = thePointIds;
+  aSectionPoints.sort();
+  std::list<int>::const_reverse_iterator aPntIt = aSectionPoints.rbegin();
+  for ( ; aPntIt != aSectionPoints.rend(); aPntIt++ ) {
+    int aPntIndx = *aPntIt;
+    CurveCreator::Coordinates::iterator aFirstPosition;
+    if ( aPntIndx == -1 )
+      aFirstPosition = aSection->myPoints.end() - getDimension();
+    else
+      aFirstPosition = aSection->myPoints.begin() + toICoord( aPntIndx );
+    aSection->myPoints.erase( aFirstPosition, aFirstPosition + getDimension() );
+    aRes = true;
   }
-  return aCurveRepresentation;
+  return aRes;
 }
 
-void CurveCreator_Curve::getPoint( const int theISection, const int theIPoint,
-                                   gp_Pnt& thePoint ) const
+void CurveCreator_Curve::convert( const SectionToPointList& thePoints,
+                                  std::map< int, std::list<int> >& theConvPoints )
 {
-  double anX, anY, aZ;
-  getCoordinates( theISection, theIPoint, anX, anY, aZ );
-  thePoint = gp_Pnt( anX, anY, aZ);
+  theConvPoints.clear();
+
+  SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end();
+  std::list<int> aPoints;
+  int aSectionId, aPointId;
+  for ( ; anIt != aLast; anIt++ ) {
+    aSectionId = anIt->first;
+    aPointId = anIt->second;
+    aPoints.clear();
+    if ( theConvPoints.find( aSectionId ) != theConvPoints.end() )
+      aPoints = theConvPoints[aSectionId];
+    aPoints.push_back( aPointId );
+    theConvPoints[aSectionId] = aPoints;
+  }
 }