gnue/designer setup.py src/DataSourceEditor.py ...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/17 18:42:23

Modified files:
        designer       : setup.py 
        designer/src   : DataSourceEditor.py EventEditor.py 
                         TriggerEditor.py 
        designer/src/reports: Instance.py 

Log message:
        * Enable auto-selection of the trigger in the code editor when a 
trigger in the Event Mapper is selected
        * Cleanup to get reports module working again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/setup.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/DataSourceEditor.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/EventEditor.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/TriggerEditor.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Instance.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/designer/setup.py
diff -c gnue/designer/setup.py:1.39 gnue/designer/setup.py:1.40
*** gnue/designer/setup.py:1.39 Fri Dec 13 11:58:26 2002
--- gnue/designer/setup.py      Tue Dec 17 18:42:23 2002
***************
*** 254,259 ****
--- 254,261 ----
                     "gnue.designer.navigator",
                     "gnue.designer.navigator.wizards",
                     "gnue.designer.reports",
+                    "gnue.designer.reports.Standard",
+                    "gnue.designer.reports.Labels",
                     "gnue.designer.reports.wizards",
                     "gnue.designer.schema",
                     "gnue.designer.schema.DiaEditor",
Index: gnue/designer/src/DataSourceEditor.py
diff -c gnue/designer/src/DataSourceEditor.py:1.27 
gnue/designer/src/DataSourceEditor.py:1.28
*** gnue/designer/src/DataSourceEditor.py:1.27  Mon Nov 25 00:41:41 2002
--- gnue/designer/src/DataSourceEditor.py       Tue Dec 17 18:42:23 2002
***************
*** 131,137 ****
  
    def inventoryObject(self, object):
      if isinstance(object, GDataSource.GDataSource):
!       if hasattr(object,'master') and len(object.master):
          try:
            object.__master = self.datasourceMap[string.lower(object.master)]
          except KeyError:
--- 131,137 ----
  
    def inventoryObject(self, object):
      if isinstance(object, GDataSource.GDataSource):
!       if hasattr(object,'master') and object.master:
          try:
            object.__master = self.datasourceMap[string.lower(object.master)]
          except KeyError:
***************
*** 170,176 ****
  
      elif isinstance(object,GDataSource.GDataSource) and \
         hasattr(object,'master') and \
!        len(object.master):
  
        ds = self.datasourceMap[string.lower(object.master)]
  
--- 170,176 ----
  
      elif isinstance(object,GDataSource.GDataSource) and \
         hasattr(object,'master') and \
!        object.master:
  
        ds = self.datasourceMap[string.lower(object.master)]
  
Index: gnue/designer/src/EventEditor.py
diff -c gnue/designer/src/EventEditor.py:1.7 
gnue/designer/src/EventEditor.py:1.8
*** gnue/designer/src/EventEditor.py:1.7        Sun Dec 15 17:22:41 2002
--- gnue/designer/src/EventEditor.py    Tue Dec 17 18:42:23 2002
***************
*** 48,53 ****
--- 48,55 ----
      self.object = None
      self.objectList = []
      self.objectMap = {}
+     self.triggerMap = {}
+     self.rowList = []
  
      # Set up our grid
      self.grid = wxGrid(self.panel, -1, pos=wxPoint(0,0))
***************
*** 56,61 ****
--- 58,64 ----
  
      self.namedMap = {}
  
+     EVT_GRID_SELECT_CELL(self.grid, self.OnCellSelected)
      EVT_GRID_CELL_CHANGE(self.grid, self.OnCellChange)
      EVT_GRID_CELL_LEFT_DCLICK(self.grid, self.OnLeftDClick)
      EVT_SIZE(self, self.onSize)
***************
*** 78,145 ****
        self._setCurrent(object)
  
    def _setCurrent(self, object):
!       try:
!         text  = "%s Triggers (%s)" % 
(object._type[2:].capitalize(),object.name)
!       except:
!         text = object.getDescription()
!       self.setHeaderText(text)
  
!       self.object = object
!       try:
!         self.triggerList = object._validTriggers
!       except AttributeError:
!         self.triggerList = {}
  
!       # Speed up the process by not refreshing the grid yet
!       self.grid.BeginBatch()
  
!       # Delete any old rows from a previous object
!       nr = self.grid.GetNumberRows()
!       if nr:
!         self.grid.DeleteRows(0,nr)
  
  
!       self.rowList = self.triggerList.keys()
!       self.rowList.sort()
  
