Viewer.py
changeset 67 3a1b0afdaf84
parent 64 dd6f693e46a1
child 70 0e48629c1e6d
--- a/Viewer.py	Thu Aug 09 18:06:54 2007 +0200
+++ b/Viewer.py	Thu Aug 09 18:07:44 2007 +0200
@@ -832,7 +832,7 @@
                 elif self.Mode == MODE_CONTACT:
                     wx.CallAfter(self.AddNewContact, bbox)
                 elif self.Mode == MODE_COIL:
-                    wx.CallAfter(self.AddNewContact, bbox)
+                    wx.CallAfter(self.AddNewCoil, bbox)
                 elif self.Mode == MODE_POWERRAIL:
                     wx.CallAfter(self.AddNewPowerRail, bbox)
                 elif self.Mode == MODE_INITIALSTEP:
@@ -948,6 +948,7 @@
                 self.Scroll(max(0, xpos - 1), ypos)
             elif self.SelectedElement:
                 self.SelectedElement.Move(-scaling[0], 0)
+                self.SelectedElement.RefreshModel()
                 self.RefreshBuffer()
                 self.RefreshScrollBars()
                 self.Refresh()
@@ -958,6 +959,7 @@
                 self.Scroll(min(xpos + 1, xmax), ypos)
             elif self.SelectedElement:
                 self.SelectedElement.Move(scaling[0], 0)
+                self.SelectedElement.RefreshModel()
                 self.RefreshBuffer()
                 self.RefreshScrollBars()
                 self.Refresh()
@@ -968,6 +970,7 @@
                 self.Scroll(xpos, max(0, ypos - 1))
             elif self.SelectedElement:
                 self.SelectedElement.Move(0, -scaling[1])
+                self.SelectedElement.RefreshModel()
                 self.RefreshBuffer()
                 self.RefreshScrollBars()
                 self.Refresh()
@@ -978,6 +981,7 @@
                 self.Scroll(xpos, min(ypos + 1, ymax))
             elif self.SelectedElement:
                 self.SelectedElement.Move(0, scaling[1])
+                self.SelectedElement.RefreshModel()
                 self.RefreshBuffer()
                 self.RefreshScrollBars()
                 self.Refresh()
@@ -1000,10 +1004,11 @@
             block.SetPosition(bbox.x, bbox.y)
             block.SetSize(values["width"], values["height"])
             self.AddBlock(block)
-            self.Controler.AddCurrentElementEditingBlock(id)
+            self.Controler.AddCurrentElementEditingBlock(id, values["type"], values.get("name", None))
             self.RefreshBlockModel(block)
             self.RefreshBuffer()
             self.RefreshScrollBars()
+            self.Parent.RefreshEditor()
             self.Refresh()
         dialog.Destroy()
     
@@ -1114,7 +1119,7 @@
             coil.SetSize(values["width"], values["height"])
             self.AddBlock(coil)
             self.Controler.AddCurrentElementEditingCoil(id)
-            self.RefreshCoilModel(contact)
+            self.RefreshCoilModel(coil)
             self.RefreshBuffer()
             self.RefreshScrollBars()
             self.Refresh()
@@ -1492,6 +1497,7 @@
         self.Controler.RemoveCurrentElementEditingInstance(block.GetId())
         for element in elements:
             element.RefreshModel()
+        wx.CallAfter(self.Parent.RefreshEditor)
 
     def DeleteVariable(self, variable):
         connectors = variable.GetConnectors()