pymerase-cvs-commit

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

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

Modified Files:
	HelperUtil.py 
Log Message:
Added boolean support and updated for validating Entries


Index: HelperUtil.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/PyTkWidgets/HelperUtil.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HelperUtil.py	13 Dec 2002 00:36:52 -0000	1.2
--- HelperUtil.py	20 Dec 2002 03:16:06 -0000	1.3
***************
*** 32,35 ****
--- 32,36 ----
  #
  import string
+ #from output.PyTkWidgets import ValidatingEntry
  
  class HelperUtil:
***************
*** 56,60 ****
      code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s: %s\")" % \
                  (label, label, value))
!     code.append("    self.%sLabel.grid(row=%s, column=0)" % (label, self.getRowCounter()))
      code.append("")
      code.append("%VAR_ELEMENT%")
--- 57,61 ----
      code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s: %s\")" % \
                  (label, label, value))
!     code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (label, self.getRowCounter()))
      code.append("")
      code.append("%VAR_ELEMENT%")
***************
*** 73,79 ****
      code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
                  (name, labelText))
!     code.append("    self.%sLabel.grid(row=%s, column=0)" % (name, counter))
      code.append("    self.%sEntry = Tkinter.Entry(self.parent)" % (name))
!     code.append("    self.%sEntry.grid(row=%s, column=1)" % (name, counter))
      code.append("")
      code.append("%VAR_ELEMENT%")
--- 74,138 ----
      code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
                  (name, labelText))
!     code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = Tkinter.Entry(self.parent)" % (name))
!     code.append("    self.%sEntry.grid(row=%s, column=1, sticky=Tkinter.W)" % (name, counter))
!     code.append("")
!     code.append("%VAR_ELEMENT%")
! 
!     return string.join(code, '\n')
! 
!   def makeLabelIntegerEntry(self, name, labelText):
!     """
!     Creates the code for generating a Label & Entry pair and returns the code
!     """
!     
!     counter = self.getRowCounter()
! 
!     code = []
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
!     code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
!     code.append("    self.%sEntry = ValidatingEntry.IntegerEntry(self.parent)" % (name))
!     code.append("    self.%sEntry.grid(row=%s, column=1, sticky=Tkinter.W)" % (name, counter))
!     code.append("")
!     code.append("%VAR_ELEMENT%")
! 
!     return string.join(code, '\n')
! 
!   def makeLabelFloatEntry(self, name, labelText):
!     """
!     Creates the code for generating a Label & Entry pair and returns the code
!     """
!     
!     counter = self.getRowCounter()
! 
!     code = []
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
!     code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
!     code.append("    self.%sEntry = ValidatingEntry.FloatEntry(self.parent)" % (name))
!     code.append("    self.%sEntry.grid(row=%s, column=1, sticky=Tkinter.W)" % (name, counter))
!     code.append("")
!     code.append("%VAR_ELEMENT%")
! 
!     return string.join(code, '\n')
! 
!   def makeLabelMaxLengthEntry(self, name, labelText, max=None):
!     """
!     Creates the code for generating a Label & Entry pair and returns the code
!     """
!     
!     counter = self.getRowCounter()
! 
!     code = []
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
!     code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
!     code.append("    self.%sEntry = ValidatingEntry.MaxLengthEntry(self.parent,"\
!                 "maxlength=%s)" % (name, max))
!     if max is not None:
!       if max >= 1 and max <= 20:
!         code.append("    self.%sEntry['width'] = %s" % (name, max))
!     code.append("    self.%sEntry.grid(row=%s, column=1, sticky=Tkinter.W)" % (name, counter))
      code.append("")
      code.append("%VAR_ELEMENT%")
***************
*** 82,85 ****
--- 141,145 ----
  
  
+ 
    def makeGetLabelEntry(self, name):
  
***************
*** 105,108 ****
--- 165,176 ----
  
  
+ 
+ 
+ 
+   
+ 
+ 
+ 
+ 
    def makeLabelText(self, name, labelText):
      """
***************
*** 113,119 ****
      code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
                  (name, labelText))
!     code.append("    self.%sLabel.grid(row=%s, column=0)" % (name, self.getRowCounter()))
      code.append("    self.%sText = Tkinter.Text(self.parent, width=40, height=5)" % (name))
!     code.append("    self.%sText.grid(row=%s, column=0)" % (name, self.getRowCounter()))
      code.append("")
      code.append("%VAR_ELEMENT%")
--- 181,187 ----
      code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
                  (name, labelText))
!     code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, self.getRowCounter()))
      code.append("    self.%sText = Tkinter.Text(self.parent, width=40, height=5)" % (name))
!     code.append("    self.%sText.grid(row=%s, column=0, sticky=Tkinter.W)" % (name, self.getRowCounter()))
      code.append("")
      code.append("%VAR_ELEMENT%")
***************
*** 144,145 ****
--- 212,265 ----
      return string.join(code, '\n')
      
+ 
+   def makeRadioBoolean(self, name, labelText):
+     """
+     Creates the code for generating a True/False Radiobutton pair and returns the code
+     """
+     
+     counter = self.getRowCounter()
+ 
+     code = []
+     code.append("    self.%sFrame = Tkinter.Frame(self.parent)" % (name))
+     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
+                 (name, labelText))
+     code.append("    self.%sBooleanVar = Tkinter.IntVar()" % (name))
+ 
+     code.append("    self.%sRadioTrue = Tkinter.Radiobutton(self.%sFrame," \
+                 "text=\"True\", variable=self.%sBooleanVar, value=1)" % (name, name, name))
+     
+     code.append("    self.%sRadioFalse = Tkinter.Radiobutton(self.%sFrame," \
+                 "text=\"False\", variable=self.%sBooleanVar, value=0)" % (name, name, name))
+ 
+     code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
+     code.append("    self.%sRadioTrue.grid(row=0, column=0)" % (name))
+     code.append("    self.%sRadioFalse.grid(row=0, column=1)" % (name))
+     code.append("    self.%sFrame.grid(row=%s, column=1, sticky=Tkinter.W)" % (name, counter))
+     code.append("")
+     code.append("%VAR_ELEMENT%")
+ 
+     return string.join(code, '\n')
+ 
+ 
+   def makeGetRadioBoolean(self, name):
+ 
+     code = []
+     code.append("  def get%sRadioBoolean(self):" % (name))
+     code.append("    return self.%sBooleanVar.get()" % (name))
+     code.append("")
+     code.append("%GET_FUNCTION%")
+ 
+     return string.join(code, '\n')
+ 
+ 
+   def makeSetRadioBoolean(self, name):
+ 
+     code = []
+     code.append("  def set%sRadioBoolean(self, num):" % (name))
+     code.append("    self.%sBooleanVar.set(num)" % (name))
+     code.append("")
+     code.append("%SET_FUNCTION%")
+ 
+     return string.join(code, '\n')
+ 
+