Changeset 759

Timestamp:

05/31/07 15:37:07 (6 years ago)

Author:

ggpolo

Message:

Cleanups on viewer.py, add more one method to retrieve.py.

Location:

branch/ggpolo

Files:

• umitDB/retrieve.py (modified) (2 diffs)
• umitInventory/tl/youarehere.py (modified) (1 diff)
• umitInventory/viewer.py (modified) (20 diffs)

branch/ggpolo/umitDB/retrieve.py

@@ -334 +334 @@
         Get IPv4 address for a host.
         """
-        debug("Getting ipv4 address for host %d.." % fk_host)
+        debug("Getting ipv4 address for host id %d.." % fk_host)
         
         fk_address = self.cursor.execute("SELECT fk_address FROM _host_address \
@@ -348 +348 @@
             
         return address[0]
+    
+    def get_finish_timestamp_for_scan_from_db(self, scan):
+        """
+        Get finish timestamp for a scan.
+        """
+        debug("Getting finish timestamp for scan id %d.." % scan)
+        
+        fts = self.cursor.execute("SELECT finish FROM scan WHERE \
+                                  pk = ?", (scan, )).fetchone()[0]
+        
+        return fts
 
 

branch/ggpolo/umitInventory/tl/youarehere.py

@@ -194 +194 @@
         cr.rectangle(*event.area)
         cr.clip()
+
+        cr.save()
+        cr.rectangle(*event.area)
+        cr.set_source_rgb(1, 1, 1)
+        cr.fill()
+        cr.restore()
+        
+        cr.rectangle(0, 0, self.allocation[2], self.allocation[3])
+        cr.stroke()
         
         if self.tl.draw_border and self.__focus:

branch/ggpolo/umitInventory/viewer.py

@@ -97 +97 @@
             data["root"] = root
             data["host_addr"] = host_addr
-            self.daddy.emit('inventory-activated', data)
         
         else:
@@ -110 +109 @@
             data["root"] = root
             data["host_addr"] = None
-            self.daddy.emit('inventory-activated', data)
+            
+        self.daddy.emit('inventory-activated', data)
 
 
@@ -141 +141 @@
             
             self.__layout()
+
+            return 0
+        
+        return 1
         
         
@@ -167 +171 @@
         self.remove(page)
         
-        if not len(self.pages):
+        if not len(self.pages): # last page in this inventory was just removed
             self.daddy._delete_inventory_page()
 
@@ -240 +244 @@
                                 border_on_focus=False,
                                 **get_current_date_for_timeline())
-        #self.tlyah = tl.youarehere(self.timeline)
+        self.tlyah = tl.youarehere(self.timeline)
         self.larrow = tl.arrow(-1, self.timeline) # left arrow (previous date)
         self.rarrow = tl.arrow(1, self.timeline) # right arrow (next date)
@@ -254 +258 @@
         # tooltips
         self.tooltips = gtk.Tooltips()
-        #self.tooltips.set_tip(self.uparrow, _("Zoom out one level."))
-        #self.tooltips.set_tip(self.downarrow, _("Zoom in one level."))
+        self.tooltips.set_tip(self.tlyah, _("Timeline: You are here!"))
         self.tooltips.set_tip(self.larrow, _("Go to the previous date."))
         self.tooltips.set_tip(self.rarrow, _("Go to the next date."))
@@ -278 +281 @@
         """
         if self.tl_dtitle.flags () & gtk.VISIBLE or not event:
-            self.tl_dtitle.set_markup("<span weight='heavy'>Viewing date: %s \
-</span>" % (self.timeline.title_by_zoom()))    
+            self.tl_dtitle.set_markup(_("<span weight='heavy'>Viewing: %s \
+</span>") % (self.timeline.title_by_zoom()))    
             self._tl_verify_zoom()
     
@@ -342 +345 @@
 
 
+    def _set_yahrange(self, min, max):
+        """
+        Set new TimeLine year range.
+        """
+        miny = min.year - 1 
+        maxy = max.year + 1
+            
+        self.timeline.year_range = (miny, maxy)
+        self.timeline.emit('range-change-notify')
+    
+
     def _opt_timeline(self, event):
         """
         Show/Hide TimeLine.
         """
