X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSUPERVGUI%2FSUPERVGUI_Def.h;h=5c93893d0e5d237a2b9cb101036318b720b4ed34;hb=cbb0219fe6d6bf11f98f2306c2855fef1eaa2d44;hp=f202f595d54a9eb7c3c05d603e4d52513e881b88;hpb=d2ea75950816c9bb41f70a80a8c4339d3d0ff9a5;p=modules%2Fsuperv.git

diff --git a/src/SUPERVGUI/SUPERVGUI_Def.h b/src/SUPERVGUI/SUPERVGUI_Def.h
index f202f59..5c93893 100644
--- a/src/SUPERVGUI/SUPERVGUI_Def.h
+++ b/src/SUPERVGUI/SUPERVGUI_Def.h
@@ -1,9 +1,12 @@
-//  File      : SUPERVGUI_Def.h
-//  Created   : 18 / 11 / 2002
-//  Author    : Vitaly SMETANNIKOV
-//  Project   : SALOME 
-//  Module    :  SUPERVGUI
-//  Copyright : Open CASCADE 
+//  SUPERV SUPERVGUI : GUI for Supervisor component
+//
+//  Copyright (C) 2003  CEA/DEN, EDF R&D
+//
+//
+//
+//  File   : SUPERVGUI_Def.h
+//  Author : Vitaly SMETANNIKOV
+//  Module : SUPERV
 
 #ifndef SUPERVGUI_DEF_H
 #define SUPERVGUI_DEF_H
@@ -22,7 +25,7 @@
 
 #define MAIN_NEW "aNewDataFlow"
 
-#define MAIN_COLOR QColor(165, 255, 176)
+#define MAIN_COLOR QColor(144, 208, 211)
 #define MAIN_TITLE QColor( 63, 213, 255)
 #define MAIN_CTRL  QColor(255, 108, 106)
 #define MAIN_BACK  QColor(NODE_RED, NODE_GREEN, NODE_BLUE)
@@ -33,6 +36,8 @@
 #define GRAPH_WIDTH  3500
 #define GRAPH_HEIGHT 3500
 
+#define GRAPH_MARGIN 50
+
 #define GRAPH_MAX    245e5
 
 // Taille du dataflow sous forme de tableau
@@ -47,6 +52,8 @@
 
 #define CELL_SPACE    5
 
+#define MARGIN 2
+
 // Noeuds
 // ------
 /*
@@ -169,9 +176,11 @@ NODE_Editing   "",          NODE_RED, NODE_GREEN, NODE_BLUE, true,  false,  true
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
-#define SUPERV_Engine  SUPERV::SuperG_var*
+#define SUPERV_Engine  SUPERV::SuperG_var
 
+//#define SUPERV_Graph   SUPERV::StreamGraph_var
 #define SUPERV_Graph   SUPERV::Graph_var
+#define SUPERV_StreamGraph   SUPERV::StreamGraph_var
 
 #define SUPERV_CNode   SUPERV::CNode_var
 #define SUPERV_FNode   SUPERV::FNode_var
@@ -183,13 +192,17 @@ NODE_Editing   "",          NODE_RED, NODE_GREEN, NODE_BLUE, true,  false,  true
 #define SUPERV_ESNode  SUPERV::ESNode_var
 
 #define SUPERV_Links   SUPERV::ListOfLinks_var
+#define SUPERV_StreamLinks   SUPERV::ListOfStreamLinks_var
 #define SUPERV_Ports   SUPERV::ListOfPorts_var
+#define SUPERV_StreamPorts   SUPERV::ListOfStreamPorts_var
 #define SUPERV_Nodes   SUPERV::ListOfNodes_var
 #define SUPERV_Strings SUPERV::ListOfStrings_var
 
 #define SUPERV_Link    SUPERV::Link_var
 #define SUPERV_Date    SUPERV::SDate
 #define SUPERV_Port    SUPERV::Port_var
+#define SUPERV_StreamPort    SUPERV::StreamPort_var
+#define SUPERV_StreamLink    SUPERV::StreamLink_var
 
 #define SUPERV_Editing SUPERV::EditingState
 #define SUPERV_Running SUPERV::RunningState
@@ -207,7 +220,7 @@ NODE_Editing   "",          NODE_RED, NODE_GREEN, NODE_BLUE, true,  false,  true
 #define SUPERV_isNull(oc) (CORBA::is_nil(oc))
 
 
-enum GraphViewType { GRAPH, CONTROLFLOW, TABLE };
+enum GraphViewType { CONTROLFLOW, CANVAS, CANVASTABLE };
 //enum NodeType { COMPUTE, SWITCH, LOOP, GOTO, LABEL };