Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug #183: regression: polyline - unnecessary table in Additition mode.
[modules/hydro.git]
/
src
/
HYDROCurveCreator
/
CurveCreator_Curve.hxx
diff --git
a/src/HYDROCurveCreator/CurveCreator_Curve.hxx
b/src/HYDROCurveCreator/CurveCreator_Curve.hxx
index 0baf0775c6081b12948f5cedc59bf28f9a7275d7..24a216cf6d0a4f2f06aada35384b9ca330dc3b9f 100644
(file)
--- a/
src/HYDROCurveCreator/CurveCreator_Curve.hxx
+++ b/
src/HYDROCurveCreator/CurveCreator_Curve.hxx
@@
-28,17
+28,14
@@
#include "CurveCreator_Macro.hxx"
#include "CurveCreator.hxx"
#include "CurveCreator_Diff.hxx"
#include "CurveCreator_Macro.hxx"
#include "CurveCreator.hxx"
#include "CurveCreator_Diff.hxx"
-#include "CurveCreator_AISCurve.hxx"
-
-#include <AIS_Point.hxx>
-#include <AIS_Line.hxx>
-#include <AIS_InteractiveObject.hxx>
#include <list>
#include <map>
struct CurveCreator_Section;
class CurveCreator_Displayer;
#include <list>
#include <map>
struct CurveCreator_Section;
class CurveCreator_Displayer;
+class AIS_Shape;
+class Handle_AIS_InteractiveObject;
/**
* The CurveCreator_Curve object is represented as one or more sets of
/**
* The CurveCreator_Curve object is represented as one or more sets of
@@
-94,8
+91,6
@@
public:
*/
virtual int toICoord(const int theIPnt) const;
*/
virtual int toICoord(const int theIPnt) const;
- ListAISObjects constructSection( int theISection ) const;
-
//! For internal use only! Undo/Redo are not used here.
virtual bool moveSectionInternal(const int theISection,
const int theNewIndex);
//! For internal use only! Undo/Redo are not used here.
virtual bool moveSectionInternal(const int theISection,
const int theNewIndex);
@@
-110,11
+105,9
@@
protected:
*/
virtual bool addEmptyDiff();
*/
virtual bool addEmptyDiff();
- Handle_AIS_Point getAISPoint( int theISection, int theIPoint ) const;
- Handle_AIS_Line getAISLine( int theISection, int theIPoint1, int theIPoint2 ) const;
-public: // temporary
+public: // TODO: remove public
void getCoordinates( int theISection, int theIPoint, double& theX, double& theY, double& theZ ) const;
void getCoordinates( int theISection, int theIPoint, double& theX, double& theY, double& theZ ) const;
-protected: //
temporary
+protected: //
TODO: remove public
void redisplayCurve();
void convert( const SectionToPointList &thePoints,
void redisplayCurve();
void convert( const SectionToPointList &thePoints,
@@
-268,10
+261,15
@@
public:
/***********************************************/
/*** Presentation methods ***/
/***********************************************/
/***********************************************/
/*** Presentation methods ***/
/***********************************************/
- virtual ListAISObjects constructWire() const;
+ /**
+ * Get the curve AIS object
+ */
+ virtual Handle_AIS_InteractiveObject getAISObject( const bool theNeedToBuild = false ) const;
+
+protected:
+ virtual void constructAISObject();
public:
public:
- Handle(CurveCreator_AISCurve) myAISCurve;
bool myIsLocked;
CurveCreator::Sections mySections; //!< curve data
CurveCreator::Dimension myDimension; //!< curve dimension
bool myIsLocked;
CurveCreator::Sections mySections; //!< curve data
CurveCreator::Dimension myDimension; //!< curve dimension
@@
-285,6
+283,7
@@
private:
ListDiff myListDiffs;
int myUndoDepth;
int myOpLevel;
ListDiff myListDiffs;
int myUndoDepth;
int myOpLevel;
+ AIS_Shape* myAISShape; //!< AIS shape
};
#endif
};
#endif