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 remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_LandCoverOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
b/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
index 9cf2567e4ea5aa58380c420f8a81de0adfd1106b..17ac4487b9240f3af18e973d34092387fc4a8712 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
@@
-20,6
+20,7
@@
#include "HYDROGUI_LandCoverDlg.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_LandCoverDlg.h"
#include "HYDROGUI_Module.h"
+#include "HYDROGUI_OCCDisplayer.h"
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_UpdateFlags.h"
@@
-106,15
+107,16
@@
void HYDROGUI_LandCoverOp::startOperation()
if ( !aStricklerTableObj.IsNull() )
{
// Get Strickler table data from the data model
if ( !aStricklerTableObj.IsNull() )
{
// Get Strickler table data from the data model
-
TColStd_SequenceOfExtendedString
aTypes = aStricklerTableObj->GetTypes();
- for (
int i = 1; i <= aTypes.Length(); i++
)
+
QStringList
aTypes = aStricklerTableObj->GetTypes();
+ for (
QStringList::iterator it = aTypes.begin(); it != aTypes.end(); ++it
)
{
{
- QString aType =
HYDROGUI_Tool::ToQString( aTypes.Value( i ) )
;
- if ( !aType.isEmpty() && !aStricklerTypes.contains( aType ))
+ QString aType =
*it
;
+ if ( !aType.isEmpty() && !aStricklerTypes.contains( aType )
)
aStricklerTypes.append( aType );
}
}
}
aStricklerTypes.append( aType );
}
}
}
+
aStricklerTypes.sort();
aPanel->setAdditionalParams( aStricklerTypes );
aStricklerTypes.sort();
aPanel->setAdditionalParams( aStricklerTypes );
@@
-233,6
+235,7
@@
bool HYDROGUI_LandCoverOp::processApply( int& theUpdateFlags,
}
module()->setIsToUpdate( aZoneObj );
}
module()->setIsToUpdate( aZoneObj );
+ module()->getOCCDisplayer()->SetToUpdateColorScale();
theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;