[Pymerase-cvs-commit] pymerase/output/PyTkWidgets HelperUtil.py,1.7,1.8

[<ki...@us...>]

Update of /cvsroot/pymerase/pymerase/output/PyTkWidgets
In directory sc8-pr-cvs1:/tmp/cvs-serv21975

Modified Files:
	HelperUtil.py 
Log Message:
Added code to check if user entered data, if not, don't try to save it to the database object.


Index: HelperUtil.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/PyTkWidgets/HelperUtil.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HelperUtil.py	13 Jan 2003 20:09:51 -0000	1.7
--- HelperUtil.py	13 Jan 2003 23:35:53 -0000	1.8
***************
*** 176,180 ****
      code = []
      code.append("  def get%sEntry(self):" % (name))
!     code.append("    return int(self.%sEntry.get())" % (name))
      code.append("")
      code.append("%GET_FUNCTION%")
--- 176,184 ----
      code = []
      code.append("  def get%sEntry(self):" % (name))
!     code.append("    data = self.%sEntry.get()" % (name))
!     code.append("    if data == \"\":")
!     code.append("      return None")
!     code.append("    else:")
!     code.append("      return int(data)") 
      code.append("")
      code.append("%GET_FUNCTION%")
***************
*** 186,190 ****
      code = []
      code.append("  def get%sEntry(self):" % (name))
!     code.append("    return float(self.%sEntry.get())" % (name))
      code.append("")
      code.append("%GET_FUNCTION%")
--- 190,198 ----
      code = []
      code.append("  def get%sEntry(self):" % (name))
!     code.append("    data = self.%sEntry.get()" % (name))
!     code.append("    if data == \"\":")
!     code.append("      return None")
!     code.append("    else:")
!     code.append("      return float(data)")
      code.append("")
      code.append("%GET_FUNCTION%")
***************
*** 207,211 ****
      code = []
      #FIXME: should uses getGetterName and getSetterName functions instead
!     code.append("    obj.set%s(self.get%sEntry())" % (name,name))
      code.append("%SAVE_FUNCTION%")
  
--- 215,220 ----
      code = []
      #FIXME: should uses getGetterName and getSetterName functions instead
!     code.append("    if self.get%sEntry() is not None:" % (name))
!     code.append("      obj.set%s(self.get%sEntry())" % (name,name))
      code.append("%SAVE_FUNCTION%")
  
***************
*** 248,252 ****
      code = []
      code.append("  def get%sText(self):" % (name))
!     code.append("    return self.%sText.get(0.0, Tkinter.END)" % (name))
      code.append("")
      code.append("%GET_FUNCTION%")
--- 257,265 ----
      code = []
      code.append("  def get%sText(self):" % (name))
!     code.append("    data = self.%sText.get(0.0, Tkinter.END)" % (name))
!     code.append("    if data == \"\":")
!     code.append("      return None")
!     code.append("    else:")
!     code.append("      return data")
      code.append("")
      code.append("%GET_FUNCTION%")
***************
*** 269,273 ****
      code = []
      #FIXME: should uses getGetterName and getSetterName functions instead
!     code.append("    obj.set%s(self.get%sText())" % (name, name))
      code.append("%SAVE_FUNCTION%")
  
--- 282,287 ----
      code = []
      #FIXME: should uses getGetterName and getSetterName functions instead
!     code.append("    if self.get%sText() is not None:" % (name))
!     code.append("      obj.set%s(self.get%sText())" % (name, name))
      code.append("%SAVE_FUNCTION%")
  
***************
*** 344,347 ****
--- 358,362 ----
  
      return string.join(code, '\n')
+ 
  
    def makeLoadRadioBoolean(self, name):