[Python-modules-commits] r11329 - in packages/gamera/trunk/debian (3 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Tuesday, January 26, 2010 @ 16:16:12
  Author: jwilk-guest
Revision: 11329

Fix display of classifier glyphs when adding glyphs to the classifier
(closes: #555203).

Added:
  packages/gamera/trunk/debian/patches/gui-classifier-glyphs-pane.diff
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2010-01-26 11:36:17 UTC (rev 11328)
+++ packages/gamera/trunk/debian/changelog	2010-01-26 16:16:12 UTC (rev 11329)
@@ -1,4 +1,4 @@
-gamera (3.2.3-2) UNRELEASED; urgency=low
+gamera (3.2.3-3) UNRELEASED; urgency=low
 
   * Provide detached symbols in the *-dbg package.
   * Switch to source format 3.0 (quilt).
@@ -17,8 +17,10 @@
   * The sets module is deprecated in Python 2.6. Use set objects, rather than
     sets.Set objects (updated use-system-modules.diff).
   * Fix a typo in the gamera_gui help text (gui-help-typo.diff).
+  * Fix display of classifier glyphs when adding glyphs to the classifier
+    (closes: #555203).
 
- -- Jakub Wilk <ubanus at users.sf.net>  Tue, 26 Jan 2010 12:24:45 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Tue, 26 Jan 2010 17:15:09 +0100
 
 gamera (3.2.3-1) unstable; urgency=low
 

Added: packages/gamera/trunk/debian/patches/gui-classifier-glyphs-pane.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gui-classifier-glyphs-pane.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/gui-classifier-glyphs-pane.diff	2010-01-26 16:16:12 UTC (rev 11329)
@@ -0,0 +1,28 @@
+Description: Fix display of classifier glyphs when adding glyphs to the
+  classifier.
+Origin: backport, http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1182
+Bug: http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1182
+Bug-Debian: http://bugs.debian.org/555203
+
+Index: gamera-3.2.3/gamera/gui/gamera_display.py
+===================================================================
+--- gamera-3.2.3.orig/gamera/gui/gamera_display.py	2009-09-15 16:10:49.000000000 +0200
++++ gamera-3.2.3/gamera/gui/gamera_display.py	2010-01-26 17:07:30.000000000 +0100
+@@ -1190,6 +1190,17 @@
+                added = True
+          if added and resize:
+             self.resize_grid(False)
++
++         # The following code will sort on each add.  It can be
++         # slow, however, with large classifier databases.  This
++         # could become a user-configurable option someday - MGD
++         added = False
++         for g in glyphs:
++            if not g in self.glyphs:
++               self.glyphs.add(g)
++               added = True
++         if (added or resize) and self.frame.IsShown():
++            self.sort_images()
+       finally:
+          self.EndBatch()
+          wx.EndBusyCursor()

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2010-01-26 11:36:17 UTC (rev 11328)
+++ packages/gamera/trunk/debian/patches/series	2010-01-26 16:16:12 UTC (rev 11329)
@@ -1,3 +1,4 @@
+gui-classifier-glyphs-pane.diff
 gui-help-typo.diff
 gendoc-use-wxversion.diff
 gendoc-draw-text.diff