Merge branch 'BR_H2018_2' of https://codev-tuleap.cea.fr/plugins/git/salome/hydro...

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_SetColorOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_SetColorOp.cxx b/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
index ca2928462591ac956741a17b99122ad092555c8e..732635279f5e216e9a4f47c4645587ef7622f54b 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
@@ -21,7 +21,7 @@
 #include "HYDROGUI_ColorDlg.h"
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Object.h>
@@ -50,15 +50,11 @@ bool HYDROGUI_SetColorOp::CanObjectBeColored( const Handle(HYDROData_Entity)& th
   if ( theObject.IsNull() )
     return false;
 
-  bool isCanBeColored = false;
-  if ( theObject->IsKind( STANDARD_TYPE(HYDROData_LandCoverMap) ) ) {
-    size_t anActiveViewId = HYDROGUI_Tool::GetActiveOCCViewId( theModule );
-    isCanBeColored = !theModule->isLandCoversScalarMapModeOn( anActiveViewId );
-  }
+  bool isCanBeColored = 
+    theObject->IsKind( STANDARD_TYPE(HYDROData_Object) ) ||
+    theObject->IsKind( STANDARD_TYPE(HYDROData_IPolyline) );
 
-  return isCanBeColored ||
-         theObject->IsKind( STANDARD_TYPE(HYDROData_Object) ) ||
-         theObject->IsKind( STANDARD_TYPE(HYDROData_IPolyline) );
+  return isCanBeColored;
 }
 
 void HYDROGUI_SetColorOp::startOperation()