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_v14_rc' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_CalculationOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_CalculationOp.h
b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 4966ee3cde0e3152a198dea7285e69dc59a822e4..9d2dc0d1b5a91326b7b6d844b5a188750f30d134 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/
src/HYDROGUI/HYDROGUI_CalculationOp.h
@@
-96,18
+96,27
@@
protected slots:
void onRemoveLandCovers();
/**
void onRemoveLandCovers();
/**
- * Set the given bathymetry merge type to the current zone.
+ * Set the given bathymetry
/type
merge type to the current zone.
*/
*/
- void onSetMergeType( int theMergeType, QString& theBathymetryName );
+ void onSetMergeType( int theMergeType, QString& theMergeObjectName );
+ /**
+ * Set the given Strickler merge type to the current zone.
+ */
+ void onSetMergeStricklerType( int theMergeType, QString& theStricklerTypeName );
/**
* Selected zones are moved to the existing region.
*/
void onMoveZones( SUIT_DataObject* theRegionItem,
/**
* Selected zones are moved to the existing region.
*/
void onMoveZones( SUIT_DataObject* theRegionItem,
- const QList<SUIT_DataObject*>& theZonesList );
+ const QList<SUIT_DataObject*>& theZonesList,
+ bool theLandCover );
/**
* Selected zones are moved to the new region to be created.
*/
void onCreateRegion( const QList<SUIT_DataObject*>& theZonesList );
/**
* Selected zones are moved to the new region to be created.
*/
void onCreateRegion( const QList<SUIT_DataObject*>& theZonesList );
+ /**
+ * Selected land cover zones are moved to the new region to be created.
+ */
+ void onCreateLandCoverRegion( const QList<SUIT_DataObject*>& theZonesList );
/**
* Case objects must be splitted to zones if the case has been modified or new.
*/
/**
* Case objects must be splitted to zones if the case has been modified or new.
*/
@@
-118,9
+127,9
@@
protected slots:
*/
void onClickedInZonesBrowser( SUIT_DataObject* theItem );
/**
*/
void onClickedInZonesBrowser( SUIT_DataObject* theItem );
/**
- *
Hide zones in the viewer
.
+ *
Slot called on back button click
.
*/
*/
- void onHideZones();
+ void onHideZones(
const int
);
/**
* Geometry object is selected in the list on the first wizard page
*/
/**
* Geometry object is selected in the list on the first wizard page
*/
@@
-142,17
+151,19
@@
protected slots:
void onOrderLandCoverChanged( bool& isConfirmed );
private:
void onOrderLandCoverChanged( bool& isConfirmed );
private:
- void createPreview();
- void closePreview();
+ void createPreview(
const bool theLandCover
);
+ void closePreview(
bool theRemoveViewManager = true
);
void setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
void setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
- void setZonesVisible( bool theIsVisible );
+ void setZonesVisible( bool theIsVisible, const bool theLandCover );
+ void setGeomObjectsVisible( bool theIsVisible );
+ void setLandCoversVisible( bool theIsVisible );
void getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq,
QStringList& theNames, QStringList& theEntries ) const;
/**
* Internal method that used to assign unique default colors for zones
*/
void getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq,
QStringList& theNames, QStringList& theEntries ) const;
/**
* Internal method that used to assign unique default colors for zones
*/
- void AssignDefaultZonesColors();
+ void AssignDefaultZonesColors(
const bool theLandCover
);
/**
* Internal method that used to generate default color for zone
* @param theIndex the index of color to be generated
/**
* Internal method that used to generate default color for zone
* @param theIndex the index of color to be generated
@@
-171,17
+182,23
@@
private:
void setRules( HYDROData_CalculationCase::DataTag theDataTag );
void setRules( HYDROData_CalculationCase::DataTag theDataTag );
+ bool createRegion( const QList<SUIT_DataObject*>& theZonesList,
+ const bool theLandCover );
+
bool confirmRegionsChange() const;
bool confirmModeChange() const;
bool confirmOrderChange() const;
bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
bool confirmRegionsChange() const;
bool confirmModeChange() const;
bool confirmOrderChange() const;
bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
+ bool confirmLandCoverRegionsChange() const;
bool confirmLandCoverModeChange() const;
bool confirmLandCoverOrderChange() const;
private:
bool myIsEdit;
bool myShowZones;
bool confirmLandCoverModeChange() const;
bool confirmLandCoverOrderChange() const;
private:
bool myIsEdit;
bool myShowZones;
+ bool myShowGeomObjects;
+ bool myShowLandCovers;
Handle(HYDROData_CalculationCase) myEditedObject;
SUIT_ViewManager* myActiveViewManager;
Handle(HYDROData_CalculationCase) myEditedObject;
SUIT_ViewManager* myActiveViewManager;