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
Merge branch 'BR_MULTI_BATHS' into HEAD
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_CalculationOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_CalculationOp.h
b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index b6791f0d4106ffc6c2ced16dd5071e585b55d72e..909256474537af6d9825243262e5f4621c0921dc 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/
src/HYDROGUI/HYDROGUI_CalculationOp.h
@@
-94,7
+94,7
@@
protected slots:
*/
void onCreateRegion( const QList<SUIT_DataObject*>& theZonesList );
/**
*/
void onCreateRegion( const QList<SUIT_DataObject*>& theZonesList );
/**
- * Case objects must be split
ted
to zones if the case has been modified or new.
+ * Case objects must be split to zones if the case has been modified or new.
*/
void onNext( const int );
void onLastViewClosed( SUIT_ViewManager* );
*/
void onNext( const int );
void onLastViewClosed( SUIT_ViewManager* );
@@
-113,7
+113,7
@@
protected slots:
/**
* Land cover map is selected in the list on the third wizard page
*/
/**
* Land cover map is selected in the list on the third wizard page
*/
- void onLandCoverMapSelected();
+ void onLandCoverMapSelected(
const QString & theObjName
);
/**
* Boundary polyline is selected in the list on the first wizard page
*/
/**
* Boundary polyline is selected in the list on the first wizard page
*/
@@
-163,6
+163,8
@@
private:
bool createRegion( const QList<SUIT_DataObject*>& theZonesList );
bool createRegion( const QList<SUIT_DataObject*>& theZonesList );
+ void AddInterPolylinesToList(QStringList& theList, QStringList& theEntryList);
+
bool confirmRegionsChange() const;
bool confirmModeChange() const;
bool confirmOrderChange() const;
bool confirmRegionsChange() const;
bool confirmModeChange() const;
bool confirmOrderChange() const;