/[ascend]/trunk/pygtk/modelview.py
ViewVC logotype

Diff of /trunk/pygtk/modelview.py

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

revision 774 by johnpye, Fri Jul 14 08:01:48 2006 UTC revision 792 by johnpye, Thu Jul 27 14:07:13 2006 UTC
# Line 186  class ModelView: Line 186  class ModelView:
186                  _e.setValue()                  _e.setValue()
187                  _e.exportPreferredUnits(self.browser.prefs)                  _e.exportPreferredUnits(self.browser.prefs)
188              except InputError, e:              except InputError, e:
189                  self.reporter.reportError(str(e))                  self.browser.reporter.reportError(str(e))
190                  return;                  return;
191    
192          else:          else:
# Line 197  class ModelView: Line 197  class ModelView:
197                  elif _lower.startswith("f") or _lower.startswith("n") or _lower.strip()=="0":                  elif _lower.startswith("f") or _lower.startswith("n") or _lower.strip()=="0":
198                      newtext = 0                      newtext = 0
199                  else:                  else:
200                      self.reporter.reportError("Invalid entry for a boolean variable: '%s'" % newtext)                      self.browser.reporter.reportError("Invalid entry for a boolean variable: '%s'" % newtext)
201                      return                      return
202                  _val = bool(newtext);                  _val = bool(newtext);
203                  if _val == _instance.getValue():                  if _val == _instance.getValue():
204                      self.reporter.reportNote("Boolean atom '%s' was not altered" % _instance.getName())                      self.browser.reporter.reportNote("Boolean atom '%s' was not altered" % _instance.getName())
205                      return                      return
206                  _instance.setBoolValue(_val)                  _instance.setBoolValue(_val)
207    
208              elif _instance.isInt():              elif _instance.isInt():
209                  _val = int(newtext)                  _val = int(newtext)
210                  if _val == _instance.getValue():                  if _val == _instance.getValue():
211                      self.reporter.reportNote("Integer atom '%s' was not altered" % _instance.getName())                      self.browser.reporter.reportNote("Integer atom '%s' was not altered" % _instance.getName())
212                      return                      return
213                  _instance.setIntValue(_val)                  _instance.setIntValue(_val)
214              else:              else:
215                  self.reporter.reportError("Attempt to set a non-real, non-boolean, non-integer value!")                  self.browser.reporter.reportError("Attempt to set a non-real, non-boolean, non-integer value!")
216                  return                  return
217    
218          # now that the variable is set, update the GUI and re-solve if desired          # now that the variable is set, update the GUI and re-solve if desired
# Line 232  class ModelView: Line 232  class ModelView:
232                  _piter = self.make_row(piter,_name,child)                  _piter = self.make_row(piter,_name,child)
233                  _path = self.modelstore.get_path(_piter)                  _path = self.modelstore.get_path(_piter)
234                  self.otank[_path]=(_name,child)                  self.otank[_path]=(_name,child)
235                  #self.reporter.reportError("2 Added %s at path %s" % (_name,repr(_path)))                  #self.browser.reporter.reportError("2 Added %s at path %s" % (_name,repr(_path)))
236    
237      def make(self, name=None, value=None, path=None, depth=1):      def make(self, name=None, value=None, path=None, depth=1):
238          if path is None:          if path is None:
# Line 240  class ModelView: Line 240  class ModelView:
240              piter = self.make_row( None, name, value )              piter = self.make_row( None, name, value )
241              path = self.modelstore.get_path( piter )              path = self.modelstore.get_path( piter )
242              self.otank[ path ] = (name, value)              self.otank[ path ] = (name, value)
243              #self.reporter.reportError("4 Added %s at path %s" % (name, path))              #self.browser.reporter.reportError("4 Added %s at path %s" % (name, path))
244          else:          else:
245              name, value = self.otank[ path ]              name, value = self.otank[ path ]
246    
# Line 283  class ModelView: Line 283  class ModelView:
283              return              return
284    
285          _canpop = False;          _canpop = False;
286          # self.reporter.reportError("Right click on %s" % self.otank[_path][0])          # self.browser.reporter.reportError("Right click on %s" % self.otank[_path][0])
287          _instance = self.otank[_path][1]          _instance = self.otank[_path][1]
288          if _instance.getType().isRefinedSolverVar():          if _instance.getType().isRefinedSolverVar():
289              _canpop = True              _canpop = True
Legend:
Removed from v.774  
changed lines
  Added in v.792
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22