!       # Create the number of rows we'll need
!       self.grid.InsertRows(0,len(self.rowList))
  
!       self.triggerTypes = {'':_('(None)'),
                             '(Custom Trigger)':_('(Custom Trigger)')}
!       self.triggerMap = {}
  
!       for name in self.namedMap.keys():
!         self.triggerTypes[name] = name + ' (named)'
  
-       mappedTriggers = {}
-       for child in object._children:
-         if isinstance(child, GTrigger):
-           if hasattr(child,'src') and child.src:
-             mappedTriggers[child.type.upper()] = child.src
-           else:
-             mappedTriggers[child.type.upper()] = '(Custom Trigger)'
-           self.triggerMap[child.type.upper()] = child
- 
-       self.mappedTriggers = mappedTriggers
-       i = 0
- 
-       for key in self.rowList:
-         self.grid.SetRowLabelValue(i,self.triggerList[key])
-         self.grid.SetCellEditor(i, 0, 
EventCellEditor(self.grid,self.triggerTypes))
-         try:
-           self.grid.SetCellValue(i,0, "%s" % mappedTriggers[key])
-         except KeyError:
-           self.grid.SetCellValue(i,0, "%s" % '')
-         i += 1
  
  
!       # Redraw the grid
!       self.grid.EndBatch()
        try:
!         self.grid.ForceRefresh()  # Added in 2.3.1
!       except AttributeError:
!         pass
  
  
    def onCreateObject (self, event):
--- 81,164 ----
        self._setCurrent(object)
  
    def _setCurrent(self, object):
!     try:
!       text  = "%s Triggers (%s)" % (object._type[2:].capitalize(),object.name)
!     except:
!       text = object.getDescription()
!     self.setHeaderText(text)
  
!     self.object = object
!     try:
!       self.triggerList = object._validTriggers
!     except AttributeError:
!       self.triggerList = {}
  
!     # Speed up the process by not refreshing the grid yet
!     self.grid.BeginBatch()
  
!     # Delete any old rows from a previous object
!     nr = self.grid.GetNumberRows()
!     if nr:
!       self.grid.DeleteRows(0,nr)
  
  
!     self.rowList = self.triggerList.keys()
!     self.rowList.sort()
  
!     # Create the number of rows we'll need
!     self.grid.InsertRows(0,len(self.rowList))
  
!     self.triggerTypes = {'':_('(None)'),
                             '(Custom Trigger)':_('(Custom Trigger)')}
!     self.triggerMap = {}
  
!     for name in self.namedMap.keys():
!       self.triggerTypes[name] = name + ' (named)'
! 
!     mappedTriggers = {}
!     for child in object._children:
!       if isinstance(child, GTrigger):
!         if hasattr(child,'src') and child.src:
!           mappedTriggers[child.type.upper()] = child.src
!         else:
!           mappedTriggers[child.type.upper()] = '(Custom Trigger)'
!         self.triggerMap[child.type.upper()] = child
! 
!     self.mappedTriggers = mappedTriggers
!     i = 0
  
  
  
!     for key in self.rowList:
!       self.grid.SetRowLabelValue(i,self.triggerList[key])
!       self.grid.SetCellEditor(i, 0, 
EventCellEditor(self.grid,self.triggerTypes))
        try:
!         self.grid.SetCellValue(i,0, "%s" % mappedTriggers[key])
!       except KeyError:
!         self.grid.SetCellValue(i,0, "%s" % '')
!       i += 1
! 
! 
!     # Redraw the grid
!     self.grid.EndBatch()
!     try:
!       self.grid.ForceRefresh()  # Added in 2.3.1
!     except AttributeError:
!       pass
! 
!     #
!     # If the first cell has a trigger, select it
!     #
!     try:
!       trigger=self.triggerMap[self.rowList[0]]
!       if trigger.src:
!         
self.dispatchEvent('TriggerSelected',object=self.namedMap[trigger.src], 
originator=__name__)
!       else:
!         self.dispatchEvent('TriggerSelected',object=trigger, 
originator=__name__)
!     except KeyError:
!       pass
!     except IndexError:
!       pass
  
  
    def onCreateObject (self, event):
***************
*** 190,197 ****
      except AttributeError:
        pass
  
