Make it run again

gui/builtinStatsViews/firepowerViewFull.py

@@ -18,7 +18,6 @@
 #===============================================================================
 
 import wx
-import service
 import gui.mainFrame
 from gui.statsView import StatsView
 from gui.bitmapLoader import BitmapLoader
@@ -114,7 +113,7 @@ class FirepowerViewFull(StatsView):
     def switchToMiningYieldView(self, event):
         # Getting the active fit
         mainFrame = gui.mainFrame.MainFrame.getInstance()
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fit = sFit.getFit(mainFrame.getActiveFit())
         # Remove ourselves from statsPane's view list
         self.parent.views.remove(self)

gui/builtinStatsViews/miningyieldViewFull.py

@@ -18,7 +18,6 @@
 #===============================================================================
 
 import wx
-import service
 import gui.mainFrame
 from gui.statsView import StatsView
 from gui.bitmapLoader import BitmapLoader
@@ -103,7 +102,7 @@ class MiningYieldViewFull(StatsView):
     def switchToFirepowerView(self, event):
         # Getting the active fit
         mainFrame = gui.mainFrame.MainFrame.getInstance()
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fit = sFit.getFit(mainFrame.getActiveFit())
         # Remove ourselves from statsPane's view list
         self.parent.views.remove(self)
@@ -124,9 +123,9 @@ class MiningYieldViewFull(StatsView):
     def refreshPanel(self, fit):
         #If we did anything intresting, we'd update our labels to reflect the new fit's stats here
 
-        stats = (("labelFullminingyieldMiner", lambda: fit.minerYield * 3600, 3, 0, 0, u"%s m\u00B3/h",None),
-                 ("labelFullminingyieldDrone", lambda: fit.droneYield * 3600, 3, 0, 0, u"%s m\u00B3/h", None),
-                 ("labelFullminingyieldTotal", lambda: fit.totalYield * 3600, 3, 0, 0, u"%s m\u00B3/h", None))
+        stats = (("labelFullminingyieldMiner", lambda: fit.minerYield, 3, 0, 0, u"%s m\u00B3/s",None),
+                 ("labelFullminingyieldDrone", lambda: fit.droneYield, 3, 0, 0, u"%s m\u00B3/s", None),
+                 ("labelFullminingyieldTotal", lambda: fit.totalYield, 3, 0, 0, u"%s m\u00B3/s", None))
 
         counter = 0
         for labelName, value, prec, lowest, highest, valueFormat, altFormat in stats:

gui/builtinStatsViews/priceViewFull.py

@@ -22,7 +22,7 @@ from gui.statsView import StatsView
 from gui import builtinStatsViews
 from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
-import service
+from service.market import Market
 
 class PriceViewFull(StatsView):
     name = "priceViewFull"
@@ -92,7 +92,7 @@ class PriceViewFull(StatsView):
                 for _ in xrange(cargo.amount):
                     typeIDs.append(cargo.itemID)
 
-            sMkt = service.Market.getInstance()
+            sMkt = Market.getInstance()
             sMkt.getPrices(typeIDs, self.processPrices)
             self.labelEMStatus.SetLabel("Updating prices...")
         else:

gui/builtinStatsViews/rechargeViewFull.py

@@ -23,7 +23,7 @@ from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 import gui.mainFrame
 import gui.builtinStatsViews.resistancesViewFull as rvf
-import service
+from service.fit import Fit
 
 class RechargeViewFull(StatsView):
     name = "rechargeViewFull"
@@ -43,7 +43,7 @@ class RechargeViewFull(StatsView):
 
     def toggleEffective(self, event):
         self.effective = event.effective
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         self.refreshPanel(sFit.getFit(self.mainFrame.getActiveFit()))
         event.Skip()
 

gui/builtinStatsViews/resistancesViewFull.py

@@ -23,7 +23,6 @@ from gui import builtinStatsViews
 from gui.bitmapLoader import BitmapLoader
 from gui import pygauge as PG
 from gui.utils.numberFormatter import formatAmount
-import service
 import gui.mainFrame
 import gui.builtinViews.fittingView as fv
 import gui.globalEvents as GE