From 30ad344bad08e86656d9dbcbb5e209b7ae1a8339 Mon Sep 17 00:00:00 2001 From: rahuel Date: Thu, 18 Mar 2004 13:42:49 +0000 Subject: [PATCH] *** empty log message *** --- examples/GraphSyrControlDefault.py | 139 +++++++---- examples/GraphSyrControlDefault.xml | 244 ++++++++++++------ examples/GraphSyrControlGUI.py | 161 ++++++------ examples/GraphSyrControlGUI.xml | 290 +++++++++++----------- idl/Makefile.in | 10 +- src/GraphBase/DataFlowBase_XmlHandler.cxx | 2 +- src/Makefile.in | 2 +- 7 files changed, 486 insertions(+), 362 deletions(-) diff --git a/examples/GraphSyrControlDefault.py b/examples/GraphSyrControlDefault.py index 489d53e..16c7465 100644 --- a/examples/GraphSyrControlDefault.py +++ b/examples/GraphSyrControlDefault.py @@ -10,36 +10,41 @@ GraphSyrControlDefault.SetComment( 'Syracuse algorithm' ) GraphSyrControlDefault.Coords( 0 , 0 ) # Creation of Factory Nodes + test_ISEVEN = GraphSyrControlDefault.FNode( 'SyrComponent' , 'SyrComponent' , 'C_ISEVEN' ) test_ISEVEN.SetName( 'test_ISEVEN' ) test_ISEVEN.SetAuthor( '' ) test_ISEVEN.SetContainer( 'localhost/FactoryServer' ) test_ISEVEN.SetComment( 'C_ISEVEN from SyrComponent' ) -test_ISEVEN.Coords( 190 , 338 ) +test_ISEVEN.Coords( 204 , 444 ) + test_ISONE = GraphSyrControlDefault.FNode( 'SyrComponent' , 'SyrComponent' , 'C_ISONE' ) test_ISONE.SetName( 'test_ISONE' ) test_ISONE.SetAuthor( '' ) test_ISONE.SetContainer( 'localhost/FactoryServer' ) test_ISONE.SetComment( 'C_ISONE from SyrComponent' ) -test_ISONE.Coords( 196 , 131 ) +test_ISONE.Coords( 201 , 52 ) + m3p1 = GraphSyrControlDefault.FNode( 'SyrComponent' , 'SyrComponent' , 'C_M3P1' ) m3p1.SetName( 'm3p1' ) m3p1.SetAuthor( '' ) m3p1.SetContainer( 'localhost/FactoryServer' ) m3p1.SetComment( 'C_M3P1 from SyrComponent' ) -m3p1.Coords( 621 , 14 ) +m3p1.Coords( 806 , 19 ) + div2 = GraphSyrControlDefault.FNode( 'SyrComponent' , 'SyrComponent' , 'C_DIV2' ) div2.SetName( 'div2' ) div2.SetAuthor( '' ) div2.SetContainer( 'localhost/FactoryServer' ) div2.SetComment( 'C_DIV2 from SyrComponent' ) -div2.Coords( 624 , 391 ) +div2.Coords( 803 , 451 ) + incr = GraphSyrControlDefault.FNode( 'SyrComponent' , 'SyrComponent' , 'C_INCR' ) incr.SetName( 'incr' ) incr.SetAuthor( '' ) incr.SetContainer( 'localhost/FactoryServer' ) incr.SetComment( 'C_INCR from SyrComponent' ) -incr.Coords( 622 , 199 ) +incr.Coords( 802 , 170 ) # Creation of InLine Nodes Pylabel_begin = [] @@ -47,31 +52,26 @@ Pylabel_begin.append( 'def label_begin( NB , KB ):' ) Pylabel_begin.append( ' print "label_begin",NB,KB' ) Pylabel_begin.append( ' return NB,KB' ) label_begin = GraphSyrControlDefault.INode( 'label_begin' , Pylabel_begin ) -label_begin.InPort( 'NB' , 'long' ) -label_begin.InPort( 'KB' , 'long' ) -label_begin.OutPort( 'NT' , 'long' ) -label_begin.OutPort( 'KT' , 'long' ) label_begin.SetName( 'label_begin' ) label_begin.SetAuthor( '' ) label_begin.SetComment( 'Python function' ) -label_begin.Coords( 7 , 216 ) +label_begin.Coords( 12 , 264 ) +label_begin.InPort( 'NB' , 'long' ) +label_begin.InPort( 'KB' , 'long' ) + Pylabel_test = [] Pylabel_test.append( 'def label_test( ValEven , ValOne , NB , KB ):' ) Pylabel_test.append( ' print "label_begin",ValEven,ValOne,NB,KB' ) Pylabel_test.append( ' return ValEven,ValOne,NB,KB' ) label_test = GraphSyrControlDefault.INode( 'label_test' , Pylabel_test ) +label_test.SetName( 'label_test' ) +label_test.SetAuthor( '' ) +label_test.SetComment( 'Python function' ) +label_test.Coords( 415 , 206 ) label_test.InPort( 'ValEven' , 'long' ) label_test.InPort( 'ValOne' , 'long' ) label_test.InPort( 'NT' , 'long' ) label_test.InPort( 'KT' , 'long' ) -label_test.OutPort( 'ValEven' , 'long' ) -label_test.OutPort( 'ValOne' , 'long' ) -label_test.OutPort( 'NT' , 'long' ) -label_test.OutPort( 'KT' , 'long' ) -label_test.SetName( 'label_test' ) -label_test.SetAuthor( '' ) -label_test.SetComment( 'Python function' ) -label_test.Coords( 7 , 216 ) # Creation of Switch Nodes Pytest = [] @@ -94,99 +94,140 @@ test,EndSwitch_OneEven = GraphSyrControlDefault.SNode( 'Switch_OneEven' , Pytest EndSwitch_OneEven.SetName( 'EndSwitch_OneEven' ) EndSwitch_OneEven.SetAuthor( '' ) EndSwitch_OneEven.SetComment( '' ) -EndSwitch_OneEven.Coords( 1004 , 256 ) +EndSwitch_OneEven.Coords( 1074 , 367 ) PyEndSwitch_OneEven = [] EndSwitch_OneEven.SetPyFunction( 'EndSwitch_OneEven' , PyEndSwitch_OneEven ) EndSwitch_OneEven.InPort( 'K' , 'long' ) EndSwitch_OneEven.OutPort( 'K' , 'long' ) +test.SetName( 'test' ) +test.SetAuthor( '' ) +test.SetComment( '' ) +test.Coords( 597 , 251 ) test.InPort( 'ValOne' , 'long' ) test.InPort( 'ValEven' , 'long' ) test.InPort( 'NT' , 'long' ) test.InPort( 'KT' , 'long' ) -test.OutPort( 'Incr' , 'long' ) -test.OutPort( 'Even' , 'long' ) -test.OutPort( 'Odd' , 'long' ) -test.OutPort( 'N' , 'long' ) -test.OutPort( 'K' , 'long' ) -test.SetName( 'test' ) -test.SetAuthor( '' ) -test.SetComment( '' ) -test.Coords( 399 , 176 ) # Creation of GOTO Nodes Pycontrol_m3p1 = [] Pycontrol_m3p1.append( 'def control_m3p1( N , K ):' ) Pycontrol_m3p1.append( ' return 0,1,N,K' ) control_m3p1 = GraphSyrControlDefault.GNode( 'control_m3p1' , Pycontrol_m3p1 , 'label_test' ) -control_m3p1.InPort( 'N' , 'long' ) -control_m3p1.InPort( 'K' , 'long' ) -control_m3p1.OutPort( 'ValOne' , 'long' ) -control_m3p1.OutPort( 'ValEven' , 'long' ) -control_m3p1.OutPort( 'NT' , 'long' ) -control_m3p1.OutPort( 'KT' , 'long' ) control_m3p1.SetName( 'control_m3p1' ) control_m3p1.SetAuthor( '' ) control_m3p1.SetComment( '' ) -control_m3p1.Coords( 814 , 13 ) +control_m3p1.Coords( 1002 , 64 ) +control_m3p1.InPort( 'N' , 'long' ) +control_m3p1.InPort( 'K' , 'long' ) + Pycontrol_div2 = [] Pycontrol_div2.append( 'def control_div2( N , NB ) :' ) Pycontrol_div2.append( ' return N,NB' ) control_div2 = GraphSyrControlDefault.GNode( 'control_div2' , Pycontrol_div2 , 'label_begin' ) -control_div2.InPort( 'N' , 'long' ) -control_div2.InPort( 'K' , 'long' ) -control_div2.OutPort( 'NB' , 'long' ) -control_div2.OutPort( 'KB' , 'long' ) control_div2.SetName( 'control_div2' ) control_div2.SetAuthor( '' ) control_div2.SetComment( '' ) -control_div2.Coords( 812 , 414 ) +control_div2.Coords( 1013 , 496 ) +control_div2.InPort( 'N' , 'long' ) +control_div2.InPort( 'K' , 'long' ) -# Creation of intermediate Output variables and of Control Links +# Creation of Links test_ISEVENBoolEven = test_ISEVEN.Port( 'BoolEven' ) label_testValEven = GraphSyrControlDefault.Link( test_ISEVENBoolEven , label_test.Port( 'ValEven' ) ) +label_testValEven.AddCoord( 1 , 381 , 286 ) +label_testValEven.AddCoord( 2 , 382 , 524 ) + test_ISONEBoolOne = test_ISONE.Port( 'BoolOne' ) label_testValOne = GraphSyrControlDefault.Link( test_ISONEBoolOne , label_test.Port( 'ValOne' ) ) +label_testValOne.AddCoord( 1 , 393 , 314 ) +label_testValOne.AddCoord( 2 , 393 , 133 ) + m3p1anEvenInteger = m3p1.Port( 'anEvenInteger' ) control_m3p1N = GraphSyrControlDefault.Link( m3p1anEvenInteger , control_m3p1.Port( 'N' ) ) + div2anInteger = div2.Port( 'anInteger' ) control_div2N = GraphSyrControlDefault.Link( div2anInteger , control_div2.Port( 'N' ) ) + incraNewCount = incr.Port( 'aNewCount' ) control_m3p1K = GraphSyrControlDefault.Link( incraNewCount , control_m3p1.Port( 'K' ) ) +control_m3p1K.AddCoord( 1 , 985 , 128 ) +control_m3p1K.AddCoord( 2 , 985 , 250 ) + control_div2K = GraphSyrControlDefault.Link( incraNewCount , control_div2.Port( 'K' ) ) +control_div2K.AddCoord( 1 , 987 , 559 ) +control_div2K.AddCoord( 2 , 985 , 250 ) + label_beginNT = label_begin.Port( 'NT' ) label_testNT = GraphSyrControlDefault.Link( label_beginNT , label_test.Port( 'NT' ) ) + test_ISEVENanInteger = GraphSyrControlDefault.Link( label_beginNT , test_ISEVEN.Port( 'anInteger' ) ) +test_ISEVENanInteger.AddCoord( 1 , 191 , 524 ) +test_ISEVENanInteger.AddCoord( 2 , 192 , 345 ) + test_ISONEanInteger = GraphSyrControlDefault.Link( label_beginNT , test_ISONE.Port( 'anInteger' ) ) +test_ISONEanInteger.AddCoord( 1 , 192 , 131 ) +test_ISONEanInteger.AddCoord( 2 , 193 , 345 ) + label_beginKT = label_begin.Port( 'KT' ) label_testKT = GraphSyrControlDefault.Link( label_beginKT , label_test.Port( 'KT' ) ) + label_testValEven = label_test.Port( 'ValEven' ) testValEven = GraphSyrControlDefault.Link( label_testValEven , test.Port( 'ValEven' ) ) + label_testValOne = label_test.Port( 'ValOne' ) testValOne = GraphSyrControlDefault.Link( label_testValOne , test.Port( 'ValOne' ) ) + label_testNT = label_test.Port( 'NT' ) testNT = GraphSyrControlDefault.Link( label_testNT , test.Port( 'NT' ) ) + label_testKT = label_test.Port( 'KT' ) testKT = GraphSyrControlDefault.Link( label_testKT , test.Port( 'KT' ) ) -testDefault = test.Port( 'Default' ) -EndSwitch_OneEvenDefault = GraphSyrControlDefault.Link( testDefault , EndSwitch_OneEven.Port( 'Default' ) ) + testIncr = test.Port( 'Incr' ) incrInGate = GraphSyrControlDefault.Link( testIncr , incr.Port( 'InGate' ) ) + testEven = test.Port( 'Even' ) div2InGate = GraphSyrControlDefault.Link( testEven , div2.Port( 'InGate' ) ) +div2InGate.AddCoord( 1 , 793 , 567 ) +div2InGate.AddCoord( 2 , 792 , 314 ) + testOdd = test.Port( 'Odd' ) m3p1InGate = GraphSyrControlDefault.Link( testOdd , m3p1.Port( 'InGate' ) ) +m3p1InGate.AddCoord( 1 , 786 , 132 ) +m3p1InGate.AddCoord( 2 , 785 , 343 ) + testN = test.Port( 'N' ) m3p1anOddInteger = GraphSyrControlDefault.Link( testN , m3p1.Port( 'anOddInteger' ) ) +m3p1anOddInteger.AddCoord( 1 , 767 , 100 ) +m3p1anOddInteger.AddCoord( 2 , 767 , 371 ) + div2anEvenInteger = GraphSyrControlDefault.Link( testN , div2.Port( 'anEvenInteger' ) ) +div2anEvenInteger.AddCoord( 1 , 768 , 531 ) +div2anEvenInteger.AddCoord( 2 , 767 , 371 ) + testK = test.Port( 'K' ) EndSwitch_OneEvenK = GraphSyrControlDefault.Link( testK , EndSwitch_OneEven.Port( 'K' ) ) + incraCount = GraphSyrControlDefault.Link( testK , incr.Port( 'aCount' ) ) +incraCount.AddCoord( 1 , 773 , 251 ) +incraCount.AddCoord( 2 , 774 , 400 ) + +testDefault = test.Port( 'Default' ) +EndSwitch_OneEvenDefault = GraphSyrControlDefault.Link( testDefault , EndSwitch_OneEven.Port( 'Default' ) ) -# Creation of intermediate Output variables and of Loop Links control_m3p1OutGate = control_m3p1.Port( 'OutGate' ) label_testInGate = GraphSyrControlDefault.Link( control_m3p1OutGate , label_test.Port( 'InGate' ) ) +label_testInGate.AddCoord( 1 , 402 , 406 ) +label_testInGate.AddCoord( 2 , 403 , 4 ) +label_testInGate.AddCoord( 3 , 1174 , 5 ) +label_testInGate.AddCoord( 4 , 1175 , 219 ) + control_div2OutGate = control_div2.Port( 'OutGate' ) label_beginInGate = GraphSyrControlDefault.Link( control_div2OutGate , label_begin.Port( 'InGate' ) ) +label_beginInGate.AddCoord( 1 , 3 , 409 ) +label_beginInGate.AddCoord( 2 , 2 , 671 ) +label_beginInGate.AddCoord( 3 , 1199 , 670 ) +label_beginInGate.AddCoord( 4 , 1198 , 592 ) # Creation of Input datas label_beginNB = label_begin.Input( 'NB' , 7) @@ -194,13 +235,3 @@ label_beginKB = label_begin.Input( 'KB' , 0) # Creation of Output variables EndSwitch_OneEvenK = EndSwitch_OneEven.Port( 'K' ) - -GraphSyrControlDefault.Run() - -GraphSyrControlDefault.DoneW() - -GraphSyrControlDefault.State() - -GraphSyrControlDefault.PrintPorts() - -EndSwitch_OneEven.PrintPorts() diff --git a/examples/GraphSyrControlDefault.xml b/examples/GraphSyrControlDefault.xml index 259aa4b..8cf9d4d 100644 --- a/examples/GraphSyrControlDefault.xml +++ b/examples/GraphSyrControlDefault.xml @@ -20,10 +20,10 @@ long EndSwitch_OneEven\K - + 19/3/2003 - 16:49:51 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 1.04 JR ? @@ -47,16 +47,16 @@ long BoolEven - + - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? localhost/FactoryServer C_ISEVEN from SyrComponent - 190 - 338 + 204 + 444 SyrComponent SyrComponent @@ -73,16 +73,16 @@ long BoolOne - + - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? localhost/FactoryServer C_ISONE from SyrComponent - 196 - 131 + 201 + 52 SyrComponent SyrComponent @@ -99,16 +99,16 @@ long anEvenInteger - + - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? localhost/FactoryServer C_M3P1 from SyrComponent - 621 - 14 + 806 + 19 SyrComponent SyrComponent @@ -125,16 +125,16 @@ long anInteger - + - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? localhost/FactoryServer C_DIV2 from SyrComponent - 624 - 391 + 803 + 451 SyrComponent SyrComponent @@ -151,16 +151,16 @@ long aNewCount - + - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? localhost/FactoryServer C_INCR from SyrComponent - 622 - 199 + 802 + 170 ? ? @@ -183,21 +183,21 @@ long KT - + label_begin - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? ? Python function - 7 - 216 + 12 + 264 ? ? @@ -232,21 +232,21 @@ long KT - + label_test - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? ? Python function - 7 - 216 + 415 + 206 ? ? @@ -284,7 +284,7 @@ long K - + Switch_OneEven @@ -303,14 +303,14 @@ - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? ? ? - 399 - 176 + 597 + 251 ? ? @@ -327,17 +327,19 @@ long K - + - - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + +? + + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? ? ? - 1004 - 256 + 1074 + 367 ? ? @@ -366,20 +368,20 @@ long KT - + control_m3p1 - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? ? ? - 814 - 13 + 1002 + 64 ? ? @@ -402,33 +404,45 @@ long KB - + control_div2 - 25/3/2003 - 17:36:32 - 25/3/2003 - 17:36:32 + 18/3/2004 - 13:59:54 + 18/3/2004 - 13:59:54 1.04 ? ? ? - 812 - 414 + 1013 + 496 test_ISEVEN BoolEven label_test ValEven - + + +381 + 286 + +382 + 524 test_ISONE BoolOne label_test ValOne - + + +393 + 314 + +393 + 133 m3p1 anEvenInteger @@ -446,13 +460,25 @@ aNewCount control_m3p1 K - + + +985 + 128 + +985 + 250 incr aNewCount control_div2 K - + + +987 + 559 + +985 + 250 label_begin NT @@ -464,13 +490,25 @@ NT test_ISEVEN anInteger - + + +191 + 524 + +192 + 345 label_begin NT test_ISONE anInteger - + + +192 + 131 + +193 + 345 label_begin KT @@ -502,12 +540,6 @@ KT -test - Default - EndSwitch_OneEven - Default - - test Incr incr @@ -518,25 +550,49 @@ Even div2 InGate - + + +793 + 567 + +792 + 314 test Odd m3p1 InGate - + + +786 + 132 + +785 + 343 test N m3p1 anOddInteger - + + +767 + 100 + +767 + 371 test N div2 anEvenInteger - + + +768 + 531 + +767 + 371 test K @@ -548,19 +604,55 @@ K incr aCount + + +773 + 251 + +774 + 400 + +test + Default + EndSwitch_OneEven + Default control_m3p1 OutGate label_test InGate - + + +402 + 406 + +403 + 4 + +1174 + 5 + +1175 + 219 control_div2 OutGate label_begin InGate - + + +3 + 409 + +2 + 671 + +1199 + 670 + +1198 + 592 GraphSyrControlDefault diff --git a/examples/GraphSyrControlGUI.py b/examples/GraphSyrControlGUI.py index d2b53c5..cf7becd 100644 --- a/examples/GraphSyrControlGUI.py +++ b/examples/GraphSyrControlGUI.py @@ -10,50 +10,53 @@ GraphSyrControlGUI.SetComment( 'Syracuse algorithm' ) GraphSyrControlGUI.Coords( 0 , 0 ) # Creation of Factory Nodes + test_ISEVEN = GraphSyrControlGUI.FNode( 'SyrComponent' , 'SyrComponent' , 'C_ISEVEN' ) test_ISEVEN.SetName( 'test_ISEVEN' ) test_ISEVEN.SetAuthor( '' ) test_ISEVEN.SetContainer( 'localhost/FactoryServer' ) test_ISEVEN.SetComment( 'C_ISEVEN from SyrComponent' ) -test_ISEVEN.Coords( 190 , 338 ) +test_ISEVEN.Coords( 288 , 337 ) + test_ISONE = GraphSyrControlGUI.FNode( 'SyrComponent' , 'SyrComponent' , 'C_ISONE' ) test_ISONE.SetName( 'test_ISONE' ) test_ISONE.SetAuthor( '' ) test_ISONE.SetContainer( 'localhost/FactoryServer' ) test_ISONE.SetComment( 'C_ISONE from SyrComponent' ) -test_ISONE.Coords( 196 , 131 ) +test_ISONE.Coords( 293 , 130 ) + m3p1 = GraphSyrControlGUI.FNode( 'SyrComponent' , 'SyrComponent' , 'C_M3P1' ) m3p1.SetName( 'm3p1' ) m3p1.SetAuthor( '' ) m3p1.SetContainer( 'localhost/FactoryServer' ) m3p1.SetComment( 'C_M3P1 from SyrComponent' ) -m3p1.Coords( 621 , 29 ) +m3p1.Coords( 761 , 19 ) + div2 = GraphSyrControlGUI.FNode( 'SyrComponent' , 'SyrComponent' , 'C_DIV2' ) div2.SetName( 'div2' ) div2.SetAuthor( '' ) div2.SetContainer( 'localhost/FactoryServer' ) div2.SetComment( 'C_DIV2 from SyrComponent' ) -div2.Coords( 624 , 391 ) +div2.Coords( 770 , 384 ) + incr = GraphSyrControlGUI.FNode( 'SyrComponent' , 'SyrComponent' , 'C_INCR' ) incr.SetName( 'incr' ) incr.SetAuthor( '' ) incr.SetContainer( 'localhost/FactoryServer' ) incr.SetComment( 'C_INCR from SyrComponent' ) -incr.Coords( 623 , 206 ) +incr.Coords( 764 , 179 ) # Creation of InLine Nodes Pylabel_begin = [] Pylabel_begin.append( 'def label_begin( NB , KB ) :' ) Pylabel_begin.append( ' return NB,KB' ) label_begin = GraphSyrControlGUI.INode( 'label_begin' , Pylabel_begin ) -label_begin.InPort( 'NB' , 'long' ) -label_begin.InPort( 'KB' , 'long' ) -label_begin.OutPort( 'NT' , 'long' ) -label_begin.OutPort( 'KT' , 'long' ) label_begin.SetName( 'label_begin' ) label_begin.SetAuthor( '' ) label_begin.SetComment( 'Python function' ) -label_begin.Coords( 7 , 216 ) +label_begin.Coords( 58 , 189 ) +label_begin.InPort( 'NB' , 'long' ) +label_begin.InPort( 'KB' , 'long' ) # Creation of Switch Nodes Pylabel_test = [] @@ -76,125 +79,128 @@ label_test,EndL_OneEven = GraphSyrControlGUI.SNode( 'L_OneEven' , Pylabel_test ) EndL_OneEven.SetName( 'EndL_OneEven' ) EndL_OneEven.SetAuthor( '' ) EndL_OneEven.SetComment( '' ) -EndL_OneEven.Coords( 1034 , 252 ) +EndL_OneEven.Coords( 1068 , 258 ) PyEndL_OneEven = [] EndL_OneEven.SetPyFunction( 'EndL_OneEven' , PyEndL_OneEven ) +label_test.SetName( 'label_test' ) +label_test.SetAuthor( '' ) +label_test.SetComment( '' ) +label_test.Coords( 516 , 175 ) label_test.InPort( 'ValOne' , 'long' ) label_test.InPort( 'ValEven' , 'long' ) label_test.InPort( 'NT' , 'long' ) label_test.InPort( 'KT' , 'long' ) -label_test.OutPort( 'Finished' , 'long' ) -label_test.OutPort( 'Incr' , 'long' ) -label_test.OutPort( 'Even' , 'long' ) -label_test.OutPort( 'Odd' , 'long' ) -label_test.OutPort( 'N' , 'long' ) -label_test.OutPort( 'K' , 'long' ) -label_test.SetName( 'label_test' ) -label_test.SetAuthor( '' ) -label_test.SetComment( '' ) -label_test.Coords( 399 , 176 ) # Creation of GOTO Nodes Pycontrol_m3p1 = [] Pycontrol_m3p1.append( 'def C_NotOneIsEven( N , K ):' ) Pycontrol_m3p1.append( ' return 0,1,N,K' ) control_m3p1 = GraphSyrControlGUI.GNode( 'C_NotOneIsEven' , Pycontrol_m3p1 , 'label_test' ) -control_m3p1.InPort( 'N' , 'long' ) -control_m3p1.InPort( 'K' , 'long' ) -control_m3p1.OutPort( 'ValOne' , 'long' ) -control_m3p1.OutPort( 'ValEven' , 'long' ) -control_m3p1.OutPort( 'NT' , 'long' ) -control_m3p1.OutPort( 'KT' , 'long' ) control_m3p1.SetName( 'control_m3p1' ) control_m3p1.SetAuthor( '' ) control_m3p1.SetComment( '' ) -control_m3p1.Coords( 808 , 29 ) +control_m3p1.Coords( 972 , 64 ) +control_m3p1.InPort( 'N' , 'long' ) +control_m3p1.InPort( 'K' , 'long' ) + Pycontrol_div2 = [] Pycontrol_div2.append( 'def control_div2( N , K ) :' ) Pycontrol_div2.append( ' return N,K' ) control_div2 = GraphSyrControlGUI.GNode( 'control_div2' , Pycontrol_div2 , 'label_begin' ) -control_div2.InPort( 'N' , 'long' ) -control_div2.InPort( 'K' , 'long' ) -control_div2.OutPort( 'NB' , 'long' ) -control_div2.OutPort( 'KB' , 'long' ) control_div2.SetName( 'control_div2' ) control_div2.SetAuthor( '' ) control_div2.SetComment( '' ) -control_div2.Coords( 812 , 357 ) +control_div2.Coords( 972 , 430 ) +control_div2.InPort( 'N' , 'long' ) +control_div2.InPort( 'K' , 'long' ) -# Creation of intermediate Output variables and of Control Links +# Creation of Links test_ISEVENBoolEven = test_ISEVEN.Port( 'BoolEven' ) label_testValEven = GraphSyrControlGUI.Link( test_ISEVENBoolEven , label_test.Port( 'ValEven' ) ) -label_testValEven.AddCoord( 1 , 385 , 358 ) -label_testValEven.AddCoord( 2 , 385 , 490 ) +label_testValEven.AddCoord( 1 , 493 , 238 ) +label_testValEven.AddCoord( 2 , 493 , 418 ) + test_ISONEBoolOne = test_ISONE.Port( 'BoolOne' ) label_testValOne = GraphSyrControlGUI.Link( test_ISONEBoolOne , label_test.Port( 'ValOne' ) ) -label_testValOne.AddCoord( 1 , 385 , 328 ) -label_testValOne.AddCoord( 2 , 385 , 283 ) + m3p1anEvenInteger = m3p1.Port( 'anEvenInteger' ) control_m3p1N = GraphSyrControlGUI.Link( m3p1anEvenInteger , control_m3p1.Port( 'N' ) ) -control_m3p1N.AddCoord( 1 , 786 , 181 ) -control_m3p1N.AddCoord( 2 , 786 , 182 ) + div2anInteger = div2.Port( 'anInteger' ) control_div2N = GraphSyrControlGUI.Link( div2anInteger , control_div2.Port( 'N' ) ) -control_div2N.AddCoord( 1 , 799 , 509 ) -control_div2N.AddCoord( 2 , 799 , 543 ) + incraNewCount = incr.Port( 'aNewCount' ) control_div2K = GraphSyrControlGUI.Link( incraNewCount , control_div2.Port( 'K' ) ) -control_div2K.AddCoord( 1 , 787 , 539 ) -control_div2K.AddCoord( 2 , 787 , 359 ) +control_div2K.AddCoord( 1 , 954 , 494 ) +control_div2K.AddCoord( 2 , 954 , 259 ) + control_m3p1K = GraphSyrControlGUI.Link( incraNewCount , control_m3p1.Port( 'K' ) ) -control_m3p1K.AddCoord( 1 , 790 , 211 ) -control_m3p1K.AddCoord( 2 , 790 , 358 ) +control_m3p1K.AddCoord( 1 , 955 , 128 ) +control_m3p1K.AddCoord( 2 , 954 , 258 ) + label_beginNT = label_begin.Port( 'NT' ) test_ISONEanInteger = GraphSyrControlGUI.Link( label_beginNT , test_ISONE.Port( 'anInteger' ) ) -test_ISONEanInteger.AddCoord( 1 , 175 , 283 ) -test_ISONEanInteger.AddCoord( 2 , 175 , 368 ) +test_ISONEanInteger.AddCoord( 1 , 275 , 211 ) +test_ISONEanInteger.AddCoord( 2 , 275 , 270 ) + label_testNT = GraphSyrControlGUI.Link( label_beginNT , label_test.Port( 'NT' ) ) -label_testNT.AddCoord( 1 , 367 , 388 ) -label_testNT.AddCoord( 2 , 367 , 319 ) -label_testNT.AddCoord( 3 , 175 , 321 ) -label_testNT.AddCoord( 4 , 175 , 368 ) + test_ISEVENanInteger = GraphSyrControlGUI.Link( label_beginNT , test_ISEVEN.Port( 'anInteger' ) ) -test_ISEVENanInteger.AddCoord( 1 , 183 , 486 ) -test_ISEVENanInteger.AddCoord( 2 , 183 , 368 ) +test_ISEVENanInteger.AddCoord( 1 , 274 , 417 ) +test_ISEVENanInteger.AddCoord( 2 , 275 , 270 ) + label_beginKT = label_begin.Port( 'KT' ) label_testKT = GraphSyrControlGUI.Link( label_beginKT , label_test.Port( 'KT' ) ) -label_testKT.AddCoord( 1 , 373 , 418 ) -label_testKT.AddCoord( 2 , 373 , 518 ) -label_testKT.AddCoord( 3 , 176 , 519 ) -label_testKT.AddCoord( 4 , 176 , 398 ) -label_testDefault = label_test.Port( 'Default' ) -EndL_OneEvenDefault = GraphSyrControlGUI.Link( label_testDefault , EndL_OneEven.Port( 'Default' ) ) +label_testKT.AddCoord( 1 , 476 , 294 ) +label_testKT.AddCoord( 2 , 475 , 515 ) +label_testKT.AddCoord( 3 , 260 , 515 ) +label_testKT.AddCoord( 4 , 260 , 298 ) + label_testIncr = label_test.Port( 'Incr' ) incrInGate = GraphSyrControlGUI.Link( label_testIncr , incr.Port( 'InGate' ) ) -incrInGate.AddCoord( 1 , 578 , 328 ) -incrInGate.AddCoord( 2 , 578 , 358 ) +incrInGate.AddCoord( 1 , 712 , 292 ) +incrInGate.AddCoord( 2 , 711 , 238 ) + label_testEven = label_test.Port( 'Even' ) div2InGate = GraphSyrControlGUI.Link( label_testEven , div2.Port( 'InGate' ) ) -div2InGate.AddCoord( 1 , 578 , 513 ) -div2InGate.AddCoord( 2 , 578 , 388 ) +div2InGate.AddCoord( 1 , 724 , 498 ) +div2InGate.AddCoord( 2 , 723 , 268 ) + label_testOdd = label_test.Port( 'Odd' ) m3p1InGate = GraphSyrControlGUI.Link( label_testOdd , m3p1.Port( 'InGate' ) ) -m3p1InGate.AddCoord( 1 , 565 , 151 ) -m3p1InGate.AddCoord( 2 , 565 , 418 ) +m3p1InGate.AddCoord( 1 , 698 , 132 ) +m3p1InGate.AddCoord( 2 , 697 , 297 ) + label_testN = label_test.Port( 'N' ) m3p1anOddInteger = GraphSyrControlGUI.Link( label_testN , m3p1.Port( 'anOddInteger' ) ) -m3p1anOddInteger.AddCoord( 1 , 609 , 181 ) -m3p1anOddInteger.AddCoord( 2 , 609 , 448 ) +m3p1anOddInteger.AddCoord( 1 , 748 , 100 ) +m3p1anOddInteger.AddCoord( 2 , 747 , 325 ) + div2anEvenInteger = GraphSyrControlGUI.Link( label_testN , div2.Port( 'anEvenInteger' ) ) -div2anEvenInteger.AddCoord( 1 , 612 , 543 ) -div2anEvenInteger.AddCoord( 2 , 612 , 448 ) +div2anEvenInteger.AddCoord( 1 , 746 , 463 ) +div2anEvenInteger.AddCoord( 2 , 747 , 327 ) + label_testK = label_test.Port( 'K' ) incraCount = GraphSyrControlGUI.Link( label_testK , incr.Port( 'aCount' ) ) -incraCount.AddCoord( 1 , 594 , 358 ) -incraCount.AddCoord( 2 , 594 , 478 ) +incraCount.AddCoord( 1 , 732 , 260 ) +incraCount.AddCoord( 2 , 732 , 354 ) + +label_testDefault = label_test.Port( 'Default' ) +EndL_OneEvenDefault = GraphSyrControlGUI.Link( label_testDefault , EndL_OneEven.Port( 'Default' ) ) + control_m3p1OutGate = control_m3p1.Port( 'OutGate' ) label_testInGate = GraphSyrControlGUI.Link( control_m3p1OutGate , label_test.Port( 'InGate' ) ) +label_testInGate.AddCoord( 1 , 503 , 388 ) +label_testInGate.AddCoord( 2 , 505 , 5 ) +label_testInGate.AddCoord( 3 , 1149 , 5 ) +label_testInGate.AddCoord( 4 , 1150 , 219 ) -# Creation of intermediate Output variables and of Loop Links control_div2OutGate = control_div2.Port( 'OutGate' ) label_beginInGate = GraphSyrControlGUI.Link( control_div2OutGate , label_begin.Port( 'InGate' ) ) +label_beginInGate.AddCoord( 1 , 34 , 332 ) +label_beginInGate.AddCoord( 2 , 34 , 592 ) +label_beginInGate.AddCoord( 3 , 1145 , 586 ) +label_beginInGate.AddCoord( 4 , 1144 , 527 ) # Creation of Input datas label_beginNB = label_begin.Input( 'NB' , 7) @@ -202,12 +208,3 @@ label_beginKB = label_begin.Input( 'KB' , 0) # Creation of Output variables label_testFinished = label_test.Port( 'Finished' ) - -GraphSyrControlGUI.Run( 7 ) - -GraphSyrControlGUI.DoneW() - -GraphSyrControlGUI.State() - -GraphSyrControlGUI.PrintPorts() - diff --git a/examples/GraphSyrControlGUI.xml b/examples/GraphSyrControlGUI.xml index 3acb92f..14986c9 100644 --- a/examples/GraphSyrControlGUI.xml +++ b/examples/GraphSyrControlGUI.xml @@ -20,10 +20,10 @@ long label_test\Finished - + 11/3/2003 - 18:28:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 1.04 JR ? @@ -47,16 +47,16 @@ long BoolEven - + - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? localhost/FactoryServer C_ISEVEN from SyrComponent - 190 - 338 + 288 + 337 SyrComponent SyrComponent @@ -73,16 +73,16 @@ long BoolOne - + - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? localhost/FactoryServer C_ISONE from SyrComponent - 196 - 131 + 293 + 130 SyrComponent SyrComponent @@ -99,16 +99,16 @@ long anEvenInteger - + - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? localhost/FactoryServer C_M3P1 from SyrComponent - 621 - 29 + 761 + 19 SyrComponent SyrComponent @@ -125,16 +125,16 @@ long anInteger - + - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? localhost/FactoryServer C_DIV2 from SyrComponent - 624 - 391 + 770 + 384 SyrComponent SyrComponent @@ -151,16 +151,16 @@ long aNewCount - + - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? localhost/FactoryServer C_INCR from SyrComponent - 623 - 206 + 764 + 179 ? ? @@ -183,20 +183,20 @@ long KT - + label_begin - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? ? Python function - 7 - 216 + 58 + 189 ? ? @@ -237,7 +237,7 @@ long K - + L_OneEven @@ -256,14 +256,14 @@ - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? ? ? - 399 - 176 + 516 + 175 ? ? @@ -274,17 +274,19 @@ EndL_OneEven - + - - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + +? + + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? ? ? - 1034 - 252 + 1068 + 258 ? ? @@ -313,20 +315,20 @@ long KT - + C_NotOneIsEven - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? ? ? - 808 - 29 + 972 + 64 ? ? @@ -349,20 +351,20 @@ long KB - + control_div2 - 25/3/2003 - 17:42:48 - 25/3/2003 - 17:42:48 + 18/3/2004 - 14:22:38 + 18/3/2004 - 14:22:38 1.04 ? ? ? - 812 - 357 + 972 + 430 test_ISEVEN @@ -371,47 +373,29 @@ ValEven -385 - 358 +493 + 238 -385 - 490 +493 + 418 test_ISONE BoolOne label_test ValOne - - -385 - 328 - -385 - 283 + m3p1 anEvenInteger control_m3p1 N - - -786 - 181 - -786 - 182 + div2 anInteger control_div2 N - - -799 - 509 - -799 - 543 + incr aNewCount @@ -419,11 +403,11 @@ K -787 - 539 +954 + 494 -787 - 359 +954 + 259 incr aNewCount @@ -431,11 +415,11 @@ K -790 - 211 +955 + 128 -790 - 358 +954 + 258 label_begin NT @@ -443,29 +427,17 @@ anInteger -175 - 283 +275 + 211 -175 - 368 +275 + 270 label_begin NT label_test NT - - -367 - 388 - -367 - 319 - -175 - 321 - -175 - 368 + label_begin NT @@ -473,11 +445,11 @@ anInteger -183 - 486 +274 + 417 -183 - 368 +275 + 270 label_begin KT @@ -485,23 +457,17 @@ KT -373 - 418 +476 + 294 -373 - 518 +475 + 515 -176 - 519 +260 + 515 -176 - 398 - -label_test - Default - EndL_OneEven - Default - +260 + 298 label_test Incr @@ -509,11 +475,11 @@ InGate -578 - 328 +712 + 292 -578 - 358 +711 + 238 label_test Even @@ -521,11 +487,11 @@ InGate -578 - 513 +724 + 498 -578 - 388 +723 + 268 label_test Odd @@ -533,11 +499,11 @@ InGate -565 - 151 +698 + 132 -565 - 418 +697 + 297 label_test N @@ -545,11 +511,11 @@ anOddInteger -609 - 181 +748 + 100 -609 - 448 +747 + 325 label_test N @@ -557,11 +523,11 @@ anEvenInteger -612 - 543 +746 + 463 -612 - 448 +747 + 327 label_test K @@ -569,23 +535,53 @@ aCount -594 - 358 +732 + 260 -594 - 478 +732 + 354 + +label_test + Default + EndL_OneEven + Default + control_m3p1 OutGate label_test InGate - + + +503 + 388 + +505 + 5 + +1149 + 5 + +1150 + 219 control_div2 OutGate label_begin InGate - + + +34 + 332 + +34 + 592 + +1145 + 586 + +1144 + 527 GraphSyrControlGUI diff --git a/idl/Makefile.in b/idl/Makefile.in index bf0306b..0243890 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -30,7 +30,15 @@ VPATH=.:$(srcdir):${KERNEL_ROOT_DIR}/idl/salome @COMMENCE@ IDL_FILES = \ - SUPERV.idl + SUPERV.idl \ + AddComponent.idl \ + DivComponent.idl \ + FactorialComponent.idl \ + MulComponent.idl \ + SubComponent.idl \ + SyrComponent.idl \ + SyrControlComponent.idl \ + TypesCheck.idl PY_CLIENT_IDL = $(IDL_FILES) diff --git a/src/GraphBase/DataFlowBase_XmlHandler.cxx b/src/GraphBase/DataFlowBase_XmlHandler.cxx index a891081..c0c98da 100644 --- a/src/GraphBase/DataFlowBase_XmlHandler.cxx +++ b/src/GraphBase/DataFlowBase_XmlHandler.cxx @@ -336,7 +336,7 @@ bool GraphBase::XmlHandler::endElement( const QString&, return returnfalse( this , "depth3-5" , qName ) ; break ; case 6 : - if ( qName == "DataStream-list" ) { + if ( qName == "DataStream-list" || qName == "Parameter-list" ) { if ( fieldvalue[depth] != NULLSTRING ) return returnfalse( this , "depth3-6" , qName ) ; fieldvalue[depth] = NULLSTRING ; diff --git a/src/Makefile.in b/src/Makefile.in index 2684974..ba255af 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -31,6 +31,6 @@ VPATH=.:@srcdir@ @COMMENCE@ -SUBDIRS = GraphBase GraphExecutor GraphEditor Supervision SUPERVGUI AddComponent DivComponent FactorialComponent MulComponent SubComponent SyrControlComponent SyrComponent +SUBDIRS = GraphBase GraphExecutor GraphEditor Supervision SUPERVGUI AddComponent DivComponent FactorialComponent MulComponent SubComponent SyrControlComponent SyrComponent TypesCheck @MODULE@ -- 2.39.2