-        if self.tl_dtitle.flags () & gtk.VISIBLE:
-            self.tl_dtitle.hide()
-            self.timeline.hide()
-            self.larrow.hide()
-            self.rarrow.hide()
-            
-            timeline_zi = self.main_action_group.get_action("ZoomIn")
-            timeline_zo = self.main_action_group.get_action("ZoomOut")
-            timeline_zi.set_sensitive(False)
-            timeline_zo.set_sensitive(False)
+        visible = not ((self.tl_dtitle.flags () & gtk.VISIBLE) and 1 or 0)
+        methods = ("hide", "show")
+        
+        getattr(self.tl_dtitle, methods[visible])()
+        getattr(self.timeline, methods[visible])()
+        getattr(self.larrow, methods[visible])()
+        getattr(self.rarrow, methods[visible])()
+        
+        timeline_zi = self.main_action_group.get_action("ZoomIn")
+        timeline_zo = self.main_action_group.get_action("ZoomOut")
+        timeline_zi.set_sensitive(visible)
+        timeline_zo.set_sensitive(visible)
+        
+        if visible:
+            self._tl_verify_zoom()
+            
+    
+    def _opt_tlyah(self, event):
+        """
+        Show/Hide "You Are Here!".        
+        """
+        if self.yah_hb.flags () & gtk.VISIBLE:
+            self.yah_hb.hide()
         else:
-            self.tl_dtitle.show()
-            self.timeline.show()
-            self.larrow.show()
-            self.rarrow.show()
-            
-            timeline_zi = self.main_action_group.get_action("ZoomIn")
-            timeline_zo = self.main_action_group.get_action("ZoomOut")
-            timeline_zi.set_sensitive(True)
-            timeline_zo.set_sensitive(True)
-        
-            self._tl_verify_zoom()
-    
+            self.yah_hb.show()
+        
     
     def _close_current_hosttab(self, event):
@@ -386 +403 @@
     def _close_current_invtab(self, event):
         """
-        Closes current active inventory tab.
+        Closes current active inventory notebook.
         """
         holder = self.invnb.get_nth_page(self.invnb.get_current_page())
@@ -401 +418 @@
         
 
-    def _invnb_change_cbtn(self, event):
-        """
-        Enable/Disable close button in Inventory tabs.
-        """
-        self.invnb_close_btn = not self.invnb_close_btn
-        self.emit("invnb-cbtn-changed")
-
-
     def _delete_inventory_page(self):
         """
-        Removed last page from an Inventory notebook.
+        Removed last page from an Inventory notebook, now remove the Inventory
+        notebook.
         """
         cur_page = self.invnb.get_current_page()
@@ -429 +439 @@
         title = data["root"]
         
-        if not data["host_addr"]: # inventory activated
-            if not title in self.invnbpages_titles:
-                newinvnb = InventoryNB(self, title, True)
-                self.invnb.append_page(newinvnb, gtk.Label(_("%s" % title)))
+        if not title in self.invnbpages_titles:
+            newinvnb = InventoryNB(self, title, not data["host_addr"])
+            self.invnb.append_page(newinvnb, gtk.Label(_("%s" % title)))
                 
-                self.invnbpages_titles.append(title)
-                self.invnbpages_objects.append(newinvnb)
+            self.invnbpages_titles.append(title)
+            self.invnbpages_objects.append(newinvnb)
+            
+            if data["host_addr"]: # host activated
+                newinvnb.append_host(data["host_addr"])
+                
+            err = 0   
+        else:
+            p = self.invnbpages_objects[self.invnbpages_titles.index(title)]
+            if data["host_addr"]: # host activated
+                err = p.append_host(data["host_addr"])
+            else: # inventory activated
+                err = p.append_inv()
+            
+        if not err: # tab wasn't in inventory tab
+            print "inv: %s" % title
+            
+            if data["host_addr"]:
+                print "load %s data" % data["host_addr"]
             else:
-                p = self.invnbpages_objects[self.invnbpages_titles.index(title)]
-                p.append_inv()
+                print "load inv info"
                 
