bg colors and positioning

made bg color more uniform, moved positions of plotting and side bar area... still needs more work, not sure how to precisely move the whole right side properly

Author: Mart4672

drivers/flight_gui.py

@@ -100,7 +100,7 @@ def init(config=Config.FLIGHT):
                            "Telemetry monitor",
                            show_send_value=False,
                            serial_console_height=5,
-                           plots_size=(10,10),
+                           plots_size=(11.5,10),
                            default_baud=57600)
 
     running = False
@@ -148,13 +148,13 @@ def state_name(name):
         return lower_name.replace("_", " ")
 
     # Add custom gui controls
-    Label(app, text="\nControls").pack()
+    Label(app, text="\nControls", bg= '#69615e').pack()
 
     # Sensor controls
     #Label(app, text="\nSensor Controls").pack()
     controlsFrame = Frame(app, bg= '#69615e')
     controlsFrame.pack()    #expand=1
-    sensorStatus = Label(controlsFrame, text="All sensors functional", fg='green', font=("Helvetica", 17))
+    sensorStatus = Label(controlsFrame, text="All sensors functional", fg='green', font=("Helvetica", 17), bg= '#b9b1ae')
     sensorStatus.grid(row=0,column=0,columnspan=4)
     #Button(controlsFrame, text="Zero force", command=lambda: app.sendValue("zero_force")).pack(side=LEFT)
     #Button(controlsFrame, text="Zero pressure", command=lambda: app.sendValue("zero_pressure")).pack(side=LEFT)
@@ -215,11 +215,11 @@ def state_name(name):
     #Label(app, text="\nThrottle Controls").pack()
     throttleFrame = Frame(app, bg= '#69615e')   #bg or background works
     throttleFrame.pack()
-    Label(throttleFrame, text="Drouge", font=("Helvetica", 15)).grid(row=0, column=1)
-    Label(throttleFrame, text="Main", font=("Helvetica", 15)).grid(row=0, column=2, padx=15)
-    Label(throttleFrame, text="1", font=("Helvetica", 15)).grid(row=1, column=0, sticky=W, padx=5)
-    Label(throttleFrame, text="2", font=("Helvetica", 15)).grid(row=2, column=0, sticky=W, padx=5)
-    Label(throttleFrame, text="Cam", font=("Helvetica", 15)).grid(row=3, column=0, sticky=W, padx=5)
+    Label(throttleFrame, text="Drouge", font=("Helvetica", 15), bg= '#69615e').grid(row=0, column=1)
+    Label(throttleFrame, text="Main", font=("Helvetica", 15), bg= '#69615e').grid(row=0, column=2, padx=15)
+    Label(throttleFrame, text="1", font=("Helvetica", 15), bg= '#69615e').grid(row=1, column=0, sticky=W, padx=5)
+    Label(throttleFrame, text="2", font=("Helvetica", 15), bg= '#69615e').grid(row=2, column=0, sticky=W, padx=5)
+    Label(throttleFrame, text="Cam", font=("Helvetica", 15), bg= '#69615e').grid(row=3, column=0, sticky=W, padx=5)
     Button(throttleFrame, text="Reset board", command=lambda: app.sendValue("reset")).grid(row=3, column=2, sticky=W, padx=5)
 
 
@@ -238,7 +238,7 @@ def state_name(name):
     runFrame.pack()
     start_abort_button = Button(runFrame, text="Start", command=start_abort_handler, bg="lime green", height=3, width=10)
     start_abort_button.pack(side=LEFT)
-    countdown = Label(runFrame, text="  T-01:00:00", fg="red", font=("Helvetica", 20, "bold"))
+    countdown = Label(runFrame, text="  T-01:00:00", fg="red", font=("Helvetica", 20, "bold"), bg= '#b9b1ae')
     countdown.pack()
     status = Label(runFrame, text="  Stand by", width=15, font=("Helvetica", 17))
     status.pack()

src/gui.py

@@ -50,7 +50,7 @@ def __init__(self,
                      'serial_console_height': 15,
                      'default_baud': 9600,
                      'plots_size': (12,10),
-                     'plots_background': 'white'}
+                     'plots_background': '#69615e'}
         new_flags.update(flags)
         self.flags = new_flags
 
@@ -69,8 +69,8 @@ def __init__(self,
         self.flags['full_screen'] = args.full_screen
 
         # Init gui
-        Frame.__init__(self, master)
-        self.pack()
+        Frame.__init__(self, master, bg='#69615e')      #set whole background color here!
+        self.pack(side=LEFT)     #side=LEFT
         #master.iconbitmap('telemetry.png')
         master.attributes("-fullscreen", self.flags['full_screen'])
         master.bind('<Escape>', self.unmaximize)
@@ -118,7 +118,7 @@ def _createWidgets(self):
         """Initialize the various widgets in the main frame."""
         self._setupPlots()
 
-        buttons = Frame(self)
+        buttons = Frame(self)   #, bg='red'     buttons cover everything tho
         self.controlButton = Button(buttons, text="Start", command=self.start, bg="lime green")
         self.controlButton.pack(side=LEFT)
 
@@ -137,13 +137,13 @@ def _createWidgets(self):
         self.thresholdButton = Button(buttons, text="Set thresholds...", command=self.configureThresholds)
         self.thresholdButton.pack(side=LEFT)
 
-        buttons.pack()
-
-        serialLabel = Label(self, text="\nSerial console")
+        buttons.pack()  #side=RIGHT,fill=BOTH       move to right
+            #fill=BOTH, expand=50
+        serialLabel = Label(self, text="\nSerial console", bg= '#69615e')
         serialLabel.pack()
 
         serial = Frame(self, bg= '#69615e')
-        serialControls = Frame(serial)
+        serialControls = Frame(serial, bg= '#69615e')
 
         self.serialPort = StringVar(self)
         self.serialSelect = OptionMenu(serialControls, self.serialPort, [])
@@ -205,7 +205,7 @@ def _createWidgets(self):
             sendValues.pack()
 
         # Value readout widget
-        valuesLabel = Label(self, text="\nCurrent values")
+        valuesLabel = Label(self, text="\nCurrent values", bg= '#69615e')
         if self.flags['show_current_values']:
             valuesLabel.pack()
 

src/plot.py

@@ -37,7 +37,7 @@ def __init__(self,
         suffix = suffix.replace("_", " ")
         if " " in suffix:
             suffix = suffix[suffix.index(" "):]
-        
+
         if ys_names:
             self.ys_names = ys_names
         elif suffix:
@@ -133,7 +133,7 @@ def fn(x_data, y_data, y=y):
                             j += 1
                     x_data = new_x_data
                     y_data = new_y_data
-                        
+
                 assert len(x_data) == len(y_data)
                 # 'Prune' plotted data to avoid slow-down with large amounts of data
                 indices = range(0, len(x_data), max(len(x_data) // max_points, 1))
@@ -167,7 +167,7 @@ def gen_layout(plots):
             available = {(i, j): True
                          for i in range(width)
                          for j in range(height)}
-            
+
             # List of info for each plot
             layout = []