From 0e90ce91368409f82c03deeab7107ef2a5520775 Mon Sep 17 00:00:00 2001 From: mkr Date: Thu, 8 Dec 2005 14:23:28 +0000 Subject: [PATCH] Modifications for fixing bugs: 1) IPAL10825 : Background color is changed after dataflow import. 2) IPAL10829 : Default background color is set as color for the "Status" area in table view. --- src/SUPERVGUI/SUPERVGUI.cxx | 20 ++++++++++++++----- src/SUPERVGUI/SUPERVGUI.h | 5 +++++ src/SUPERVGUI/SUPERVGUI_ArrayView.cxx | 10 ++++++++++ src/SUPERVGUI/SUPERVGUI_Canvas.cxx | 13 +++++++++++- src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx | 13 +++++++++++- src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx | 2 +- src/SUPERVGUI/SUPERVGUI_CanvasView.cxx | 10 ++++++++++ 7 files changed, 65 insertions(+), 8 deletions(-) diff --git a/src/SUPERVGUI/SUPERVGUI.cxx b/src/SUPERVGUI/SUPERVGUI.cxx index cd78482..9da02d6 100644 --- a/src/SUPERVGUI/SUPERVGUI.cxx +++ b/src/SUPERVGUI/SUPERVGUI.cxx @@ -78,7 +78,8 @@ SUPERVGUI::SUPERVGUI() browser(0), myFirstActivation(true), myAllGraphsClosed(false), - myInitialViewFrame(0) + myInitialViewFrame(0), + myIVFBackgroundColor(QColor()) //info(0) { Trace("SUPERVGUI::SUPERVGUI") @@ -280,7 +281,7 @@ SUIT_ViewWindow* SUPERVGUI::createGraph() { (( SalomeApp_Application* )application())->addViewManager( aVM ); SUPERVGraph_ViewFrame* aVW = dynamic_cast( aVM->createViewWindow() ); if ( aVW ) { - QColor back = getApp()->resourceMgr()->colorValue( "SUPERVGraph", "Background", aVW->backgroundColor() ); + QColor back = getApp()->resourceMgr()->colorValue( "SUPERVGraph", "Background", DEF_MAIN_COLOR ); qDebug( QString( "background: %1 %2 %3" ).arg( back.red() ).arg( back.green() ).arg( back.blue() ) ); aVW->setBackgroundColor( back ); connect( aVM, @@ -420,6 +421,7 @@ void SUPERVGUI::onGraphClosed(SUIT_ViewWindow* theViewWindow) { myAllGraphsClosed = true; myFirstActivation = true; myInitialViewFrame = 0; + myIVFBackgroundColor = QColor(); main = 0; } } @@ -487,7 +489,6 @@ void SUPERVGUI::displayDataflow() { else { // second case : get empty initial view frame as new ViewFrame object aViewFrame = myInitialViewFrame; - myInitialViewFrame = 0; } if( aViewFrame ) { @@ -495,6 +496,11 @@ void SUPERVGUI::displayDataflow() { registerGraph( aIORName, main ); aViewFrame->show(); } + + if ( myInitialViewFrame ) { + myInitialViewFrame = 0; + myIVFBackgroundColor = QColor(); + } } @@ -672,7 +678,6 @@ bool SUPERVGUI::createDataflow( const NEW_DF_MODE mode, bool theInitialDF ) { else { // 2. get empty initial view frame as new ViewFrame object aViewFrame = myInitialViewFrame; - myInitialViewFrame = 0; } if ( aViewFrame ) { @@ -680,7 +685,7 @@ bool SUPERVGUI::createDataflow( const NEW_DF_MODE mode, bool theInitialDF ) { // 3. bind Graph and ViewFrame == create SUPERVGUI_Main object main = new SUPERVGUI_Main( aViewFrame, application()->desktop(), aGraph ); if ( mode == New ) { - if ( !theInitialDF ) + if ( !theInitialDF ) main->addNode(); else myInitialViewFrame = aViewFrame; @@ -691,6 +696,11 @@ bool SUPERVGUI::createDataflow( const NEW_DF_MODE mode, bool theInitialDF ) { aViewFrame->show(); } + if ( !theInitialDF ) { + myInitialViewFrame = 0; + myIVFBackgroundColor = QColor(); + } + return true; } diff --git a/src/SUPERVGUI/SUPERVGUI.h b/src/SUPERVGUI/SUPERVGUI.h index 84e7bbc..2092a9f 100644 --- a/src/SUPERVGUI/SUPERVGUI.h +++ b/src/SUPERVGUI/SUPERVGUI.h @@ -118,6 +118,10 @@ class SUPERVGUI: public SalomeApp_Module { */ void nullifyInitialVF() { if ( myInitialViewFrame ) myInitialViewFrame = 0; } + // mkr : IPAL10825 + QColor getIVFBackgroundColor() { return myIVFBackgroundColor; } + void setIVFBackgroundColor( QColor theColor ) { if ( myInitialViewFrame ) myIVFBackgroundColor = theColor; } + signals: void KillMainThread(bool theValue); @@ -166,6 +170,7 @@ class SUPERVGUI: public SalomeApp_Module { bool myFirstActivation; bool myAllGraphsClosed; SUPERVGraph_ViewFrame* myInitialViewFrame; + QColor myIVFBackgroundColor; // mkr : IPAL10825 }; #endif diff --git a/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx b/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx index b8c2be4..08477e5 100644 --- a/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx +++ b/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx @@ -8,6 +8,7 @@ using namespace std; +#include "SUPERVGUI.h" #include "SUPERVGUI_ArrayView.h" #include "SUPERVGUI_Main.h" #include "SUPERVGUI_CanvasCellNodePrs.h" @@ -107,6 +108,15 @@ void SUPERVGUI_ArrayView::changeBackground() // change background color for canvas view getMain()->getCanvasView()->canvas()->setBackgroundColor(aColor); getMain()->getCanvasView()->setPaletteBackgroundColor(aColor.light(120)); + + // mkr : IPAL10825 --> + SUPERVGUI* aSupMod = SUPERVGUI::Supervision(); + if ( !aSupMod ) { + MESSAGE("NULL Supervision module!"); + return; + } + aSupMod->setIVFBackgroundColor(aColor); + // <-- } } diff --git a/src/SUPERVGUI/SUPERVGUI_Canvas.cxx b/src/SUPERVGUI/SUPERVGUI_Canvas.cxx index a299cdd..776849d 100644 --- a/src/SUPERVGUI/SUPERVGUI_Canvas.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Canvas.cxx @@ -7,6 +7,7 @@ // Module : SUPERV using namespace std; +#include "SUPERVGUI.h" #include "SUPERVGUI_Def.h" #include "SUPERVGUI_Main.h" #include "SUPERVGUI_CanvasNode.h" @@ -89,7 +90,17 @@ SUPERVGUI_Canvas::SUPERVGUI_Canvas( SUPERVGUI_Main* m, SUIT_ResourceMgr* mgr ): resize(1050, 750); 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" ) ); diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx index bd3d121..19d07d2 100644 --- 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" ) ); diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx index b9eeaff..ccf9f06 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx @@ -204,7 +204,7 @@ void SUPERVGUI_CanvasCellNodePrs::setState(SUPERV::GraphState theState) default: setStatus("No Status"); - setStatusColor( resMgr()->colorValue( "SUPERVGraph", "Background", DEF_MAIN_BACK ) ); + setStatusColor( resMgr()->colorValue( "SUPERVGraph", "NodeBody", DEF_MAIN_BACK ) ); // mkr : IPAL10829 break; } diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx index 3e52a41..c336716 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx @@ -10,6 +10,7 @@ using namespace std; +#include "SUPERVGUI.h" #include "SUPERVGUI_CanvasView.h" #include "SUPERVGUI_Main.h" #include "SUPERVGUI_CanvasNode.h" @@ -571,6 +572,15 @@ void SUPERVGUI_CanvasView::changeBackground() // change background color for array view getMain()->getArrayView()->canvas()->setBackgroundColor(aColor); getMain()->getArrayView()->setPaletteBackgroundColor(aColor.light(120)); + + // mkr : IPAL10825 --> + SUPERVGUI* aSupMod = SUPERVGUI::Supervision(); + if ( !aSupMod ) { + MESSAGE("NULL Supervision module!"); + return; + } + aSupMod->setIVFBackgroundColor(aColor); + // <-- } } -- 2.39.2