/[ascend]/branches/adrian/pygtk/studyreporter.py
ViewVC logotype

Diff of /branches/adrian/pygtk/studyreporter.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3075 by adrian, Wed Aug 5 13:41:10 2015 UTC revision 3076 by adrian, Wed Aug 19 13:34:55 2015 UTC
# Line 117  class StudyReporter(PythonSolverReporter Line 117  class StudyReporter(PythonSolverReporter
117              return True              return True
118    
119          return False          return False
120        
121        def report_observed(self, data):
122            #add row in the observer tabs
123            for tabs in self.browser.observers:
124                if tabs.alive:
125                    for v in data[tabs.name]:
126                        tabs.do_add_row(v)
127    
128      def finalise(self,status):      def finalise(self,status):
129          try:          try:
130              _time = time.clock()              _time = time.clock()
# Line 128  class StudyReporter(PythonSolverReporter Line 135  class StudyReporter(PythonSolverReporter
135              if status.isConverged():              if status.isConverged():
136                  self.report_to_browser(status)                  self.report_to_browser(status)
137                  # print "Converged for %s = %s" % (self.browser.sim.getInstanceName(self.instance), self.instance.getRealValue())                  # print "Converged for %s = %s" % (self.browser.sim.getInstanceName(self.instance), self.instance.getRealValue())
                 #add row in the observer tabs  
                 for tabs in self.browser.observers:  
                     if tabs.alive:  
                         tabs.do_add_row()  
138                  if self.pointsdone == (self.nsteps):                  if self.pointsdone == (self.nsteps):
139                      self.window.response(Gtk.ResponseType.CLOSE)                      self.window.response(Gtk.ResponseType.CLOSE)
140                  return                  return
# Line 141  class StudyReporter(PythonSolverReporter Line 144  class StudyReporter(PythonSolverReporter
144                        self.instance.getRealValue())                        self.instance.getRealValue())
145                  self.allconverged = False                  self.allconverged = False
146                  self.report_to_browser(status)                  self.report_to_browser(status)
                 for tabs in self.browser.observers:  
                     if tabs.alive:  
                         tabs.do_add_row()  
147                  if self.continue_on_fail is True:                  if self.continue_on_fail is True:
148                      if self.pointsdone == self.nsteps:                      if self.pointsdone == self.nsteps:
149                          self.closebutton.set_sensitive(True)                          self.closebutton.set_sensitive(True)

Legend:
Removed from v.3075  
changed lines
  Added in v.3076

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22