Merge lp:~bregma/geis/geisview-class-display into lp:geis

[Stephen M. Webb]

Displays the frame's class(es) in the geisview tool.

[Jussi Pakkanen (jpakkane)]

Looking good.

review: Approve

=== modified file 'python/geis/geis_v2.py'
--- python/geis/geis_v2.py	2011-05-27 15:35:07 +0000
+++ python/geis/geis_v2.py	2011-07-01 14:44:36 +0000
@@ -121,6 +121,7 @@
     _geis_frame_attr_count = _geis_lib.geis_frame_attr_count
     _geis_frame_attr = _geis_lib.geis_frame_attr
     _geis_frame_attr.restype = ctypes.c_void_p
+    _geis_frame_is_class = _geis_lib.geis_frame_is_class
     _geis_frame_touchid_count = _geis_lib.geis_frame_touchid_count
     _geis_frame_touchid = _geis_lib.geis_frame_touchid
 
@@ -145,6 +146,10 @@
             self._attrs[attr_name] = _attr_types.get(_geis_attr_type(attr),
                                        _attr_type_unknown)(attr)
 
+    @property
+    def _as_parameter_(self):
+        return self._class
+
     def id(self):
         """ Gets the gesture class's system identifier (an integer).
         """
@@ -329,6 +334,9 @@
                                           _attr_type_unknown)(attr)
         return attr_list
 
+    def is_class(self, gclass):
+        return _geis_frame_is_class(self._frame, gclass)
+
     def touches(self):
         touch_list = []
         for i in range(_geis_frame_touchid_count(self._frame)):

=== modified file 'tools/geisview/Makefile.am'
--- tools/geisview/Makefile.am	2011-04-27 14:19:58 +0000
+++ tools/geisview/Makefile.am	2011-07-01 14:44:36 +0000
@@ -30,6 +30,7 @@
 
 geisview_PYTHON = \
 	__init__.py \
+	classview.py \
 	defaults.py \
 	deviceview.py \
 	filter_definition.py \

=== added file 'tools/geisview/classview.py'
--- tools/geisview/classview.py	1970-01-01 00:00:00 +0000
+++ tools/geisview/classview.py	2011-07-01 14:44:36 +0000
@@ -0,0 +1,53 @@
+#
+# @file geisview/gesture_classview.py
+# @brief GestureClass viewer for geisview.
+#
+# Copyright (C) 2011 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+
+class GestureClassView(gtk.Window):
+
+    def __init__(self, gesture_classes):
+        gtk.Window.__init__(self)
+        self.set_title("GEIS GestureClasss")
+        self.set_size_request(200, 200)
+
+        self._tree_store = gtk.TreeStore(str, str)
+        for (class_id, gclass) in gesture_classes.iteritems():
+            it = self._tree_store.append(None, ["%s" % gclass.id(),
+                                                "%s" % gclass.name()])
+        self._tree_view = gtk.TreeView(self._tree_store)
+#        self._tree_view.set_mode(gtk.SELECTION_SINGLE)
+
+        cell = gtk.CellRendererText()
+        col = gtk.TreeViewColumn('ID')
+        col.pack_start(cell, True)
+        col.add_attribute(cell, 'text', 0)
+        self._tree_view.append_column(col)
+
+        cell = gtk.CellRendererText()
+        col = gtk.TreeViewColumn('Name')
+        col.pack_start(cell, True)
+        col.add_attribute(cell, 'text', 1)
+        self._tree_view.append_column(col)
+
+        self.add(self._tree_view)
+        self.show_all()
+

=== modified file 'tools/geisview/deviceview.py'
--- tools/geisview/deviceview.py	2011-05-18 13:32:13 +0000
+++ tools/geisview/deviceview.py	2011-07-01 14:44:36 +0000
@@ -34,7 +34,7 @@
         for device in devices:
             it = self._tree_store.append(None, ["%s" % device])
         self._tree_view = gtk.TreeView(self._tree_store)
-        self._tree_view.set_mode(gtk.SELECTION_SINGLE)
+#        self._tree_view.set_mode(gtk.SELECTION_SINGLE)
         cell = gtk.CellRendererText()
         col = gtk.TreeViewColumn('Label')
         col.pack_start(cell, True)

=== modified file 'tools/geisview/geisview'
--- tools/geisview/geisview	2011-05-22 01:00:44 +0000
+++ tools/geisview/geisview	2011-07-01 14:44:36 +0000
@@ -25,6 +25,7 @@
 import argparse
 import geis
 import geisview.defaults
+import geisview.classview
 import geisview.deviceview
 import geisview.filter_list
 from gettext import gettext as _
@@ -58,6 +59,7 @@
         geis_fd = self._geis.get_configuration(geis.GEIS_CONFIGURATION_FD)
         glib.io_add_watch(geis_fd, glib.IO_IN, self._dispatch_geis_events)
 
+        self._classes = {}
         self._devices = {}
 
         self._sub = geis.Subscription(self._geis)
@@ -81,6 +83,9 @@
         filter_list_dialog = geisview.filter_list.FilterList()
         filter_list_dialog.run()
 
+    def on_view_classes_menu_item_activate(self, widget, data=None):
+        class_view = geisview.classview.GestureClassView(self._classes)
+
     def on_view_device_menu_item_activate(self, widget, data=None):
         device_view = geisview.deviceview.DeviceView(self._devices)
 
@@ -116,11 +121,14 @@
         """
         frame_label = _("frame: %i") % frame.id()
         touch_label = _("touch indexes %s") % frame.touches()
+        class_label = _("classes: %s") % [gc.name() for gc in 
+                filter(frame.is_class, self._classes.itervalues())]
 
         dev = None
 
         frame_row = self._geis_event_store.append(group_row)
         self._geis_event_store.set(frame_row, 0, frame_label)
+        self._geis_event_store.append(frame_row, [class_label, None, None])
         for (k, v) in frame.attrs().iteritems():
             row = self._geis_event_store.append(frame_row)
             self._geis_event_store.set(row, 0, "%s: %s" % (k, v))
@@ -173,6 +181,7 @@
     def _do_class_added(self, event):
         gclass = event.attrs()[geis.GEIS_EVENT_ATTRIBUTE_CLASS]
         it = self._geis_event_store.append(None)
+        self._classes[gclass.id()] = gclass
         self._geis_event_store.set(it,
                 0, _("Class %s Added: %s") % (gclass.id(), gclass.name()))
         self._detail_gesture_class(it, gclass)

=== modified file 'tools/geisview/geisview.ui'
--- tools/geisview/geisview.ui	2011-04-27 14:19:58 +0000
+++ tools/geisview/geisview.ui	2011-07-01 14:44:36 +0000
@@ -25,6 +25,11 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-missing-image</property>
   </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-missing-image</property>
+  </object>
   <object class="GtkWindow" id="main_window">
     <property name="can_focus">False</property>
     <property name="default_width">480</property>
@@ -212,6 +217,18 @@
                         <signal name="activate" handler="on_view_device_menu_item_activate" swapped="no"/>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="view_classes_menu_item">
+                        <property name="label" translatable="yes">Show _Classes</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image2</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_view_classes_menu_item_activate" swapped="no"/>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>