gnue common/src/GTrigger.py navigator/src/UIwxp...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/24 00:35:49

Modified files:
        common/src     : GTrigger.py 
        navigator/src  : UIwxpython.py 

Log message:
        fixed runForm support in Navigator

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GTrigger.py.diff?cvsroot=OldCVS&tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/navigator/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.18 gnue/common/src/GTrigger.py:1.19
*** gnue/common/src/GTrigger.py:1.18    Mon Sep 23 11:52:37 2002
--- gnue/common/src/GTrigger.py Tue Sep 24 00:35:49 2002
***************
*** 205,212 ****
      else:
  #      GDebug.printMesg(1,"AttributeError: %s" % name)
  #      print self.__dict__
!       raise AttributeError
!           
    #
    # __str__
    #
--- 205,212 ----
      else:
  #      GDebug.printMesg(1,"AttributeError: %s" % name)
  #      print self.__dict__
!       raise AttributeError, '%s' % (name)
! 
    #
    # __str__
    #
Index: gnue/navigator/src/UIwxpython.py
diff -c gnue/navigator/src/UIwxpython.py:1.20 
gnue/navigator/src/UIwxpython.py:1.21
*** gnue/navigator/src/UIwxpython.py:1.20       Tue Sep 17 11:27:45 2002
--- gnue/navigator/src/UIwxpython.py    Tue Sep 24 00:35:49 2002
***************
*** 78,85 ****
  
      self.menu = MenuBar(self)
      self.frame.SetMenuBar(self.menu)
!     
!     EVT_MENU (self.frame, ID_EXIT, self.OnClose)        
      EVT_MENU (self.frame, ID_ABOUT, self.OnAbout)        
  
      self.splitter= wxSplitterWindow(self.frame,-1)
--- 78,85 ----
  
      self.menu = MenuBar(self)
      self.frame.SetMenuBar(self.menu)
! 
!     EVT_MENU (self.frame, ID_EXIT, self.OnClose)
      EVT_MENU (self.frame, ID_ABOUT, self.OnAbout)        
  
      self.splitter= wxSplitterWindow(self.frame,-1)
***************
*** 207,225 ****
    def handleError(self, mesg):
      dlg = wxMessageDialog(self.frame, "Error: %s!" % mesg, \
                            "Error", \
!                           wxOK)  
      dlg.ShowModal()
!     
      dlg.Destroy()
!     
      # print mesg
  
  
!   def runForm(self, step):
      # This is the code executing in the new thread. Simulation of
      # a long process (well, 10s here) as a simple loop - you will
      # need to structure your processing so that you periodically
      # peek at the abort variable
      if os.path.basename(step.location) == step.location:
        try:
          formdir = gConfigNav('FormDir')
--- 207,230 ----
    def handleError(self, mesg):
      dlg = wxMessageDialog(self.frame, "Error: %s!" % mesg, \
                            "Error", \
!                           wxOK)
      dlg.ShowModal()
! 
      dlg.Destroy()
! 
      # print mesg
  
+   def runFormAsTrigger(self, form, parameters = {})
+     self._runForm(form)
  
!   def runForm(self, step, parameters = {}):
      # This is the code executing in the new thread. Simulation of
      # a long process (well, 10s here) as a simple loop - you will
      # need to structure your processing so that you periodically
      # peek at the abort variable
+ 
+     # TODO: Pass parameters
+ 
      if os.path.basename(step.location) == step.location:
        try:
          formdir = gConfigNav('FormDir')
***************
*** 229,235 ****
      else:
        formfile = step.location
  
! # this was stray??     return
  
      try:
        #
--- 234,243 ----
      else:
        formfile = step.location
  
!     self._runForm(formfile)
! 
! 
!   def _runForm(self, formfile):
  
      try:
        #