X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSUPERVGUI%2FSUPERVGUI_Def.h;h=5c93893d0e5d237a2b9cb101036318b720b4ed34;hb=cbb0219fe6d6bf11f98f2306c2855fef1eaa2d44;hp=1239c145d7710e7b21f46ea07eccbb4406b1435b;hpb=c472be64ad2486a50e224af7c02e34eefaca9304;p=modules%2Fsuperv.git diff --git a/src/SUPERVGUI/SUPERVGUI_Def.h b/src/SUPERVGUI/SUPERVGUI_Def.h index 1239c14..5c93893 100644 --- a/src/SUPERVGUI/SUPERVGUI_Def.h +++ b/src/SUPERVGUI/SUPERVGUI_Def.h @@ -25,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) @@ -36,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 @@ -50,6 +52,8 @@ #define CELL_SPACE 5 +#define MARGIN 2 + // Noeuds // ------ /* @@ -174,7 +178,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::Graph_var +#define SUPERV_StreamGraph SUPERV::StreamGraph_var #define SUPERV_CNode SUPERV::CNode_var #define SUPERV_FNode SUPERV::FNode_var @@ -186,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 @@ -210,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 };