Merge from OCC_development_generic_2006

[modules/superv.git] / src / SUPERVGUI / SUPERVGUI_Def.h

diff --git a/src/SUPERVGUI/SUPERVGUI_Def.h b/src/SUPERVGUI/SUPERVGUI_Def.h
index 8a8c906ee4a169a2a5d848490511f24b3718752c..a78b457d811cb4270a5cfaeb4c7c1bb2d9666da7 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Def.h
+++ b/src/SUPERVGUI/SUPERVGUI_Def.h
@@ -25,10 +25,11 @@
 
 #define MAIN_NEW "aNewDataFlow"
 
-#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)
+//ASL: these values are default if resource manager doesn't contain corresponding values
+#define DEF_MAIN_COLOR QColor(144, 208, 211)
+#define DEF_MAIN_TITLE QColor( 63, 213, 255)
+#define DEF_MAIN_CTRL  QColor(255, 108, 106)
+#define DEF_MAIN_BACK  QColor(NODE_RED, NODE_GREEN, NODE_BLUE)
 
 // Taille du dataflow sous forme de graphe
 // ---------------------------------------
@@ -36,6 +37,8 @@
 #define GRAPH_WIDTH  3500
 #define GRAPH_HEIGHT 3500
 
+#define GRAPH_MARGIN 50
+
 #define GRAPH_MAX    245e5
 
 // Taille du dataflow sous forme de tableau
@@ -50,6 +53,8 @@
 
 #define CELL_SPACE    5
 
+#define MARGIN 2
+
 // Noeuds
 // ------
 /*
@@ -74,7 +79,8 @@ NODE_Editing   "",          NODE_RED, NODE_GREEN, NODE_BLUE, true,  false,  true
 // -----
 
 #define PORT_WIDTH  75
-#define PORT_HEIGHT 28
+#define PORT_HEIGHT 20
+#define PORT_MARGIN 2
 
 // Taille des points carres constituant les lignes entre les noeuds
 // ----------------------------------------------------------------
@@ -95,7 +101,7 @@ NODE_Editing   "",          NODE_RED, NODE_GREEN, NODE_BLUE, true,  false,  true
 // ----------------------------
 
 #define LABEL_WIDTH  160
-#define LABEL_HEIGHT  15
+#define LABEL_HEIGHT  20
 
 // Taille de la boite de filtre de notification
 // --------------------------------------------
@@ -174,7 +180,9 @@ NODE_Editing   "",          NODE_RED, NODE_GREEN, NODE_BLUE, true,  false,  true
 
 #define SUPERV_Engine  SUPERV::SuperG_var
 
-#define SUPERV_Graph   SUPERV::StreamGraph_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
@@ -186,6 +194,7 @@ 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
@@ -195,6 +204,7 @@ NODE_Editing   "",          NODE_RED, NODE_GREEN, NODE_BLUE, true,  false,  true
 #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
@@ -212,7 +222,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 };