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
Fix JoinAll operation
[modules/hydro.git]
/
src
/
HYDROCurveCreator
/
CurveCreator_Widget.h
diff --git
a/src/HYDROCurveCreator/CurveCreator_Widget.h
b/src/HYDROCurveCreator/CurveCreator_Widget.h
index 2ca9f1d6190832091d02603068ad1821a67ac67a..225e864d49a06aac4b0ff31b7f95b1492c5eb3f7 100644
(file)
--- a/
src/HYDROCurveCreator/CurveCreator_Widget.h
+++ b/
src/HYDROCurveCreator/CurveCreator_Widget.h
@@
-65,6
+65,9
@@
public:
QList<int> getSelectedSections();
QList< QPair< int, int > > getSelectedPoints();
QList<int> getSelectedSections();
QList< QPair< int, int > > getSelectedPoints();
+ void removeSelected();
+ bool removeEnabled();
+
signals:
void selectionChanged();
void subOperationStarted( QWidget* );
signals:
void selectionChanged();
void subOperationStarted( QWidget* );
@@
-130,8
+133,8
@@
protected:
DetectionMode
};
DetectionMode
};
- typedef
QP
air< int, int > SectionToPoint;
- typedef
QList
< SectionToPoint > SectionToPointList;
+ typedef
std::p
air< int, int > SectionToPoint;
+ typedef
std::deque
< SectionToPoint > SectionToPointList;
private:
QAction* createAction( ActionId theId, const QString& theName, const QPixmap& theImage,
private:
QAction* createAction( ActionId theId, const QString& theName, const QPixmap& theImage,
@@
-157,7
+160,7
@@
private:
void startCurveModification( SectionToPointList& thePoints,
const bool theFillPoints = true );
void startCurveModification( SectionToPointList& thePoints,
const bool theFillPoints = true );
- void finishCurveModification( const SectionToPointList& thePoints );
+ void finishCurveModification( const SectionToPointList& thePoints
= SectionToPointList()
);
// curve algorithm
int findLocalPointIndex( int theSectionId, float theX, float theY );
// curve algorithm
int findLocalPointIndex( int theSectionId, float theX, float theY );
@@
-178,6
+181,8
@@
private:
int getSectionId( const int theRowId ) const;
int getPointId( const int theRowId ) const;
int getSectionId( const int theRowId ) const;
int getPointId( const int theRowId ) const;
+ bool contains( const SectionToPointList& theList, const SectionToPoint& theValue ) const;
+
private:
QMap<ActionId, QAction*> myActionMap;
CurveCreator_ICurve* myCurve;
private:
QMap<ActionId, QAction*> myActionMap;
CurveCreator_ICurve* myCurve;