gnue/gnuef/src GFForm.py UIwxpython.py

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/10/20 17:29:23

Modified files:
        gnuef/src      : GFForm.py UIwxpython.py 

Log message:
        less buggy visibleCount support in widgets

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.21&r2=1.22
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.14&r2=1.15

Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.21 gnue/gnuef/src/GFForm.py:1.22
--- gnue/gnuef/src/GFForm.py:1.21       Thu Oct 19 22:56:51 2000
+++ gnue/gnuef/src/GFForm.py    Fri Oct 20 17:29:23 2000
@@ -186,11 +186,14 @@
   def nextRecord(self, event):
     self.dispatchEvent(GFEvent('uiNEXTRECORD',self.currentEntry))
     self.dispatchEvent(GFEvent('nextRECORD',self.currentBlock))
+    self.dispatchEvent(GFEvent('gotoENTRY',self.currentEntry));
 
+
   def prevRecord(self, event):
     self.dispatchEvent(GFEvent('uiPREVRECORD',self.currentEntry))
     self.dispatchEvent(GFEvent('prevRECORD',self.currentBlock))
-  
+    self.dispatchEvent(GFEvent('gotoENTRY',self.currentEntry));
+
   def newRecord(self, event):
     if not self.__dict__.has_key('readonly'):
       self.dispatchEvent(GFEvent('newRECORD',self.currentBlock))
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.14 gnue/gnuef/src/UIwxpython.py:1.15
--- gnue/gnuef/src/UIwxpython.py:1.14   Thu Oct 19 22:56:51 2000
+++ gnue/gnuef/src/UIwxpython.py        Fri Oct 20 17:29:23 2000
@@ -70,8 +70,6 @@
                            'uiPREVRECORD' : self.adjustMultiView
                           }
 
-    # self.activeIndex = 0
-
     # Create the UI from the GFForm passed in
     self.buildUI()
 
@@ -91,11 +89,6 @@
     # This is needed to keep wxApp happy
     # don't put code in here, put it in onInit()
     return true
-
-#  def nextPage(self):
-#    self.pageList[0].Show(FALSE)
-#    self.pageList.append(self.pageList.pop(0)) # Rotates the pages
-#    self.pageList[0].Show(TRUE)
     
   #
   # Event handlers
@@ -103,6 +96,9 @@
   # Methods called to deal with incomming events
   #
   def adjustMultiView(self, event):
+    if event.data.block == event.data.block.form.currentBlock:
+      return
+  
     block = event.data.block.form.currentBlock
 
     if event.getEvent() == 'uiPREVRECORD':
@@ -122,9 +118,11 @@
       index = index + adjustment
 
       if index < 0 : index = 0
-      
-      if index >= entry.visibleCount :
-        index = entry.visibleCount -1
+
+      print "index pre             ", index
+      if index >= int(entry.visibleCount):
+        index = int(entry.visibleCount)-1
+      print "index post            ", index
 
       lowestVisible = currentRecord - index
       if lowestVisible < 0 : lowestVisible = 0
@@ -137,7 +135,7 @@
 
       self.formToUI[entry][1] = index
 
-      print "adjusted active index ", self.formToUI[entry][1]
+      print "adjusted entity index ", self.formToUI[entry][1]
       
   def switchFocus(self, event):
     index = self.formToUI[event.data][1]
@@ -150,33 +148,36 @@
 
     index = self.formToUI[event.data][1]
     
-    block = event.data.block.form.currentBlock
+    block = event.data.block # .form.currentBlock
     currentRecord = block.currentRecord
 
+    # Fill the prior spots 
+    for count in range(index):
+      
self.formToUI[event.data][0][count].SetValue(block.dataSourceLink.getField(currentRecord-(index-count),event.data.field))
+
     # fill currently indexed spot
     print "Filling index ", index
     self.formToUI[event.data][0][index].SetValue(event.data.getValue())
     
self.formToUI[event.data][0][index].SetInsertionPoint(event.data.cursorPosition)
-    
 
-    # Fill the prior spots 
-    for count in range(index):
-      
self.formToUI[event.data][0][index-count].SetValue(block.dataSourceLink.getField(currentRecord-count,event.data.field))
-
-    print "Record Count: ",block.recordCount
-    print "CurrentRecord: ",currentRecord
-    for count in range(index+1,int(event.data.visibleCount)):
-      print "Filler index ", count , " current record ", currentRecord+count
-      if count > block.recordCount:
+    # Fill trailing spots
+    count = index
+    while count < int(event.data.visibleCount):
+      if currentRecord+(count-index) > block.recordCount:
         value = ""
       else:
-        value = 
block.dataSourceLink.getField(currentRecord+count,event.data.field)
-        
+        value = 
block.dataSourceLink.getField(currentRecord+(count-index),event.data.field)
       self.formToUI[event.data][0][count].SetValue(value)
-
-        
+      count = count +1   
+      
+#    for count in range(index+1,int(event.data.visibleCount)-1):
+#      print "in %i   cr %i " % (count, currentRecord+(count-index)) 
+#      if count > block.recordCount:
+#        value = ""
+#      else:
+#        value = 
block.dataSourceLink.getField(currentRecord+(count-index),event.data.field)     
   
+#      self.formToUI[event.data][0][count].SetValue(value)
         
-    
   def gotoPage(self, event):
     index = self.formToUI[event.data][1]
     self.visiblePage.Show(FALSE)