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 3658ae5b6f4afcad42de39a8d3dda973bcf743d2..909256474537af6d9825243262e5f4621c0921dc 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/
src/HYDROGUI/HYDROGUI_CalculationOp.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
@@
-85,20
+81,20
@@
protected slots:
void onRemoveGroups();
/**
void onRemoveGroups();
/**
- * 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& the
Bathymetry
Name );
+ void onSetMergeType( int theMergeType, QString& the
MergeObject
Name );
/**
* 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);
/**
* 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 );
/**
- * 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* );
@@
-107,23
+103,39
@@
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
*/
void onObjectsSelected();
/**
* Geometry object is selected in the list on the first wizard page
*/
void onObjectsSelected();
+ /**
+ * Land cover map is selected in the list on the third wizard page
+ */
+ 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
*/
- void onBoundarySelected ( const QString & theObjName );
+ void onBoundarySelected( const QString & theObjName );
+ /**
+ * Strickler table name is selected in the list on the third wizard page
+ */
+ void onStricklerTableSelected( const QString & theObjName );
+
+ void onOrderChanged( bool& isConfirmed );
+
+ void onRuleChanged( bool& isConfirmed );
+
+ void onRegenerateColors();
private:
private:
- void createPreview();
- void closePreview();
+ void createPreview(
const bool theLandCoverMap
);
+ void closePreview(
bool theRemoveViewManager = true
);
void setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
void setZonesVisible( bool theIsVisible );
void setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
void setZonesVisible( bool theIsVisible );
+ void setGeomObjectsVisible( bool theIsVisible );
+ void setLandCoverMapVisible( bool theIsVisible );
void getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq,
QStringList& theNames, QStringList& theEntries ) const;
void getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq,
QStringList& theNames, QStringList& theEntries ) const;
@@
-147,28
+159,23
@@
private:
float theSaturation = 0.5,
float theValue = 0.95 ) const;
float theSaturation = 0.5,
float theValue = 0.95 ) const;
- /**
- * Ask user to confirm splitting zones recalculation after regions list modification.
- * \return true if confirmed
- */
- bool confirmRegionsChange() const;
+ void setRules( HYDROData_CalculationCase::DataTag theDataTag );
- /**
- * Ask user to confirm splitting zones recalculation after mode change.
- * \return true if confirmed
- */
- bool confirmModeChange() const;
+ bool createRegion( const QList<SUIT_DataObject*>& theZonesList );
- /**
- * Ask user to confirm the operation continuation with warning.
- * @param theWarning the warning
- * \return true if confirmed
- */
- bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
+ void AddInterPolylinesToList(QStringList& theList, QStringList& theEntryList);
+
+ bool confirmRegionsChange() const;
+ bool confirmModeChange() const;
+ bool confirmOrderChange() const;
+ bool confirmRuleChange() const;
+ bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
private:
bool myIsEdit;
bool myShowZones;
private:
bool myIsEdit;
bool myShowZones;
+ bool myShowGeomObjects;
+ bool myShowLandCoverMap;
Handle(HYDROData_CalculationCase) myEditedObject;
SUIT_ViewManager* myActiveViewManager;
Handle(HYDROData_CalculationCase) myEditedObject;
SUIT_ViewManager* myActiveViewManager;