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.
browser(0),
myFirstActivation(true),
myAllGraphsClosed(false),
- myInitialViewFrame(0)
+ myInitialViewFrame(0),
+ myIVFBackgroundColor(QColor())
//info(0)
{
Trace("SUPERVGUI::SUPERVGUI")
(( SalomeApp_Application* )application())->addViewManager( aVM );
SUPERVGraph_ViewFrame* aVW = dynamic_cast<SUPERVGraph_ViewFrame*>( 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,
myAllGraphsClosed = true;
myFirstActivation = true;
myInitialViewFrame = 0;
+ myIVFBackgroundColor = QColor();
main = 0;
}
}
else {
// second case : get empty initial view frame as new ViewFrame object
aViewFrame = myInitialViewFrame;
- myInitialViewFrame = 0;
}
if( aViewFrame ) {
registerGraph( aIORName, main );
aViewFrame->show();
}
+
+ if ( myInitialViewFrame ) {
+ myInitialViewFrame = 0;
+ myIVFBackgroundColor = QColor();
+ }
}
else {
// 2. get empty initial view frame as new ViewFrame object
aViewFrame = myInitialViewFrame;
- myInitialViewFrame = 0;
}
if ( aViewFrame ) {
// 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;
aViewFrame->show();
}
+ if ( !theInitialDF ) {
+ myInitialViewFrame = 0;
+ myIVFBackgroundColor = QColor();
+ }
+
return true;
}
*/
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);
bool myFirstActivation;
bool myAllGraphsClosed;
SUPERVGraph_ViewFrame* myInitialViewFrame;
+ QColor myIVFBackgroundColor; // mkr : IPAL10825
};
#endif
using namespace std;
+#include "SUPERVGUI.h"
#include "SUPERVGUI_ArrayView.h"
#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_CanvasCellNodePrs.h"
// 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);
+ // <--
}
}
// Module : SUPERV
using namespace std;
+#include "SUPERVGUI.h"
#include "SUPERVGUI_Def.h"
#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_CanvasNode.h"
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" ) );
// Module : SUPERV
using namespace std;
+#include "SUPERVGUI.h"
#include "SUPERVGUI_CanvasArray.h"
#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_BrowseNodeDlg.h"
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" ) );
default:
setStatus("No Status");
- setStatusColor( resMgr()->colorValue( "SUPERVGraph", "Background", DEF_MAIN_BACK ) );
+ setStatusColor( resMgr()->colorValue( "SUPERVGraph", "NodeBody", DEF_MAIN_BACK ) ); // mkr : IPAL10829
break;
}
using namespace std;
+#include "SUPERVGUI.h"
#include "SUPERVGUI_CanvasView.h"
#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_CanvasNode.h"
// 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);
+ // <--
}
}