Make it run again

gui/builtinViewColumns/attributeDisplay.py

@@ -22,14 +22,16 @@ from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 
-import service
+from service.attribute import Attribute
+from service.market import Market
+
 import wx
 
 class AttributeDisplay(ViewColumn):
     name = "attr"
     def __init__(self, fittingView, params):
         ViewColumn.__init__(self, fittingView)
-        sAttr = service.Attribute.getInstance()
+        sAttr = Attribute.getInstance()
         info = sAttr.getAttributeInfo(params["attribute"])
         self.info = info
         if params["showIcon"]:
@@ -57,7 +59,7 @@ class AttributeDisplay(ViewColumn):
             self.direct = True
             self.view = fittingView
             originalRefresh = fittingView.refresh
-            sMkt = service.Market.getInstance()
+            sMkt = Market.getInstance()
             #Hack into our master view and add a callback for ourselves to know when to query
             def refresh(stuff):
                 self.directInfo = sMkt.directAttrRequest(stuff, info) if stuff else None

gui/builtinViewColumns/baseName.py

@@ -21,9 +21,10 @@
 from gui.viewColumn import ViewColumn
 import gui.mainFrame
 
+#from eos.saveddata.fit import Fit
+from service.fit import Fit
 import wx
-from eos.types import Drone, Cargo, Fit, Module, Slot, Rack, Implant, Fighter
-import service
+from eos.types import Drone, Cargo, Module, Slot, Rack, Implant, Fighter
 
 class BaseName(ViewColumn):
     name = "Base Name"
@@ -51,7 +52,7 @@ class BaseName(ViewColumn):
             else:
                 return "%s (%s)" % (stuff.name, stuff.ship.item.name)
         elif isinstance(stuff, Rack):
-            if service.Fit.getInstance().serviceFittingOptions["rackLabels"]:
+            if Fit.getInstance().serviceFittingOptions["rackLabels"]:
                 if stuff.slot == Slot.MODE:
                     return u'─ Tactical Mode ─'
                 else:
@@ -68,7 +69,7 @@ class BaseName(ViewColumn):
         else:
             item = getattr(stuff, "item", stuff)
 
-            if service.Fit.getInstance().serviceFittingOptions["showMarketShortcuts"]:
+            if Fit.getInstance().serviceFittingOptions["showMarketShortcuts"]:
                 marketShortcut = getattr(item, "marketShortcut", None)
 
                 if marketShortcut:

gui/builtinViewColumns/capacitorUse.py

@@ -18,12 +18,12 @@
 #===============================================================================
 
 import wx
-import service
 
 from gui.utils.numberFormatter import formatAmount
 from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader
 from eos.types import Mode
+from service.attribute import Attribute
 
 class CapacitorUse(ViewColumn):
     name = "Capacitor Usage"
@@ -32,7 +32,7 @@ class CapacitorUse(ViewColumn):
 
         self.mask = wx.LIST_MASK_IMAGE
 
-        sAttr = service.Attribute.getInstance()
+        sAttr = Attribute.getInstance()
         info = sAttr.getAttributeInfo("capacitorNeed")
         self.imageId = fittingView.imageList.GetImageIndex("capacitorRecharge_small", "gui")
         self.bitmap = BitmapLoader.getBitmap("capacitorRecharge_small", "gui")

gui/builtinViewColumns/maxRange.py

@@ -20,11 +20,12 @@
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader
-import service
 from gui.utils.numberFormatter import formatAmount
 import wx
 from eos.types import Mode
 
+from service.attribute import Attribute
+
 class MaxRange(ViewColumn):
     name = "Max Range"
     def __init__(self, fittingView, params = None):
@@ -33,7 +34,7 @@ class MaxRange(ViewColumn):
                       "displayName": False}
         ViewColumn.__init__(self, fittingView)
 
-        sAttr = service.Attribute.getInstance()
+        sAttr = Attribute.getInstance()
         info = sAttr.getAttributeInfo("maxRange")
         self.info = info
         if params["showIcon"]:

gui/builtinViewColumns/misc.py

@@ -405,9 +405,9 @@ class Miscellanea(ViewColumn):
             cycleTime = stuff.cycleTime
             if not miningAmount or not cycleTime:
                 return "", None
-            minePerHour = (float(miningAmount) * 1000 / cycleTime) * 3600
-            text = "{0}/h".format(formatAmount(minePerHour, 3, 0, 3))
-            tooltip = "Mining Yield per hour"
+            minePerSec = float(miningAmount) * 1000 / cycleTime
+            text = "{0}/s".format(formatAmount(minePerSec, 3, 0, 3))
+            tooltip = "Yield per second"
             return text, tooltip
         elif itemGroup == "Logistic Drone":
             armorAmount = stuff.getModifiedItemAttr("armorDamageAmount")
@@ -442,9 +442,9 @@ class Miscellanea(ViewColumn):
             cycleTime = stuff.getModifiedItemAttr("duration")
             if not miningAmount or not cycleTime:
                 return "", None
-            minePerHour = (float(miningAmount) * 1000 / cycleTime) * 3600
-            text = "{0}/h".format(formatAmount(minePerHour, 3, 0, 3))
-            tooltip = "Mining Yield per hour"
+            minePerSec = float(miningAmount) * 1000 / cycleTime
+            text = "{0}/s".format(formatAmount(minePerSec, 3, 0, 3))
+            tooltip = "Yield per second"
             return text, tooltip
         elif itemGroup == "Micro Jump Drive":
             cycleTime = stuff.getModifiedItemAttr("duration") / 1000

gui/builtinViewColumns/price.py

@@ -22,7 +22,7 @@ from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 from eos.types import Drone, Cargo
 import wx
-import service
+from service.market import Market
 
 class Price(ViewColumn):
     name = "Price"
@@ -36,7 +36,7 @@ class Price(ViewColumn):
         if stuff.item is None or stuff.item.group.name == "Ship Modifiers":
             return ""
 
-        sMkt = service.Market.getInstance()
+        sMkt = Market.getInstance()
         price = sMkt.getPriceNow(stuff.item.ID)
 
         if not price or not price.price or not price.isValid:
@@ -50,7 +50,7 @@ class Price(ViewColumn):
         return formatAmount(price, 3, 3, 9, currency=True)
 
     def delayedText(self, mod, display, colItem):
-        sMkt = service.Market.getInstance()
+        sMkt = Market.getInstance()
         def callback(item):
             price = sMkt.getPriceNow(item.ID)
             text = formatAmount(price.price, 3, 3, 9, currency=True) if price.price else ""

gui/builtinViewColumns/propertyDisplay.py

@@ -21,13 +21,12 @@ from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 import wx
-import service
 
 class PropertyDisplay(ViewColumn):
     name = "prop"
     def __init__(self, fittingView, params):
         ViewColumn.__init__(self, fittingView)
-        sAttr = service.Attribute.getInstance()
+        sAttr = Attribute.getInstance()
         attributeSlave = params["attributeSlave"] or params["property"]
         # This function can throw an exception if the database isn't sane
         # We need to do a sanity check before this runs