Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...

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

diff --git a/src/HYDROGUI/HYDROGUI_SetColorOp.cxx b/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
index f09f4d2add71ff666914ee12a5e3ada00e21c25b..cca862a65321795e3a2e95ffa53e82f40740c2d8 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
@@ -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
@@ -30,6 +26,7 @@
 
 #include <HYDROData_Object.h>
 #include <HYDROData_IPolyline.h>
+#include <HYDROData_LandCover.h>
 
 #include <LightApp_Application.h>
 #include <LightApp_UpdateFlags.h>
@@ -47,12 +44,20 @@ HYDROGUI_SetColorOp::~HYDROGUI_SetColorOp()
 {
 }
 
-bool HYDROGUI_SetColorOp::CanObjectBeColored( const Handle(HYDROData_Entity)& theObject )
+bool HYDROGUI_SetColorOp::CanObjectBeColored( const Handle(HYDROData_Entity)& theObject,
+                                              HYDROGUI_Module* theModule )
 {
   if ( theObject.IsNull() )
     return false;
 
-  return theObject->IsKind( STANDARD_TYPE(HYDROData_Object) ) ||
+  bool isCanBeColored = false;
+  if ( theObject->IsKind( STANDARD_TYPE(HYDROData_LandCover) ) ) {
+    size_t anActiveViewId = HYDROGUI_Tool::GetActiveOCCViewId( theModule );
+    isCanBeColored = !theModule->isLandCoversScalarMapModeOn( anActiveViewId );
+  }
+
+  return isCanBeColored ||
+         theObject->IsKind( STANDARD_TYPE(HYDROData_Object) ) ||
          theObject->IsKind( STANDARD_TYPE(HYDROData_IPolyline) );
 }
 
@@ -63,7 +68,7 @@ void HYDROGUI_SetColorOp::startOperation()
   // Get the selected object
   //myEditedObject = Handle(HYDROData_Object)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
   myEditedObject = HYDROGUI_Tool::GetSelectedObject( module() );
-  if ( !CanObjectBeColored( myEditedObject ) )
+  if ( !CanObjectBeColored( myEditedObject, module() ) )
   {
     abort();
     return;
@@ -99,6 +104,14 @@ void HYDROGUI_SetColorOp::startOperation()
 
     anIsOneColor = true;
   }
+  else if ( myEditedObject->IsKind( STANDARD_TYPE(HYDROData_LandCover) ) )
+  {
+    Handle(HYDROData_LandCover) aLandCover =
+      Handle(HYDROData_LandCover)::DownCast( myEditedObject );
+
+    aFirstColor = aLandCover->GetFillingColor();
+    aSecondColor = aLandCover->GetBorderColor();
+  }
 
   // Create color dialog
   myColorDlg = new HYDROGUI_ColorDlg( module()->getApp()->desktop(), anIsOneColor );
@@ -150,6 +163,14 @@ bool HYDROGUI_SetColorOp::processApply( int& theUpdateFlags,
 
     aPolyObject->SetWireColor( aFirstColor );
   }
+  else if ( myEditedObject->IsKind( STANDARD_TYPE(HYDROData_LandCover) ) )
+  {
+    Handle(HYDROData_LandCover) aLandCover =
+      Handle(HYDROData_LandCover)::DownCast( myEditedObject );
+
+    aLandCover->SetFillingColor( aFirstColor );
+    aLandCover->SetBorderColor( aSecondColor );
+  }
 
   module()->setIsToUpdate( myEditedObject );