Changeset 3311

Timestamp:

08/02/08 17:37:41 (5 years ago)

Author:

nopper

Message:

Implemented the block selection in the hexview

Location:

branch/PacketManipulator

Files:

• Tabs/MainTab.py (modified) (3 diffs)
• Tabs/PropertyTab.py (modified) (2 diffs)
• widgets/HexView.py (modified) (4 diffs)
• widgets/PropertyGrid.py (modified) (3 diffs)

branch/PacketManipulator/Tabs/MainTab.py

@@ -129 +129 @@
         self.hexview = HexView()
 
-        self.hexview.payload = self.packet.get_raw()
+        self.redraw_hexview()
 
     def __pack_widgets(self):
@@ -141 +141 @@
         pass
 
+    def redraw_hexview(self):
+        """
+        Redraws the hexview
+        """
+        if self.packet:
+            self.hexview.payload = self.packet.get_raw()
+        else:
+            print "redraw_hexview(): no packet!!!"
+            self.hexview.payload = ""
+
     def get_label(self):
         return self._label
@@ -157 +167 @@
         self.append_page(session, session.label)
         self.set_tab_reorderable(session, True)
+
+    def get_current_session(self):
+        """
+        Get the current SessionPage
+
+        @return a SessionPage instance or None
+        """
+
+        idx = self.get_current_page()
+        obj = self.get_nth_page(idx)
+
+        if obj and isinstance(obj, SessionPage):
+            return obj
+
+        return None
 
 class MainTab(UmitView):

branch/PacketManipulator/Tabs/PropertyTab.py

@@ -31 +31 @@
     def create_ui(self):
         self.grid = PropertyGrid()
+        self.grid.tree.connect('finish-edit', self.__redraw_hex_view)
+        self.grid.tree.connect('field-selected', self.__on_field_selected)
+
         self._main_widget.add(self.grid)
         self._main_widget.show_all()
@@ -62 +65 @@
             self.grid.populate(proto)
             self._main_widget.set_sensitive(True)
+
+    def __redraw_hex_view(self, tree, entry_destroyed):
+        # This is called when the user end the edit action on the PropertyGrid
+        # and we could redraw the entire hexview to show changes
+        # The tree argument is the PropertyGridTree object
+
+        from App import PMApp
+        tab = PMApp().main_window.get_tab("MainTab")
+        page = tab.session_notebook.get_current_session()
+
+        if page:
+            page.redraw_hexview()
+
+            # Now reselect the blocks
+            self.__on_field_selected(self.grid.tree, *self.grid.tree.get_selected_field())
+
+    def __on_field_selected(self, tree, proto=None, field=None):
+        if not proto or not field:
+            return
+
+        # We should select also the bounds in HexView
+        from App import PMApp
+        tab = PMApp().main_window.get_tab("MainTab")
+        page = tab.session_notebook.get_current_session()
+
+        if page:
+            page.hexview.select_block(proto.get_offset(field) / 8, max(field.bits / 8, 1))

branch/PacketManipulator/widgets/HexView.py

@@ -142 +142 @@
 
     def select_blocks(self, start=None, end=None):
-        if self.prev_start and self.prev_end:
+        if self.prev_start and self.prev_end and self.prev_start != self.prev_end:
             self.buffer.remove_tag(self._parent.tag_sec_sel, self.prev_start, self.prev_end)
 
@@ -214 +214 @@
 
     def select_blocks(self, start=None, end=None):
-        if self.prev_start and self.prev_end:
+        if self.prev_start and self.prev_end and self.prev_start != self.prev_end:
             self.buffer.remove_tag(self._parent.tag_sec_sel, self.prev_start, self.prev_end)
 
@@ -398 +398 @@
         )
 
+    def select_block(self, offset, len, ascii=True):
+        """
+        Select a block of data in the HexView
+
+        @param offset the offset byte
+        @param len the lenght of selection
+        @param ascii True to set primary selection on ASCII otherwise on HEX
+        """
+
+        start = offset
+        end = offset + len
+
+        if start > end:
+            start, end = end, start
+
+        if ascii:
+            # We need to get a fucking iter!
+            buffer = self.ascii_text.get_buffer()
+            start_iter = buffer.get_iter_at_offset(start)
+            end_iter   = buffer.get_iter_at_offset(end)
+
+            buffer.select_range(end_iter, start_iter)
+
     def get_payload(self):
         return self._payload
@@ -404 +427 @@
 
         for view in (self.offset_text, self.hex_text, self.ascii_text):
+            
+            # Invalidate previous iters
+            if hasattr(view, 'prev_start'):
+                view.prev_start = None
+            if hasattr(view, 'prev_end'):
+                view.prev_end = None
+
             view.render(self._payload)
 

branch/PacketManipulator/widgets/PropertyGrid.py

@@ -378 +378 @@
 class PropertyGridTree(gtk.ScrolledWindow):
     __gsignals__ = {
-        'finish-edit' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_OBJECT, )),
-        'desc-changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, )),
+        'finish-edit'    : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_OBJECT, )),
+        'field-selected' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
+        'desc-changed'   : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, )),
     }
 
@@ -435 +436 @@
         self.tree.get_selection().connect('changed', self.__on_selection_changed)
         self.tree.connect('button-release-event', self.__on_button_release)
+    
+    def get_selected_field(self):
+        """
+        Get the selected field
+
+        @return a tuple (proto, field) containing the parent
+                protocol for field and the field or None, None
+        """
+
+        model, iter = self.tree.get_selection().get_selected()
+
+        if not iter:
+            return (None, None)
+        
+        # If there's a object than it's a parent so return None, None
+        if model.get_value(iter, 0):
+            return (None, None)
+
+        proto = model.get_value(model.iter_parent(iter), 0)
+        field = model.get_value(iter, 1)
+
+        if not isinstance(field, base.Field) or \
+           not isinstance(proto, base.Protocol):
+            return (None, None)
+
+        return (proto, field)
 
     def __on_selection_changed(self, selection):
@@ -448 +475 @@
             self.emit('desc-changed', "%s protocol." % Backend.get_proto_name(proto))
         else:
-            proto = model.get_value(model.iter_parent(iter), 0)
-            field = model.get_value(iter, 1)
-
-            if not isinstance(field, base.Field) or \
-               not isinstance(proto, base.Protocol):
-                return
-            
+            proto, field = self.get_selected_field()
+
+            self.emit('field-selected', proto, field)
             self.emit('desc-changed', Backend.get_field_desc(field))
 
-            # We should select also the bounds in HexView
-            nb = App.PMApp().main_window.get_tab("MainTab").session_notebook
-            page = nb.get_nth_page(nb.get_current_page())
-
-            # The page *MUST* be a SessionPage otherwise the signal
-            # we cannot be here becouse this widget is insentive
-            # so no worry about it.
-
-            print page.hexview, proto.get_offset(field), field.bits
-    
     def __on_button_release(self, widget, event):
         # We should get the selection and show the popup