Merge branch 'master' of https://git.salome-platform.org/git/modules/hydro

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

diff --git a/src/HYDROGUI/HYDROGUI_SetColorOp.cxx b/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
index cca862a65321795e3a2e95ffa53e82f40740c2d8..732635279f5e216e9a4f47c4645587ef7622f54b 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
@@ -21,12 +21,12 @@
 #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>
 #include <HYDROData_IPolyline.h>
-#include <HYDROData_LandCover.h>
+#include <HYDROData_LandCoverMap.h>
 
 #include <LightApp_Application.h>
 #include <LightApp_UpdateFlags.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_LandCover) ) ) {
-    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()
@@ -104,13 +100,15 @@ void HYDROGUI_SetColorOp::startOperation()
 
     anIsOneColor = true;
   }
-  else if ( myEditedObject->IsKind( STANDARD_TYPE(HYDROData_LandCover) ) )
+  else if ( myEditedObject->IsKind( STANDARD_TYPE(HYDROData_LandCoverMap) ) )
   {
-    Handle(HYDROData_LandCover) aLandCover =
-      Handle(HYDROData_LandCover)::DownCast( myEditedObject );
+    Handle(HYDROData_LandCoverMap) aLandCoverMap =
+      Handle(HYDROData_LandCoverMap)::DownCast( myEditedObject );
 
-    aFirstColor = aLandCover->GetFillingColor();
-    aSecondColor = aLandCover->GetBorderColor();
+    /* TODO
+    aFirstColor = aLandCoverMap->GetFillingColor();
+    aSecondColor = aLandCoverMap->GetBorderColor();
+    */
   }
 
   // Create color dialog
@@ -163,13 +161,15 @@ bool HYDROGUI_SetColorOp::processApply( int& theUpdateFlags,
 
     aPolyObject->SetWireColor( aFirstColor );
   }
-  else if ( myEditedObject->IsKind( STANDARD_TYPE(HYDROData_LandCover) ) )
+  else if ( myEditedObject->IsKind( STANDARD_TYPE(HYDROData_LandCoverMap) ) )
   {
-    Handle(HYDROData_LandCover) aLandCover =
-      Handle(HYDROData_LandCover)::DownCast( myEditedObject );
+    Handle(HYDROData_LandCoverMap) aLandCoverMap =
+      Handle(HYDROData_LandCoverMap)::DownCast( myEditedObject );
 
-    aLandCover->SetFillingColor( aFirstColor );
-    aLandCover->SetBorderColor( aSecondColor );
+    /* TODO
+    aLandCoverMap->SetFillingColor( aFirstColor );
+    aLandCoverMap->SetBorderColor( aSecondColor );
+    */
   }
 
   module()->setIsToUpdate( myEditedObject );