Changeset 32:46c1a12f72d1

Timestamp:

02/25/12 15:49:27 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Implemented the status bar.

Location:

src/mlx/gui

Files:

• common.py (modified) (1 diff)
• gui.py (modified) (11 diffs)
• statusbar.py (added)
• statusicon.py (modified) (4 diffs)

src/mlx/gui/common.py

@@ -28 +28 @@
 import cairo
 
+#------------------------------------------------------------------------------
+
+class FlightStatusHandler(object):
+    """Base class for objects that handle the flight status in some way."""
+    def __init__(self):
+        self._stage = None
+        self._rating = 100
+        self._noGoReason = None
+
+    def resetFlightStatus(self):
+        """Reset the flight status."""
+        self._stage = None
+        self._rating = 100
+        self._noGoReason = None
+        self._updateFlightStatus()
+        
+    def setStage(self, stage):
+        """Set the stage of the flight."""
+        if stage!=self._stage:
+            self._stage = stage
+            self._updateFlightStatus()
+
+    def setRating(self, rating):
+        """Set the rating to the given value."""
+        if rating!=self._rating:
+            self._rating = rating
+            if self._noGoReason is None:
+                self._updateFlightStatus()
+
+    def setNoGo(self, reason):
+        """Set a No-Go condition with the given reason."""
+        if self._noGoReason is None:
+            self._noGoReason = reason
+            self._updateFlightStatus()
+
+#------------------------------------------------------------------------------

src/mlx/gui/gui.py

@@ -2 +2 @@
 
 from statusicon import StatusIcon
+from statusbar import Statusbar
 from mlx.gui.common import *
 
@@ -10 +11 @@
 import mlx.acft as acft
 
-import math
 import time
 
@@ -64 +64 @@
         logFrame.set_border_width(8)
         mainVBox.pack_start(logFrame, True, True, 0)
-        
+
+        mainVBox.pack_start(gtk.HSeparator(), False, False, 0)
+
+        self._statusbar = Statusbar()
+        mainVBox.pack_start(self._statusbar, False, False, 0)
+
         win.show_all()        
 
@@ -82 +87 @@
         """Called when we have connected to the simulator."""
         self._connected = True
-        self._updateConnState()
         self._logger.untimedMessage("Connected to the simulator %s" % (descriptor,))
+        gobject.idle_add(self._statusbar.updateConnection,
+                         self._connecting, self._connected)
         
     def disconnected(self):
         """Called when we have disconnected from the simulator."""
         self._connected = False
-        self._updateConnState()
         self._logger.untimedMessage("Disconnected from the simulator")
+        gobject.idle_add(self._statusbar.updateConnection,
+                         self._connecting, self._connected)
 
     def write(self, msg):
@@ -101 +108 @@
     def resetFlightStatus(self):
         """Reset the status of the flight."""
+        self._statusbar.resetFlightStatus()
         self._statusIcon.resetFlightStatus()
 
@@ -109 +117 @@
     def _setStage(self, stage):
         """Set the stage of the flight."""
+        self._statusbar.setStage(stage)
         self._statusIcon.setStage(stage)
 
@@ -117 +126 @@
     def _setRating(self, rating):
         """Set the rating of the flight."""
+        self._statusbar.setRating(rating)
         self._statusIcon.setRating(rating)
 
@@ -125 +135 @@
     def _setNoGo(self, reason):
         """Set the rating of the flight."""
+        self._statusbar.setNoGo(reason)
         self._statusIcon.setNoGo(reason)
 
@@ -156 +167 @@
             self.showMainWindow()
             
-    def _drawConnState(self, connStateArea, eventOrContext):
-        """Draw the connection state."""
-        context = eventOrContext if pygobject else connStateArea.window.cairo_create()
-
-        if self._connecting:
-            if self._connected:
-                context.set_source_rgb(0.0, 1.0, 0.0)
-            else:
-                context.set_source_rgb(1.0, 0.0, 0.0)
-        else:
-            context.set_source_rgb(0.75, 0.75, 0.75)
-
-        width = connStateArea.get_allocated_width() if pygobject \
-                else connStateArea.allocation.width
-        height = connStateArea.get_allocated_height() if pygobject \
-                 else connStateArea.allocation.height
-        context.arc(width/2, height/2, 8, 0, 2*math.pi)
-
-        context.fill()
-
-    def _updateConnState(self):
-        """Initiate the updating of the connection state icon."""
-        self._connStateArea.queue_draw()
-
     def _connectToggled(self, button):
         """Callback for the connection button."""
@@ -211 +198 @@
             self._flight = None
 
-        self._updateConnState()
+        self._statusbar.updateConnection(self._connecting, self._connected)
 
     def _buildSetupFrame(self):
@@ -299 +286 @@
 
         setupBox.pack_start(self._connectButton, False, False, 0)
