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 45b88dee547714b95df652013d88289608f6d0db..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>
@@ -44,14 +44,17 @@ 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) ) ||
-         theObject->IsKind( STANDARD_TYPE(HYDROData_IPolyline) ) ||
-         theObject->IsKind( STANDARD_TYPE(HYDROData_LandCover) );
+  bool isCanBeColored = 
+    theObject->IsKind( STANDARD_TYPE(HYDROData_Object) ) ||
+    theObject->IsKind( STANDARD_TYPE(HYDROData_IPolyline) );
+
+  return isCanBeColored;
 }
 
 void HYDROGUI_SetColorOp::startOperation()
@@ -61,7 +64,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;
@@ -97,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
@@ -156,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 );