From 7e7704aa999c7694c7186b295f45714872cc0429 Mon Sep 17 00:00:00 2001 From: asv Date: Tue, 10 Jan 2006 12:54:19 +0000 Subject: [PATCH] reversed to previous revision, some bug fixes by MKR were left there, so this revision brings them back. --- 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_CanvasNodePrs.cxx | 8 ++++---- src/SUPERVGUI/SUPERVGUI_CanvasView.cxx | 10 ++++++++++ 6 files changed, 49 insertions(+), 7 deletions(-) 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_CanvasNodePrs.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasNodePrs.cxx index 7eb774c..75bd1b8 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasNodePrs.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasNodePrs.cxx @@ -673,10 +673,10 @@ void SUPERVGUI_CanvasNodePrs::drawPort(QPainter& thePainter) aPort = (SUPERVGUI_CanvasPort*) obj; SUPERV_Port aPortEng = aPort->getEngine(); - if ( CORBA::is_nil( aPortEng ) ) - printf ( "---\n port engine IS NIL ---\n\n" ); + // if ( CORBA::is_nil( aPortEng ) ) + // printf ( "---\n port engine IS NIL ---\n\n" ); - if (!aPort->getEngine()->IsGate()) { + if ( !CORBA::is_nil( aPortEng ) && !aPortEng->IsGate() ) { aPort->getPrs()->draw(thePainter); } } @@ -889,7 +889,7 @@ QString SUPERVGUI_CanvasPortPrs::getText() const if (aPort->IsParam() || aPort->IsInLine() || myPort->isStream()) aText = aText + "=" + aPort->ToString(); } - printf( "--- return text of port : %s ---\n", aText.latin1() ); + // printf( "--- return text of port : %s ---\n", aText.latin1() ); return aText; } 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