#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>
#include <stdio.h>
-//#define AIS_CURVE_DISPLAY
-
//=======================================================================
// function: Constructor
// purpose:
: myIsLocked (false),
myDimension (theDimension),
myDisplayer (NULL),
+ myAISShape (NULL),
myNbUndos (0),
myNbRedos (0),
myUndoDepth (-1),
- myOpLevel(0)
+ myOpLevel(0),
+ mySkipSorting(false)
{
-#ifdef AIS_CURVE_DISPLAY
- myAISCurve = new CurveCreator_AISCurve( this );
-#endif
}
//=======================================================================
//=======================================================================
std::string CurveCreator_Curve::getUniqSectionName() const
{
+ CurveCreator_Section* aSection;
for( int i = 0 ; i < 1000000 ; i++ ){
char aBuffer[255];
sprintf( aBuffer, "Section_%d", i+1 );
std::string aName(aBuffer);
int j;
for( j = 0 ; j < mySections.size() ; j++ ){
- if( mySections[j]->myName == aName )
+ aSection = getSection( j );
+ if ( aSection && aSection->myName == aName )
break;
}
if( j == mySections.size() )
void CurveCreator_Curve::setDisplayer( CurveCreator_Displayer* theDisplayer )
{
myDisplayer = theDisplayer;
-
-#ifdef AIS_CURVE_DISPLAY
- myDisplayer->displayAIS( myAISCurve, false );
-#endif
}
//=======================================================================
return theIPnt * myDimension;
}
-std::vector<Handle_AIS_InteractiveObject> CurveCreator_Curve::constructSection( int theISection ) const
-{
- std::vector<Handle_AIS_InteractiveObject> aSectionRepresentation;
-
- TopoDS_Shape aShape;
- CurveCreator_Utils::constructShape( this, theISection, aShape, aSectionRepresentation );
-
- AIS_Shape* anAISShape = new AIS_Shape( aShape );
- //aShape->SetSelectionMode( AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_VERTEX ) );
- aSectionRepresentation.push_back( anAISShape );
-
- return aSectionRepresentation;
-}
-
//=======================================================================
// function: setUndoDepth
// purpose:
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 );
}
}
-//#define USE_COMPOUND
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 );
}
}
const int theNewIndex)
{
bool res = false;
- if (theISection != theNewIndex) {
- CurveCreator_Section *aSection = mySections.at(theISection);
+ int aMovedSectionId = theISection >= 0 ? theISection : mySections.size()-1;
+
+ if (aMovedSectionId != theNewIndex) {
+ CurveCreator_Section* aSection = getSection( aMovedSectionId );
// Remove section
- CurveCreator::Sections::iterator anIter = mySections.begin() + theISection;
+ CurveCreator::Sections::iterator anIter = mySections.begin() + aMovedSectionId;
mySections.erase(anIter);
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 ************/
/***********************************************/
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();
+ CurveCreator_Section* aSection;
for (; i < aNbSections; i++) {
- delete mySections[i];
+ aSection = getSection( i );
+ if ( aSection )
+ delete aSection;
}
mySections.clear();
startOperation();
// Set the difference.
if (addEmptyDiff()) {
- myListDiffs.back().init(this, CurveCreator_Operation::Clear);
+ myListDiffs.back().init(this);
}
res = clearInternal();
finishOperation();
}
//! For internal use only! Undo/Redo are not used here.
-bool CurveCreator_Curve::joinInternal( const int theISectionTo,
- const int theISectionFrom )
+bool CurveCreator_Curve::joinInternal( const std::list<int>& theSections )
{
bool res = false;
- CurveCreator_Section *aSection1 = mySections.at(theISectionTo);
- CurveCreator_Section *aSection2 = mySections.at(theISectionFrom);
-
- aSection1->myPoints.insert(aSection1->myPoints.end(),
- aSection2->myPoints.begin(),
- aSection2->myPoints.end());
+ if ( theSections.empty() )
+ return res;
+
+ int anISectionMain = theSections.front();
+ CurveCreator_Section* aSectionMain = getSection( anISectionMain );
+
+ std::list <int> aSectionsToJoin = theSections;
+ aSectionsToJoin.erase( aSectionsToJoin.begin() ); // skip the main section
+ // it is important to sort and reverse the section ids in order to correctly remove them
+ aSectionsToJoin.sort();
+ aSectionsToJoin.reverse();
+
+ std::list<int>::const_iterator anIt = aSectionsToJoin.begin(), aLast = aSectionsToJoin.end();
+ CurveCreator_Section* aSection;
+ for (; anIt != aLast; anIt++) {
+ aSection = getSection( *anIt );
+ aSectionMain->myPoints.insert(aSectionMain->myPoints.end(), aSection->myPoints.begin(),
+ aSection->myPoints.end());
+ res = removeSectionInternal(*anIt);
+ if ( !res )
+ break;
+ }
- res = removeSection(theISectionFrom);
redisplayCurve();
return res;
}
-//! Join range of sections to one section (join all sections if -1 is passed in theISectionFrom argument)
-bool CurveCreator_Curve::join( const int theISectionTo,
- const int theISectionFrom )
+bool CurveCreator_Curve::join( const std::list<int>& theSections )
{
- //TODO
bool res = false;
- if ( theISectionTo != theISectionFrom ) {
+
+ if ( !theSections.empty() )
+ {
startOperation();
if (addEmptyDiff())
- myListDiffs.back().init(this, CurveCreator_Operation::Join, theISectionTo, theISectionFrom);
+ myListDiffs.back().init(this, CurveCreator_Operation::Join, theSections);
- res = joinInternal( theISectionTo, theISectionFrom );
+ res = joinInternal( theSections );
finishOperation();
}
{
int aNbCoords = 0;
+ CurveCreator_Section* aSection;
if (theISection == -1) {
int i = 0;
const int aNbSections = getNbSections();
for (; i < aNbSections; i++) {
- aNbCoords += mySections[i]->myPoints.size();
+ aSection = getSection( i );
+ if ( aSection )
+ aNbCoords += aSection->myPoints.size();
}
} else {
- if ( ( theISection >= 0 ) && ( theISection < mySections.size() ) )
- aNbCoords = mySections.at(theISection)->myPoints.size();
+ aSection = getSection( theISection );
+ if ( aSection )
+ aNbCoords = aSection->myPoints.size();
}
return aNbCoords/myDimension;
}
+void CurveCreator_Curve::setSkipSorting( const bool theIsToSkip )
+{
+ mySkipSorting = theIsToSkip;
+}
+
+bool CurveCreator_Curve::canPointsBeSorted()
+{
+ return false;
+}
+
+/**
+ * Saves points coordinates difference.
+ * \param theOldCoords the old points coordinates
+ */
+void CurveCreator_Curve::saveCoordDiff( const SectionToPointCoordsList &theOldCoords )
+{
+ // Set the difference.
+ startOperation();
+ if (addEmptyDiff()) {
+ myListDiffs.back().init(this, theOldCoords);
+ }
+ finishOperation();
+}
+
//! Get "closed" flag of the specified section
bool CurveCreator_Curve::isClosed( const int theISection ) const
{
- return mySections.at(theISection)->myIsClosed;
+ CurveCreator_Section* aSection = getSection( theISection );
+ return aSection ? aSection->myIsClosed : false;
}
//! For internal use only! Undo/Redo are not used here.
bool CurveCreator_Curve::setClosedInternal( const int theISection,
const bool theIsClosed )
{
+ CurveCreator_Section* aSection = 0;
if (theISection == -1) {
int aSize = mySections.size();
int i;
for (i = 0; i < aSize; i++) {
- mySections[i]->myIsClosed = theIsClosed;
- redisplayCurve();
+ aSection = getSection( i );
+ if( aSection ) {
+ aSection->myIsClosed = theIsClosed;
+ redisplayCurve();
+ }
}
} else {
- mySections.at(theISection)->myIsClosed = theIsClosed;
- redisplayCurve();
+ aSection = getSection( theISection );
+ if ( aSection ) {
+ aSection->myIsClosed = theIsClosed;
+ redisplayCurve();
+ }
}
return true;
}
//! Returns specified section name
std::string CurveCreator_Curve::getSectionName( const int theISection ) const
{
- if( ( theISection >= 0 ) && ( theISection < mySections.size() ))
- return mySections.at(theISection)->myName;
- return "";
+ CurveCreator_Section* aSection = getSection( theISection );
+ return aSection ? aSection->myName : "";
}
//! For internal use only! Undo/Redo are not used here.
const std::string& theName )
{
bool res = false;
- if( ( theISection >= 0 ) && ( theISection < mySections.size() )){
- mySections.at(theISection)->myName = theName;
+ CurveCreator_Section* aSection = getSection( theISection );
+ if( aSection ) {
+ aSection->myName = theName;
res = true;
}
return res;
CurveCreator::SectionType CurveCreator_Curve::getSectionType
( const int theISection ) const
{
- return mySections.at(theISection)->myType;
+ CurveCreator_Section* aSection = getSection( theISection );
+ return aSection ? aSection->myType : CurveCreator::Polyline;
}
//! For internal use only! Undo/Redo are not used here.
bool CurveCreator_Curve::setSectionTypeInternal( const int theISection,
const CurveCreator::SectionType theType )
{
+ CurveCreator_Section* aSection;
if (theISection == -1) {
int i = 0;
const int aNbSections = getNbSections();
for (; i < aNbSections; i++) {
- mySections[i]->myType = theType;
+ aSection = getSection( i );
+ if ( aSection )
+ aSection->myType = theType;
}
redisplayCurve();
} else {
- if( mySections.at(theISection)->myType != theType ){
- mySections.at(theISection)->myType = theType;
+ aSection = getSection( theISection );
+ if ( aSection && aSection->myType != theType ){
+ aSection->myType = theType;
redisplayCurve();
}
}
CurveCreator_Section *aSection = 0;
for ( ; anIt != theSectionsMap.end(); anIt++ ) {
int anISection = anIt->first;
- aSection = mySections.at(anISection);
+ aSection = getSection( anISection );
if( aSection ) {
CurveCreator::PosPointsList aSectionPoints = anIt->second;
CurveCreator::PosPointsList::const_iterator aPntIt = aSectionPoints.begin();
CurveCreator_Section *aSection = 0;
for ( ; anIt != theSectionsMap.end(); anIt++ ) {
int anISection = anIt->first;
- aSection = mySections.at(anISection);
+ aSection = getSection( anISection );
if( aSection ) {
CurveCreator::PosPointsList aSectionPoints = anIt->second;
CurveCreator::PosPointsList::const_iterator aPntIt = aSectionPoints.begin();
}
//! Set coordinates of specified points from different sections
-bool CurveCreator_Curve::setSeveralPoints( const SectionToPointCoordsList &theSectionToPntCoords)
+bool CurveCreator_Curve::setSeveralPoints( const SectionToPointCoordsList &theSectionToPntCoords,
+ const bool theIsToSaveDiff )
{
bool res = false;
// Set the difference.
startOperation();
- if (addEmptyDiff()) {
+ if (theIsToSaveDiff && addEmptyDiff()) {
myListDiffs.back().init(this, CurveCreator_Operation::SetCoordinates,
theSectionToPntCoords);
}
//! 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
bool res = false;
// Set the difference.
startOperation();
+ SectionToPointList aListOfSectionsToPoints;
+ aListOfSectionsToPoints.push_back(std::make_pair(theISection, theIPnt));
if (addEmptyDiff()) {
myListDiffs.back().init(this, CurveCreator_Operation::RemovePoints,
- theISection, theIPnt);
+ aListOfSectionsToPoints);
}
- SectionToPointList aListOfSectionsToPoints;
- aListOfSectionsToPoints.push_back(std::make_pair(theISection, theIPnt));
res = removePointsInternal( aListOfSectionsToPoints );
finishOperation();
return res;
CurveCreator::Coordinates CurveCreator_Curve::getPoint( const int theISection,
const int theIPnt) const
{
- CurveCreator_Section *aSection = mySections.at(theISection);
+ CurveCreator_Section* aSection = getSection( theISection );
CurveCreator::Coordinates::const_iterator
anIter = aSection->myPoints.begin() + toICoord(theIPnt);
CurveCreator::Coordinates aResult(anIter, anIter + myDimension);
//=======================================================================
CurveCreator::Coordinates CurveCreator_Curve::getPoints( const int theISection ) const
{
- CurveCreator::Coordinates aCoords;
- if ( ( theISection >= 0 ) && ( theISection < mySections.size() ) )
- {
- aCoords = mySections.at(theISection)->myPoints;
- }
- return aCoords;
+ CurveCreator_Section* aSection = getSection( theISection );
+ return aSection ? aSection->myPoints : CurveCreator::Coordinates();
}
-
-/***********************************************/
-/*** Presentation methods ***/
-/***********************************************/
-std::vector<Handle_AIS_InteractiveObject> CurveCreator_Curve::constructWire() const
+void CurveCreator_Curve::constructAISObject()
{
- std::vector<Handle_AIS_InteractiveObject> aCurveRepresentation;
-
-#ifndef ONE_SHAPE
- 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) );
- }
- }
-#else
TopoDS_Shape aShape;
CurveCreator_Utils::constructShape( this, aShape );
- AIS_Shape* anAISShape = new AIS_Shape( aShape );
- //aShape->SetSelectionMode( AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_VERTEX ) );
- aCurveRepresentation.push_back( anAISShape );
-#endif
- return aCurveRepresentation;
+ myAISShape = new AIS_Shape( aShape );
}
-void CurveCreator_Curve::getPoint( const int theISection, const int theIPoint,
- gp_Pnt& thePoint ) const
+CurveCreator_Section* CurveCreator_Curve::getSection( const int theSectionId ) const
{
- double anX, anY, aZ;
- getCoordinates( theISection, theIPoint, anX, anY, aZ );
- thePoint = gp_Pnt( anX, anY, aZ);
+ CurveCreator_Section *aSection = 0;
+ if ( theSectionId >= 0 && theSectionId < mySections.size() )
+ aSection = mySections.at( theSectionId );
+
+ return aSection;
+}
+
+Handle(AIS_InteractiveObject) CurveCreator_Curve::getAISObject( const bool theNeedToBuild ) const
+{
+ 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 = getSection( 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 aRes;
+}
+
+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;
+ }
}
