Join modifications from branch BR_3_1_0deb

[modules/superv.git] / src / SUPERVGUI / SUPERVGUI_CanvasArray.cxx

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
index bd3d1219f669464415f3b260989c0534b9c9c6d0..19d07d227521aa716a8a2df355a4b9ed07116bfe 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
@@ -7,6 +7,7 @@
 //  Module : SUPERV
 
 using namespace std;
+#include "SUPERVGUI.h"
 #include "SUPERVGUI_CanvasArray.h"
 #include "SUPERVGUI_Main.h"
 #include "SUPERVGUI_BrowseNodeDlg.h"
@@ -86,7 +87,17 @@ SUPERVGUI_CanvasArray::SUPERVGUI_CanvasArray(SUPERVGUI_Main* m, SUIT_ResourceMgr
   resize(1000, 725);
   setDoubleBuffering(true);
 
-  QColor aColor = mgr->colorValue( "SUPERVGraph", "Background", DEF_MAIN_COLOR );
+  // mkr : IPAL10825 -->
+  SUPERVGUI* aSupMod = SUPERVGUI::Supervision();
+  if ( !aSupMod ) {
+    MESSAGE("NULL Supervision module!");
+    return;
+  }
+  QColor aColor =  aSupMod->getIVFBackgroundColor();
+  if ( !aColor.isValid() )
+    aColor = mgr->colorValue( "SUPERVGraph", "Background", DEF_MAIN_COLOR );
+  // <--
+  
   //aColor = QColor(SUIT_Session::session()->resourceMgr()->integerValue( "SUPERVGraph", "BackgroundColorRed" ), 
   //             SUIT_Session::session()->resourceMgr()->integerValue( "SUPERVGraph", "BackgroundColorGreen" ), 
   //             SUIT_Session::session()->resourceMgr()->integerValue( "SUPERVGraph", "BackgroundColorBlue" ) );