# HG changeset patch
# User lbessard
# Date 1190026080 -7200
# Node ID 2bff00eb6cd0e7a9aff6eba0210f0e520057591f
# Parent  1608a434fb8c4800318eacea631e9def97f10682
Correct bugs on svgui plugin code generation

diff -r 1608a434fb8c -r 2bff00eb6cd0 Beremiz.py
--- a/Beremiz.py	Mon Sep 17 10:12:35 2007 +0200
+++ b/Beremiz.py	Mon Sep 17 12:48:00 2007 +0200
@@ -341,14 +341,14 @@
     def RefreshMainMenu(self):
         if self.menuBar1:
             if self.PluginRoot.HasProjectOpened():
-                self.menuBar1.EnableTop(1, True)
-                self.menuBar1.EnableTop(2, True)
+##                self.menuBar1.EnableTop(1, True)
+##                self.menuBar1.EnableTop(2, True)
                 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS2, True)
                 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS3, True)
                 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS5, True)
             else:
-                self.menuBar1.EnableTop(1, False)
-                self.menuBar1.EnableTop(2, False)
+##                self.menuBar1.EnableTop(1, False)
+##                self.menuBar1.EnableTop(2, False)
                 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS2, False)
                 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS3, False)
                 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS5, False)
diff -r 1608a434fb8c -r 2bff00eb6cd0 plugins/svgui/svgui.py
--- a/plugins/svgui/svgui.py	Mon Sep 17 10:12:35 2007 +0200
+++ b/plugins/svgui/svgui.py	Mon Sep 17 12:48:00 2007 +0200
@@ -749,12 +749,10 @@
     
     def BlockTypesFactory(self):
         def generate_svgui_block(generator, block, body, link):
-            controller = generator.GetController()
             name = block.getInstanceName()
             type = block.getTypeName()
             block_infos = self.GetBlockType(type)
-            bus_id, name = [word for word in name.split("_") if word != ""]
-            block_id = self.PlugChilds[bus_id].GetElementIdFromName(name)
+            block_id = self.GetElementIdFromName(name)
             if block_id == None:
                 raise ValueError, "No corresponding block found"
             if not generator.ComputedBlocks.get(name, False):
@@ -779,31 +777,38 @@
            [{"name" : "Container", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("Show","BOOL","none"),("Set State","BOOL","none")], 
                     "outputs" : [("Show","BOOL","none"),("State Changed","BOOL","none")],
-                    "comment" : "SVGUI Container"},
+                    "comment" : "SVGUI Container",
+                    "generate" : generate_svgui_block},
                 {"name" : "Button", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("Show","BOOL","none"),("Toggle","BOOL","none")], 
                     "outputs" : [("Visible","BOOL","none"),("State","BOOL","none")],
-                    "comment" : "SVGUI Button"},
+                    "comment" : "SVGUI Button",
+                    "generate" : generate_svgui_block},
                 {"name" : "TextCtrl", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("Text","STRING","none"),("Set Text","BOOL","none")], 
                     "outputs" : [("Text","STRING","none"),("Text Changed","BOOL","none")],
-                    "comment" : "SVGUI Text Control"},
+                    "comment" : "SVGUI Text Control",
+                    "generate" : generate_svgui_block},
                 {"name" : "ScrollBar", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("Position","UINT","none"),("Set Position","BOOL","none")], 
                     "outputs" : [("Position","UINT","none"),("Position Changed","BOOL","none")],
-                    "comment" : "SVGUI ScrollBar"},
+                    "comment" : "SVGUI ScrollBar",
+                    "generate" : generate_svgui_block},
                 {"name" : "NoteBook", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("Selected","UINT","none"),("Set Selected","BOOL","none")], 
                     "outputs" : [("Selected","UINT","none"),("Selected Changed","BOOL","none")],
-                    "comment" : "SVGUI Notebook"},
+                    "comment" : "SVGUI Notebook",
+                    "generate" : generate_svgui_block},
                 {"name" : "RotatingCtrl", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("Angle","REAL","none"),("Set Angle","BOOL","none")], 
                     "outputs" : [("Angle","REAL","none"),("Angle changed","BOOL","none")],
-                    "comment" : "SVGUI Rotating Control"},
+                    "comment" : "SVGUI Rotating Control",
+                    "generate" : generate_svgui_block},
                 {"name" : "Transform", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("X","REAL","none"),("Y","REAL","none"),("Scale X","REAL","none"),("Scale Y","REAL","none"),("Angle","REAL","none"),("Set","BOOL","none")], 
                     "outputs" : [("X","REAL","none"),("Y","REAL","none"),("Scale X","REAL","none"),("Scale Y","REAL","none"),("Angle","REAL","none"),("Changed","BOOL","none")],
-                    "comment" : "SVGUI Transform"},
+                    "comment" : "SVGUI Transform",
+                    "generate" : generate_svgui_block},
                ]}
         ]