-        else: # host activated
-            if not title in self.invnbpages_titles:
-                newinvnb = InventoryNB(self, title)
-                self.invnb.append_page(newinvnb, gtk.Label(_("%s" % title)))
-                
-                self.invnbpages_titles.append(title)
-                self.invnbpages_objects.append(newinvnb)
-                
-                newinvnb.append_host(data["host_addr"])
-                err = 0
-            else:
-                p = self.invnbpages_objects[self.invnbpages_titles.index(title)]
-                err = p.append_host(data["host_addr"])
-            
-            if not err: # host wasn't in inventory tab
-                pass
-                # load data
-                # ...
-                #
-                # ...
+            # load data
+            # ...
+            #
+            # ...
             
 
@@ -467 +476 @@
         """
         self.addresses = { }
+        timestamps = [ ]
         
         tr = self.invtree.treestore
@@ -476 +486 @@
             # retrieve scans id for each inventory
             for scan in self.invdb.get_scans_ids_for_inventory(invid):
+
+                # retrieve scan finish timestamp
+                fts = self.invdb.get_finish_timestamp_for_scan_from_db(scan[0])
+                timestamps.append(fts)
                 
                 # retrieve hosts id for each scan
@@ -499 +513 @@
                         tr.append(root, ['%s' % addr])
         
-        
+        # Adjusts timeline range based on min and max timestamps from scans.
+        self._set_yahrange(min(timestamps), max(timestamps))
+    
         self.invtree.treeview.expand_all()
         self.invtree.tcolumn.set_title("My Inventories (%d)" % len(tr))
@@ -561 +577 @@
              self._opt_timeline,
              True),
+            ("ShowYAH", None,
+             _("Show \"You Are Here!\""), None,
+             _("Show/Hide \"You Are Here!\""),
+             self._opt_tlyah,
+             True),
             # Edit/Notebooks
             ("TabCloseBtn", None,
@@ -579 +600 @@
                 <menu action='Edit'>
                     <menu action='TimeLine'>
-                        <menuitem action='ShowTimeline' />
                         <menuitem action='ZoomIn' />
                         <menuitem action='ZoomOut' />
+                        <menuitem action='ShowTimeline' />
+                        <menuitem action='ShowYAH' />
                     </menu>
                     <menu action='ToolbarOpt'>
@@ -623 +645 @@
         Set window properties.
         """
-        self.set_title(_("UMIT Network Inventory 0.0.2"))
+        self.set_title(_("UMIT Network Inventory 0.0.2.2"))
         self.maximize()
         
@@ -645 +667 @@
         main_vbox.pack_start(toolbar, False, False, 0)
 
-        main_hpaned.add1(self.invtree)
+        left_pane_box = gtk.VBox()
+        #left_pane_box.set_border_width(3)
+        left_pane_box.pack_start(self.invtree, True, True, 0)
+        
+        self.yah_hb = gtk.HandleBox()
+        self.yah_hb.add(self.tlyah)
+        self.yah_hb.set_handle_position(gtk.POS_TOP)
+        left_pane_box.pack_end(self.yah_hb, False, False, 0)
+        
+        main_hpaned.add1(left_pane_box)
         main_hpaned.add2(nb_tl_hpaned)
 
         # align left and right arrow with timeline height
-        #tl_and_info = gtk.VBox()
-        
-        
         tlbox2 = gtk.HBox()
-        #tlbox2.set_border_width(6)
         align = gtk.Alignment(0, 1, 0, 0.5)
         align.add(self.larrow)
@@ -665 +692 @@
         align.add(self.rarrow)
         tlbox2.pack_end(align, False, False, 6)
-        #tl_and_info.pack_start(tlbox, False, False, 6)
         
         tlbox.pack_start(tlbox2, True, True, 0)
@@ -673 +699 @@
         nbscroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
         nbscroll.add_with_viewport(self.invnb)
-        #box3 = gtk.VBox()
-
-        # UNCOMMENT!
-        #box3.pack_start(self.tltitle, False, False, 6)
-        #box3.pack_start(tlbox, False, False, 6)
-        
-        # up arrow, title, down arrow
-        #align = gtk.Alignment(0.5, 0.5, 0, 0)
-        #align.add(self.tltitle)
-        
-        #box3.add(nbscroll)
-        
-        #tlbox2 = gtk.VBox()
-        #align = gtk.Alignment(1, 0, 0.4, 0)
-        #align.add(self.uparrow)
-        #tlbox2.pack_start(align, False, False, 6)
-        
-        #tlalign = gtk.Alignment(1, 0, 0.5, 0)
-        #tlalign.add(self.timeline)
-        #tlbox2.pack_start(tlalign, False, False, 0)
-        
-        #align = gtk.Alignment(1, 0, 0.4, 0)
-        #align.add(self.downarrow)
-        #tlbox2.pack_end(align, False, False, 6)
-        
-        #yahbox.pack_start(self.tltitle, False, False, 0)
-        #yahbox.pack_start(self.tlyah, False, False, 0)
-        #yahbox.pack_start(tlbox2, False, False, 0)
         nb_tl_hpaned.pack1(nbscroll, True, False)
-        #nb_tl_hpaned.pack2(yahbox, False, False)
-        
-        
-        #secondary_vbox.pack_start(tlbox, False, False, 6)
-        #secondary_vbox.pack_start(hpaned, True, True, 0)
+       
         main_vbox.pack_start(self.tl_dtitle, False, False, 6)
         main_vbox.pack_start(tlbox, False, False, 0)
-        #main_vbox.pack_start(box3, False, False, 0)
         main_vbox.pack_start(main_hpaned, True, True, 0)
-        
-        #main_vbox.pack_start(secondary_vbox, True, True, 0)
-        
         main_vbox.pack_end(self.statusbar, False, False, 0)