-
-        setupBox.pack_start(gtk.VSeparator(), False, False, 8)    
-
-        self._connStateArea = gtk.DrawingArea()
-        self._connStateArea.set_size_request(16, 16)
-        self._connStateArea.set_tooltip_markup('The state of the connection.\n'
-                                               '<span foreground="grey">Grey</span> means idle.\n'
-                                               '<span foreground="red">Red</span> means trying to connect.\n'
-                                               '<span foreground="green">Green</span> means connected.')
-
-        if pygobject:
-            self._connStateArea.connect("draw", self._drawConnState)
-        else:
-            self._connStateArea.connect("expose_event", self._drawConnState)
-
-        alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5)
-        alignment.add(self._connStateArea)
-
-        setupBox.pack_start(alignment, False, False, 8)
 
         setupBox.pack_start(gtk.VSeparator(), False, False, 8)    

src/mlx/gui/statusicon.py

@@ -9 +9 @@
 #-------------------------------------------------------------------------------
 
-class StatusIcon(object):
+class StatusIcon(FlightStatusHandler):
     """The class handling the status icon."""
     def __init__(self, iconDirectory, gui):
         """Construct the status icon."""
+        super(StatusIcon, self).__init__()
+
         self._gui = gui
 
-        self._stage = None
-        self._rating = 100
-        self._noGoReason = None
-        
         menu = gtk.Menu()
 
         if appIndicator:
             self._stageMenuItem = gtk.MenuItem()
-            self._stageMenuItem.set_label("Stage: -")
             self._stageMenuItem.show()
             menu.append(self._stageMenuItem)
 
             self._ratingMenuItem = gtk.MenuItem()
-            self._ratingMenuItem.set_label("Rating: 100%")
             self._ratingMenuItem.show()
             menu.append(self._ratingMenuItem)
@@ -71 +67 @@
                                lambda status: self._gui.toggleMainWindow())
             self._statusIcon = statusIcon
-            self._setTooltip()
+
+        self._updateFlightStatus()
 
     def mainWindowHidden(self):
@@ -81 +78 @@
         self._showHideMenuItem.set_active(True)
 
-    def resetFlightStatus(self):
-        """Reset the status of the flight."""
-        if not appIndicator:
-            self._statusIcon.set_blinking(False)
-        self._noGoReason = None
-        self.setStage(None)
-        self.setRating(100)
-        
-    def setStage(self, stage):
-        """Set the stage of the flight."""
-        self._stage = stage
-        if appIndicator:
-            label = "Stage: %s" % ("-" if self._stage is None \
-                                   else (const.stage2string(stage),))
-            self._stageMenuItem.set_label(label)
-        else:
-            self._setTooltip()
-
-    def setRating(self, rating):
-        """Set the rating to the given value."""
-        if rating==self._rating:
-            return
-        self._rating = rating
-
-        if appIndicator:
-            if self._noGoReason is None:
-                self._ratingMenuItem.set_label("Rating: %.0f%%" % (rating,))
-            else:
-                self._setTooltip()
-
-    def setNoGo(self, reason):
-        """Set a No-Go condition with the given reason."""
-        if self._noGoReason is not None:
-            return
-
-        self._noGoReason = reason
-        if appIndicator:
-            self._ratingMenuItem.set_label("Rating: %s" % (reason,))
-        else:
-            self._setTooltip()
-            self._statusIcon.set_blinking(True)
-
     def _showHideToggled(self, menuitem):
         """Called when the show/hide menu item is toggled."""
@@ -130 +85 @@
             self._gui.hideMainWindow()
 
-    def _setTooltip(self):
-        """Set the tooltip of the status icon."""
+    def _updateFlightStatus(self):
+        """Update the flight status."""
+        stage = "-" if self._stage is None else const.stage2string(self._stage)
+        
         if self._noGoReason is None:
             rating = "%.0f%%" % (self._rating,)
         else:
-            rating = '<span foreground="red">' + self._noGoReason + '</span>'
+            rating = self._noGoReason
 
-        markup = "MAVA Logger X %s\n\nStage: %s\nRating: %s" %\
-                 (const.VERSION, ("-" if self._stage is None else
-                                  const.stage2string(self._stage)),
-                  rating)
-        
-        self._statusIcon.set_tooltip_markup(markup)
-        
+        if appIndicator:
+            self._stageMenuItem.set_label("Stage: %s" % (stage,))
+            self._ratingMenuItem.set_label("Rating: %s" % (rating,))
+        else:
+            if self._noGoReason is not None:
+                rating = '<span foreground="red">' + rating + '</span>'
+            markup = "MAVA Logger X %s\n\nStage: %s\nRating: %s" %\
+                     (const.VERSION, stage, rating)
+            self._statusIcon.set_tooltip_markup(markup)