Merge branch 'master' of evefit.org:pyfa

gui/builtinStatsViews/targetingMiscViewFull.py

@@ -98,7 +98,7 @@ class TargetingMiscViewFull(StatsView):
         #If we did anything intresting, we'd update our labels to reflect the new fit's stats here
 
         stats = (("labelTargets", lambda: fit.maxTargets, 3, 0, 0, ""),
-                 ("labelRange", lambda: fit.ship.getModifiedItemAttr('maxTargetRange') / 1000, 3, 0, 0, "km"),
+                 ("labelRange", lambda: fit.maxTargetRange / 1000, 3, 0, 0, "km"),
                  ("labelScanRes", lambda: fit.ship.getModifiedItemAttr('scanResolution'), 3, 0, 0, "mm"),
                  ("labelSensorStr", lambda: fit.scanStrength, 3, 0, 0, ""),
                  ("labelCtrlRange", lambda: fit.extraAttributes["droneControlRange"] / 1000, 3, 0, 0, "km"),

miniframe.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import wx
 import copy
 import time
@@ -122,12 +123,9 @@ class PFTabRenderer:
         g = bkG + scale
         b = bkB + scale
 
-        if r > 255: r = 255
-        if r < 0: r = 0
-        if g > 255: g = 255
-        if g < 0: g = 0
-        if b > 255: b = 255
-        if b < 0: b = 0
+        r = min(max(r,0),255)
+        b = min(max(b,0),255)
+        g = min(max(g,0),255)
 
         return wx.Colour(r,g,b)
 
@@ -368,12 +366,9 @@ class PFAddRenderer:
         g = bkG + scale
         b = bkB + scale
 
-        if r > 255: r = 255
-        if r < 0: r = 0
-        if g > 255: g = 255
-        if g < 0: g = 0
-        if b > 255: b = 255
-        if b < 0: b = 0
+        r = min(max(r,0),255)
+        b = min(max(b,0),255)
+        g = min(max(g,0),255)
 
         return wx.Colour(r,b,g)
 
@@ -773,6 +768,8 @@ class PFTabsContainer(wx.Window):
                 self.tabs[self.GetTabsCount() - 1].SetSelected(True)
             else:
                 self.tabs[tab].SetSelected(True)
+        elif self.GetTabsCount() == 0:
+            self.Destroy()
         self.AdjustTabsSize()
         self.Refresh()
 
@@ -835,14 +832,11 @@ class PFTabsContainer(wx.Window):
         g = bkG + scale
         b = bkB + scale
 
-        if r > 255: r = 255
-        if r < 0: r = 0
-        if g > 255: g = 255
-        if g < 0: g = 0
-        if b > 255: b = 255
-        if b < 0: b = 0
+        r = min(max(r,0),255)
+        g = min(max(g,0),255)
+        b = min(max(b,0),255)
 
-        return wx.Colour(r,b,g)
+        return wx.Colour(r,g,b)
 
 class MiniFrame(wx.Frame):
     def __init__(self):