updated iconagraphy

WasatchPhotonics · Dec 10, 2015 · bf02bc1 · bf02bc1
1 parent 23470e0
commit bf02bc1
Show file tree

Hide file tree

Showing 8 changed files with 259 additions and 12 deletions.
diff --git a/assets/bluegraph_resources.qrc b/assets/bluegraph_resources.qrc
@@ -2,9 +2,11 @@
   <qresource prefix="ui">
     <file>graph_export.png</file>
     <file>fonts/GearsOfPeace.ttf</file>
-    <file>default_icon.png</file>
     <file>toggle_button_activated.png</file>
     <file>toggle_button_deactivated.png</file>
     <file>small_number_designator_export.png</file>
+    <file>ir_temp_icon.svg</file>
+    <file>default_icon.svg</file>
+    <file>humidity_icon.svg</file>
   </qresource>
 </RCC>
diff --git a/assets/bluegraph_resources_rc.py b/assets/bluegraph_resources_rc.py
diff --git a/assets/default_icon.png b/assets/default_icon.png
diff --git a/assets/default_icon.svg b/assets/default_icon.svg
diff --git a/assets/humidity_icon.svg b/assets/humidity_icon.svg
diff --git a/assets/ir_temp_icon.svg b/assets/ir_temp_icon.svg
diff --git a/bluegraph/multi_control.py b/bluegraph/multi_control.py
@@ -27,13 +27,13 @@ def __init__(self, device_class="Simulation",
         self.form = views.MultiGraphLayout()
 
 
-        self.amps_graph = views.PixmapBackedGraph("AMPS")
+        self.amps_graph = views.PixmapBackedGraph("AMPS", icon="default")
         self.form.vbox.addWidget(self.amps_graph)
 
-        self.ir_temp = views.PixmapBackedGraph("IR TEMP")
+        self.ir_temp = views.PixmapBackedGraph("IR TEMP", icon="ir_temp")
         self.form.vbox.addWidget(self.ir_temp)
 
-        self.humidity = views.PixmapBackedGraph("HUMIDITY")
+        self.humidity = views.PixmapBackedGraph("HUMIDITY", icon="humidity")
         self.form.vbox.addWidget(self.humidity)
 
         self.sensor_list = []
@@ -95,7 +95,6 @@ def update_fps(self):
         """
         for sensor in self.sensor_list:
             rnd_data = sensor.device.read()
-            self.data_fps.tick()
             if rnd_data is not None:
                 sensor.curve.setData(rnd_data)
                 self.data_fps.tick()

diff --git a/bluegraph/views.py b/bluegraph/views.py
@@ -71,7 +71,7 @@ def closeEvent(self, event):
 
 
 class PixmapBackedGraph(QtGui.QWidget):
-    def __init__(self, title="Blue Graph"):
+    def __init__(self, title="Blue Graph", icon="default"):
         super(PixmapBackedGraph, self).__init__()
 
         self.main_layout = QtGui.QVBoxLayout()
@@ -81,7 +81,7 @@ def __init__(self, title="Blue Graph"):
 
         filename = ":ui/graph_export.png"
         self.graphback = SceneGraphBackground(self.scene, filename,
-                                              title=title)
+                                              title=title, icon=icon)
         self.scene.addItem(self.graphback)
 
         self.view = QtGui.QGraphicsView(self.scene)
@@ -150,7 +150,7 @@ def __init__(self, scene, filename, title="BLUE GRAPH",
 
         self.add_main_title(title, self)
 
-        icon_filename = ":ui/default_icon.png"
+        icon_filename = ":ui/%s_icon.svg" % icon
         self.add_main_icon(icon_filename, self)
 
         self.minimum = SmallTextBox(prefix="MIN:")
@@ -178,6 +178,10 @@ def add_main_icon(self, filename, parent):
         self.icon.setPos(33, 13)
         self.icon.setParentItem(parent)
 
+        self.icon_shadow = QtGui.QGraphicsDropShadowEffect()
+        self.icon_shadow.setOffset(2, 2)
+        self.icon.setGraphicsEffect(self.icon_shadow)
+
     def add_main_title(self, title, parent):
         """ Add a text item with drop shadow.
         """