Salome HOME
projects
/
modules
/
superv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0637da
)
Join modifications from branch BR_3_1_0deb
T_OCC_development_generic_2006_start
author
jfa
<jfa@opencascade.com>
Wed, 28 Dec 2005 09:25:57 +0000
(09:25 +0000)
committer
jfa
<jfa@opencascade.com>
Wed, 28 Dec 2005 09:25:57 +0000
(09:25 +0000)
14 files changed:
INSTALL
patch
|
blob
|
history
bin/VERSION
patch
|
blob
|
history
build_configure
patch
|
blob
|
history
doc/salome/tui/SUPERV/doxyfile
patch
|
blob
|
history
doc/salome/tui/SUPERV/sources/static/tree.js
patch
|
blob
|
history
resources/SUPERVCatalog.xml
patch
|
blob
|
history
src/GraphExecutor/DataFlowExecutor_OutNode.cxx
patch
|
blob
|
history
src/SUPERVGUI/SUPERVGUI.cxx
patch
|
blob
|
history
src/SUPERVGUI/SUPERVGUI.h
patch
|
blob
|
history
src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
patch
|
blob
|
history
src/SUPERVGUI/SUPERVGUI_Canvas.cxx
patch
|
blob
|
history
src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
patch
|
blob
|
history
src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx
patch
|
blob
|
history
src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
patch
|
blob
|
history
diff --git
a/INSTALL
b/INSTALL
index 8c8daf27d1d8e1796d21fde275ff0df6ca613917..d22abf9f37700ba49a555d0cb0b28ba2c3032d4d 100644
(file)
--- a/
INSTALL
+++ b/
INSTALL
@@
-1,4
+1,4
@@
-This is the version 3.1.0
b1
of SUPERV
+This is the version 3.1.0 of SUPERV
Compatible with :
Compatible with :
- - KERNEL 3.1.0
b1
- - SALOMEGUI 3.1.0
b1
+ - KERNEL 3.1.0
+ - SALOMEGUI 3.1.0
diff --git
a/bin/VERSION
b/bin/VERSION
index 21949768efa803fccb30e918602658fd1068992e..eb8851781586be48e1aa22abf1d02da288ab9474 100755
(executable)
--- a/
bin/VERSION
+++ b/
bin/VERSION
@@
-1
+1
@@
-THIS IS SALOME - SUPERV VERSION: 3.1.0
b1
+THIS IS SALOME - SUPERV VERSION: 3.1.0
diff --git
a/build_configure
b/build_configure
index 1c3f5f806dade7d30dad9b431274449060dc5add..734930e9e643872b3a2dcd6e2994dfbab4c60fac 100755
(executable)
--- a/
build_configure
+++ b/
build_configure
@@
-110,7
+110,7
@@
fi
# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
echo "" >> configure.in_tmp1
# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
echo "" >> configure.in_tmp1
-echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/
salome_adm
' >> configure.in_tmp1
+echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/
.
' >> configure.in_tmp1
echo "" >> configure.in_tmp1
echo "AC_OUTPUT([ \\" >> configure.in_tmp1
echo "" >> configure.in_tmp1
echo "AC_OUTPUT([ \\" >> configure.in_tmp1
diff --git
a/doc/salome/tui/SUPERV/doxyfile
b/doc/salome/tui/SUPERV/doxyfile
index 1f8b6343159ce7e1ff29f248757ed2d615494806..b432856d9552953fe80f6298cb4e44a8102740d3 100755
(executable)
--- a/
doc/salome/tui/SUPERV/doxyfile
+++ b/
doc/salome/tui/SUPERV/doxyfile
@@
-3,7
+3,7
@@
#---------------------------------------------------------------------------
# General configuration options
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
# General configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = "SALOME - SUPERV - v.
2
.1.0"
+PROJECT_NAME = "SALOME - SUPERV - v.
3
.1.0"
PROJECT_NUMBER = id#1.0
OUTPUT_DIRECTORY = ../
OUTPUT_LANGUAGE = English
PROJECT_NUMBER = id#1.0
OUTPUT_DIRECTORY = ../
OUTPUT_LANGUAGE = English
diff --git
a/doc/salome/tui/SUPERV/sources/static/tree.js
b/doc/salome/tui/SUPERV/sources/static/tree.js
index d01e7c227c3ba0cef4062b63094359cd270da474..d198f82ebe759673f6227c647ec88da65345d83c 100755
(executable)
--- a/
doc/salome/tui/SUPERV/sources/static/tree.js
+++ b/
doc/salome/tui/SUPERV/sources/static/tree.js
@@
-1,4
+1,4
@@
-foldersTree = gFld("<b>SALOME v.
2
.1.0 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.
3
.1.0 </b>", "", "")
insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
diff --git
a/resources/SUPERVCatalog.xml
b/resources/SUPERVCatalog.xml
index ecfa179443668ef44089d61219e096023cf1a5e5..2f82c093a7a8ad6b0bff2821c1f98d5ecf8f6c0a 100644
(file)
--- a/
resources/SUPERVCatalog.xml
+++ b/
resources/SUPERVCatalog.xml
@@
-16,7
+16,7
@@
<component-username>Supervisor</component-username>
<component-type>SUPERV</component-type>
<component-author>ARS</component-author>
<component-username>Supervisor</component-username>
<component-type>SUPERV</component-type>
<component-author>ARS</component-author>
- <component-version>3.1.0
b1
</component-version>
+ <component-version>3.1.0</component-version>
<component-comment>Supervisor component</component-comment>
<component-multistudy>1</component-multistudy>
<component-icone>ModuleSupervision.png</component-icone>
<component-comment>Supervisor component</component-comment>
<component-multistudy>1</component-multistudy>
<component-icone>ModuleSupervision.png</component-icone>
diff --git
a/src/GraphExecutor/DataFlowExecutor_OutNode.cxx
b/src/GraphExecutor/DataFlowExecutor_OutNode.cxx
index 0518ce365aed550ac282fd1287f732bf6505c246..df40330d0645481fec23a489391b32a9e6462e72 100644
(file)
--- a/
src/GraphExecutor/DataFlowExecutor_OutNode.cxx
+++ b/
src/GraphExecutor/DataFlowExecutor_OutNode.cxx
@@
-2036,7
+2036,8
@@
bool GraphExecutor::OutNode::Kill() {
}
// asv : 25.10.04 : calling Editing() to indicate stop of execution
}
// asv : 25.10.04 : calling Editing() to indicate stop of execution
- Graph()->GraphEditor()->Editing();
+ if ( RetVal ) // mkr : IPAL10722 : we have to indicate stop of execution if only execution was successfully killed
+ Graph()->GraphEditor()->Editing();
cdebug_out << "GraphExecutor::OutNode::Kill " << RetVal
<< " Threads " << _Threads << " SuspendedThreads " << _SuspendedThreads
cdebug_out << "GraphExecutor::OutNode::Kill " << RetVal
<< " Threads " << _Threads << " SuspendedThreads " << _SuspendedThreads
diff --git
a/src/SUPERVGUI/SUPERVGUI.cxx
b/src/SUPERVGUI/SUPERVGUI.cxx
index cd78482843acd3da7c6eb370e7d8bf33b7c61d49..35c14746b24e011c755b6af81a9903c467ada8cf 100644
(file)
--- a/
src/SUPERVGUI/SUPERVGUI.cxx
+++ b/
src/SUPERVGUI/SUPERVGUI.cxx
@@
-78,7
+78,8
@@
SUPERVGUI::SUPERVGUI()
browser(0),
myFirstActivation(true),
myAllGraphsClosed(false),
browser(0),
myFirstActivation(true),
myAllGraphsClosed(false),
- myInitialViewFrame(0)
+ myInitialViewFrame(0),
+ myIVFBackgroundColor(QColor())
//info(0)
{
Trace("SUPERVGUI::SUPERVGUI")
//info(0)
{
Trace("SUPERVGUI::SUPERVGUI")
@@
-280,7
+281,7
@@
SUIT_ViewWindow* SUPERVGUI::createGraph() {
(( SalomeApp_Application* )application())->addViewManager( aVM );
SUPERVGraph_ViewFrame* aVW = dynamic_cast<SUPERVGraph_ViewFrame*>( aVM->createViewWindow() );
if ( aVW ) {
(( 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,
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;
myAllGraphsClosed = true;
myFirstActivation = true;
myInitialViewFrame = 0;
+ myIVFBackgroundColor = QColor();
main = 0;
}
}
main = 0;
}
}
@@
-487,7
+489,6
@@
void SUPERVGUI::displayDataflow() {
else {
// second case : get empty initial view frame as new ViewFrame object
aViewFrame = myInitialViewFrame;
else {
// second case : get empty initial view frame as new ViewFrame object
aViewFrame = myInitialViewFrame;
- myInitialViewFrame = 0;
}
if( aViewFrame ) {
}
if( aViewFrame ) {
@@
-495,6
+496,11
@@
void SUPERVGUI::displayDataflow() {
registerGraph( aIORName, main );
aViewFrame->show();
}
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;
else {
// 2. get empty initial view frame as new ViewFrame object
aViewFrame = myInitialViewFrame;
- myInitialViewFrame = 0;
}
if ( aViewFrame ) {
}
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 ) {
// 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;
main->addNode();
else
myInitialViewFrame = aViewFrame;
@@
-689,6
+694,14
@@
bool SUPERVGUI::createDataflow( const NEW_DF_MODE mode, bool theInitialDF ) {
registerGraph( f, main );
main->resizeView( new QResizeEvent( aViewFrame->size(), aViewFrame->size() ) );
aViewFrame->show();
registerGraph( f, main );
main->resizeView( new QResizeEvent( aViewFrame->size(), aViewFrame->size() ) );
aViewFrame->show();
+ QFileInfo inf( f );
+ if( !f.isEmpty() )
+ aViewFrame->setCaption( inf.fileName() );
+ }
+
+ if ( !theInitialDF ) {
+ myInitialViewFrame = 0;
+ myIVFBackgroundColor = QColor();
}
return true;
}
return true;
diff --git
a/src/SUPERVGUI/SUPERVGUI.h
b/src/SUPERVGUI/SUPERVGUI.h
index 84e7bbcd5fb22c3aa666d1762e080f1959a20383..2092a9f526ec74f7382da45f8b8062b7f09f4386 100644
(file)
--- 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; }
*/
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);
signals:
void KillMainThread(bool theValue);
@@
-166,6
+170,7
@@
class SUPERVGUI: public SalomeApp_Module {
bool myFirstActivation;
bool myAllGraphsClosed;
SUPERVGraph_ViewFrame* myInitialViewFrame;
bool myFirstActivation;
bool myAllGraphsClosed;
SUPERVGraph_ViewFrame* myInitialViewFrame;
+ QColor myIVFBackgroundColor; // mkr : IPAL10825
};
#endif
};
#endif
diff --git
a/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
b/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
index b8c2be47d487280da4787b8b39afc49f371c4ff5..08477e5477f5cf04eed7ef11b2bf72a2c168c4d1 100644
(file)
--- a/
src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
+++ b/
src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
@@
-8,6
+8,7
@@
using namespace std;
using namespace std;
+#include "SUPERVGUI.h"
#include "SUPERVGUI_ArrayView.h"
#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_CanvasCellNodePrs.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));
// 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 a299cdd2649542a0ea1014d654763499be43c0bd..776849d0db5c10190448fa418f7d3d5c371554e1 100644
(file)
--- a/
src/SUPERVGUI/SUPERVGUI_Canvas.cxx
+++ b/
src/SUPERVGUI/SUPERVGUI_Canvas.cxx
@@
-7,6
+7,7
@@
// Module : SUPERV
using namespace std;
// Module : SUPERV
using namespace std;
+#include "SUPERVGUI.h"
#include "SUPERVGUI_Def.h"
#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_CanvasNode.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);
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" ) );
//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 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;
// Module : SUPERV
using namespace std;
+#include "SUPERVGUI.h"
#include "SUPERVGUI_CanvasArray.h"
#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_BrowseNodeDlg.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);
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" ) );
//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 b9eeaffc5d04ebd3807b59bfe8bb9d48718be83f..ccf9f06afc66148a26c9fb6d90df537d6a6c13b7 100644
(file)
--- 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");
default:
setStatus("No Status");
- setStatusColor( resMgr()->colorValue( "SUPERVGraph", "
Background", DEF_MAIN_BACK ) );
+ setStatusColor( resMgr()->colorValue( "SUPERVGraph", "
NodeBody", DEF_MAIN_BACK ) ); // mkr : IPAL10829
break;
}
break;
}
diff --git
a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
index 3e52a413e50c30ef05fade6d30c8c11a45b760d8..c33671658d7ee0419d38d0ac5c85d2243ea95aca 100644
(file)
--- a/
src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
+++ b/
src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
@@
-10,6
+10,7
@@
using namespace std;
using namespace std;
+#include "SUPERVGUI.h"
#include "SUPERVGUI_CanvasView.h"
#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_CanvasNode.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));
// 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);
+ // <--
}
}
}
}