plcopeneditor_history: comparison dialogs/ActionBlockDialog.py

equal deleted inserted replaced

-:3f2024f30553
+:9dbb79722fbc
 #License along with this library; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 import wx
 import wx.grid
+from controls import CustomGrid
 #-------------------------------------------------------------------------------
 #                            Action Block Dialog
 #-------------------------------------------------------------------------------
 grid.SetCellEditor(row, col, editor)
 grid.SetCellRenderer(row, col, renderer)
 grid.SetReadOnly(row, col, readonly)
 grid.SetCellBackgroundColour(row, col, wx.WHITE)
+if wx.Platform == '__WXMSW__':
+grid.SetRowMinimalHeight(row, 20)
+else:
+grid.SetRowMinimalHeight(row, 28)
+grid.AutoSizeRow(row, False)
 def SetData(self, data):
 self.data = data
 def GetData(self):
 def SetCurrentIndex(self, index):
 self.CurrentIndex = index
 def AppendRow(self, row_content):
 self.data.append(row_content)
+def InsertRow(self, row_index, row_content):
+self.data.insert(row_index, row_content)
 def RemoveRow(self, row_index):
 self.data.pop(row_index)
-def MoveRow(self, row_index, move, grid):
+def MoveRow(self, row_index, move):
 new_index = max(0, min(row_index + move, len(self.data) - 1))
 if new_index != row_index:
 self.data.insert(new_index, self.data.pop(row_index))
-grid.SetGridCursor(new_index, grid.GetGridCursorCol())
+return new_index
 def Empty(self):
 self.data = []
-self.editors = []
 [ID_ACTIONBLOCKDIALOG, ID_ACTIONBLOCKDIALOGVARIABLESGRID,
 ID_ACTIONBLOCKDIALOGSTATICTEXT1, ID_ACTIONBLOCKDIALOGADDBUTTON,
 ID_ACTIONBLOCKDIALOGDELETEBUTTON, ID_ACTIONBLOCKDIALOGUPBUTTON,
 ID_ACTIONBLOCKDIALOGDOWNBUTTON,
 self.staticText1 = wx.StaticText(id=ID_ACTIONBLOCKDIALOGSTATICTEXT1,
 label=_('Actions:'), name='staticText1', parent=self,
 pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
-self.ActionsGrid = wx.grid.Grid(id=ID_ACTIONBLOCKDIALOGVARIABLESGRID,
+self.ActionsGrid = CustomGrid(id=ID_ACTIONBLOCKDIALOGVARIABLESGRID,
 name='ActionsGrid', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.VSCROLL)
 self.ActionsGrid.SetFont(wx.Font(12, 77, wx.NORMAL, wx.NORMAL, False,
 'Sans'))
 self.ActionsGrid.SetLabelFont(wx.Font(10, 77, wx.NORMAL, wx.NORMAL,
 False, 'Sans'))
 self.ActionsGrid.DisableDragGridSize()
 self.ActionsGrid.EnableScrolling(False, True)
-self.ActionsGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnActionsGridCellChange)
+if wx.VERSION >= (2, 6, 0):
+self.ActionsGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnActionsGridCellChange)
+else:
+wx.grid.EVT_GRID_CELL_CHANGE(self.ActionsGrid, self.OnActionsGridCellChange)
 self.AddButton = wx.Button(id=ID_ACTIONBLOCKDIALOGADDBUTTON, label=_('Add'),
 name='AddButton', parent=self, pos=wx.Point(0, 0),
 size=wx.DefaultSize, style=0)
-self.Bind(wx.EVT_BUTTON, self.OnAddButton, id=ID_ACTIONBLOCKDIALOGADDBUTTON)
 self.DeleteButton = wx.Button(id=ID_ACTIONBLOCKDIALOGDELETEBUTTON, label=_('Delete'),
 name='DeleteButton', parent=self, pos=wx.Point(0, 0),
 size=wx.DefaultSize, style=0)
-self.Bind(wx.EVT_BUTTON, self.OnDeleteButton, id=ID_ACTIONBLOCKDIALOGDELETEBUTTON)
 self.UpButton = wx.Button(id=ID_ACTIONBLOCKDIALOGUPBUTTON, label='^',
 name='UpButton', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(32, 32), style=0)
-self.Bind(wx.EVT_BUTTON, self.OnUpButton, id=ID_ACTIONBLOCKDIALOGUPBUTTON)
 self.DownButton = wx.Button(id=ID_ACTIONBLOCKDIALOGDOWNBUTTON, label='v',
 name='DownButton', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(32, 32), style=0)
-self.Bind(wx.EVT_BUTTON, self.OnDownButton, id=ID_ACTIONBLOCKDIALOGDOWNBUTTON)
 self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
 if wx.VERSION >= (2, 5, 0):
 self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
 else:
 self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetChildren()[0].GetSizer().GetChildren()[0].GetWindow().GetId())
 self._init_sizers()
 def __init__(self, parent):
 self._init_ctrls(parent)