- 
- 
    # Force a grid cell into Edit mode when Double-Clicked
    def OnLeftDClick(self,evt):
      if self.grid.CanEnableCellControl():
--- 209,214 ----
***************
*** 204,209 ****
--- 221,242 ----
      return name
  
  
+   # Fire a TriggerSelected event
+   def OnCellSelected(self,evt):
+     try:
+       trigger=self.triggerMap[self.rowList[evt.GetRow()]]
+       if trigger.src:
+         
self.dispatchEvent('TriggerSelected',object=self.namedMap[trigger.src], 
originator=__name__)
+       else:
+         self.dispatchEvent('TriggerSelected',object=trigger, 
originator=__name__)
+     except KeyError:
+       pass
+     except IndexError:
+       pass
+ 
+     evt.Skip()
+ 
+ 
    def OnCellChange(self, evt):
      attr = self.rowList[evt.GetRow()]
      value = self.grid.GetCellValue(evt.GetRow(), evt.GetCol())
***************
*** 270,276 ****
          self.dispatchEvent('TriggerSelected',object=trigger, 
originator=__name__)
      else:
        # No trigger
!       self.object._children.pop(self.object._children.index(trigger))
        self.dispatchEvent('ObjectDeleted',object=trigger, originator=__name__)
        self.dispatchEvent('TriggerSelected',object=None, originator=__name__)
  
--- 303,309 ----
          self.dispatchEvent('TriggerSelected',object=trigger, 
originator=__name__)
      else:
        # No trigger
! ##      self.object._children.pop(self.object._children.index(trigger))
        self.dispatchEvent('ObjectDeleted',object=trigger, originator=__name__)
        self.dispatchEvent('TriggerSelected',object=None, originator=__name__)
  
Index: gnue/designer/src/TriggerEditor.py
diff -c gnue/designer/src/TriggerEditor.py:1.26 
gnue/designer/src/TriggerEditor.py:1.27
*** gnue/designer/src/TriggerEditor.py:1.26     Wed Dec  4 19:45:17 2002
--- gnue/designer/src/TriggerEditor.py  Tue Dec 17 18:42:23 2002
***************
*** 255,261 ****
  
      if isinstance(object, GTrigger.GTrigger) and not object.src:
        del self.triggerMap[self._generateName(object)]
!       self.refilTriggerCombo()
  
  
  try:
--- 255,261 ----
  
      if isinstance(object, GTrigger.GTrigger) and not object.src:
        del self.triggerMap[self._generateName(object)]
!       self.refillTriggerCombo()
  
  
  try:
Index: gnue/designer/src/reports/Instance.py
diff -c gnue/designer/src/reports/Instance.py:1.6 
gnue/designer/src/reports/Instance.py:1.7
*** gnue/designer/src/reports/Instance.py:1.6   Tue Dec 17 17:39:12 2002
--- gnue/designer/src/reports/Instance.py       Tue Dec 17 18:42:23 2002
***************
*** 41,47 ****
  from gnue.designer.TriggerEditor import TriggerEditor
  from gnue.designer.EventEditor import EventEditor
  
! from gnue.reports import GRReport, GRParser, GRLayout
  
  
  class Instance(BaseInstance):
--- 41,48 ----
  from gnue.designer.TriggerEditor import TriggerEditor
  from gnue.designer.EventEditor import EventEditor
  
! 
! from gnue.reports import GRReport, GRParser, GRLayout, GRSources, GRParameters
  
  
  class Instance(BaseInstance):
***************
*** 72,85 ****
      GRParameters.GRParameters(report)._buildObject()
      GRLayout.GRLayout(report)._buildObject()
  
!     self.__initStandard(
      report._buildObject()
      return report
  
  
    # TODO: This needs to somehow pull from gnue.designer.reports.(Standard)
    def __initStandard(self, report):
!     report._layout._xmlchildnamespace = self.filter =  'GNUe:Reports:Standard'
      return report
  
  
--- 73,86 ----
      GRParameters.GRParameters(report)._buildObject()
      GRLayout.GRLayout(report)._buildObject()
  
!     self.__initStandard(report)
      report._buildObject()
      return report
  
  
    # TODO: This needs to somehow pull from gnue.designer.reports.(Standard)
    def __initStandard(self, report):
!     report.findChildOfType('GRLayout')._xmlchildnamespace = self.filter =  
'GNUe:Reports:Standard'
      return report