-self.DefaultValue = {"Qualifier" : "N", "Duration" : "", "Type" : "Action", "Value" : "", "Indicator" : ""}
 self.Table = ActionTable(self, [], GetActionTableColnames())
 typelist = GetTypeList()
 self.TypeList = ",".join(map(_,typelist))
 self.TranslateType = dict([(_(value), value) for value in typelist])
 self.ColSizes = [60, 90, 80, 110, 80]
 self.ColAlignements = [wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT]
 self.ActionsGrid.SetTable(self.Table)
+self.ActionsGrid.SetDefaultValue({"Qualifier" : "N",
+"Duration" : "",
+"Type" : "Action",
+"Value" : "",
+"Indicator" : ""})
+self.ActionsGrid.SetButtons({"Add": self.AddButton,
+"Delete": self.DeleteButton,
+"Up": self.UpButton,
+"Down": self.DownButton})
 self.ActionsGrid.SetRowLabelSize(0)
 for col in range(self.Table.GetNumberCols()):
 attr = wx.grid.GridCellAttr()
 attr.SetAlignment(self.ColAlignements[col], wx.ALIGN_CENTRE)
 self.ActionsGrid.SetColAttr(col, attr)
 self.ActionsGrid.SetColMinimalWidth(col, self.ColSizes[col])
 self.ActionsGrid.AutoSizeColumn(col, False)
 self.Table.ResetView(self.ActionsGrid)
+self.ActionsGrid.SetFocus()
+self.ActionsGrid.RefreshButtons()
 def OnOK(self, event):
-self.ActionsGrid.SetGridCursor(0, 0)
+self.ActionsGrid.CloseEditControl()
 self.EndModal(wx.ID_OK)
-def OnAddButton(self, event):
+def OnActionsGridCellChange(self, event):
-self.Table.AppendRow(self.DefaultValue.copy())
+wx.CallAfter(self.Table.ResetView, self.ActionsGrid)
-self.Table.ResetView(self.ActionsGrid)
 event.Skip()
-def OnDeleteButton(self, event):
-row = self.ActionsGrid.GetGridCursorRow()
-self.Table.RemoveRow(row)
-self.Table.ResetView(self.ActionsGrid)
-event.Skip()
-def OnUpButton(self, event):
-row = self.ActionsGrid.GetGridCursorRow()
-self.Table.MoveRow(row, -1, self.ActionsGrid)
-self.Table.ResetView(self.ActionsGrid)
-event.Skip()
-def OnDownButton(self, event):
-row = self.ActionsGrid.GetGridCursorRow()
-self.Table.MoveRow(row, 1, self.ActionsGrid)
-self.Table.ResetView(self.ActionsGrid)
-event.Skip()
-def OnActionsGridCellChange(self, event):
-self.Table.ResetView(self.ActionsGrid)
-event.Skip()
 def SetQualifierList(self, list):
 self.QualifierList = "," + ",".join(list)
 self.DurationList = list
 def SetVariableList(self, list):
 row["Indicator"] = action["indicator"]
 else:
 row["Indicator"] = ""
 self.Table.AppendRow(row)
 self.Table.ResetView(self.ActionsGrid)
+if len(actions) > 0:
+self.ActionsGrid.SetGridCursor(0, 0)
+self.ActionsGrid.RefreshButtons()
 def GetValues(self):
 values = []
 for data in self.Table.GetData():
 action = {"qualifier" : data["Qualifier"], "value" : data["Value"]}

changeset 577	9dbb79722fbc
parent 534	d506a353b3d3
child 604	5b42b4401e6b