Make it run again

gui/builtinContextMenus/ammoPattern.py

@@ -1,6 +1,5 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import wx
 import gui.globalEvents as GE
 
@@ -25,7 +24,7 @@ class AmmoPattern(ContextMenu):
     def activate(self, fullContext, selection, i):
         item = selection[0]
         fit = self.mainFrame.getActiveFit()
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         sFit.setAsPattern(fit, item)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fit))
 

gui/builtinContextMenus/amount.py

@@ -2,7 +2,6 @@ from gui.contextMenu import ContextMenu
 from gui.itemStats import ItemStatsDialog
 import eos.types
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
 
@@ -46,7 +45,7 @@ class AmountChanger(wx.Dialog):
         self.button.Bind(wx.EVT_BUTTON, self.change)
 
     def change(self, event):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         mainFrame = gui.mainFrame.MainFrame.getInstance()
         fitID = mainFrame.getActiveFit()
 

gui/builtinContextMenus/cargo.py

@@ -2,16 +2,16 @@ from gui.contextMenu import ContextMenu
 from gui.itemStats import ItemStatsDialog
 import eos.types
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
+from service.fit import Fit
 
 class Cargo(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
     def display(self, srcContext, selection):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
 
         fit = sFit.getFit(fitID)
@@ -24,7 +24,7 @@ class Cargo(ContextMenu):
         return "Add {0} to Cargo".format(itmContext)
 
     def activate(self, fullContext, selection, i):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
 
         typeID = int(selection[0].ID)

gui/builtinContextMenus/changeAffectingSkills.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import wx
 from gui.bitmapLoader import BitmapLoader
 from eos.types import Skill
 import gui.globalEvents as GE
+from service.fit import Fit
+from service.character import Character
 
 class ChangeAffectingSkills(ContextMenu):
     def __init__(self):
@@ -15,8 +16,8 @@ class ChangeAffectingSkills(ContextMenu):
         if self.mainFrame.getActiveFit() is None or srcContext not in ("fittingModule", "fittingCharge", "fittingShip"):
             return False
 
-        self.sChar = service.Character.getInstance()
-        self.sFit = service.Fit.getInstance()
+        self.sChar = Character.getInstance()
+        self.sFit = Fit.getInstance()
         fit = self.sFit.getFit(self.mainFrame.getActiveFit())
 
         self.charID = fit.character.ID
@@ -26,7 +27,7 @@ class ChangeAffectingSkills(ContextMenu):
 
         if srcContext == "fittingShip":
             fitID = self.mainFrame.getActiveFit()
-            sFit = service.Fit.getInstance()
+            sFit = Fit.getInstance()
             self.stuff = sFit.getFit(fitID).ship
             cont = sFit.getFit(fitID).ship.itemModifiedAttributes
         elif srcContext == "fittingCharge":

gui/builtinContextMenus/damagePattern.py

@@ -1,9 +1,10 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
 from gui.bitmapLoader import BitmapLoader
+from service.fit import Fit
+from service.damagePattern import DamagePattern as import_DamagePattern
 
 try:
     from collections import OrderedDict
@@ -18,8 +19,8 @@ class DamagePattern(ContextMenu):
         return srcContext == "resistancesViewFull" and self.mainFrame.getActiveFit() is not None
 
     def getText(self, itmContext, selection):
-        sDP = service.DamagePattern.getInstance()
-        sFit = service.Fit.getInstance()
+        sDP = import_DamagePattern.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         self.fit = sFit.getFit(fitID)
 
@@ -59,7 +60,7 @@ class DamagePattern(ContextMenu):
         menuItem.pattern = pattern
 
         # determine active pattern
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         f = sFit.getFit(fitID)
         dp = f.damagePattern
@@ -98,7 +99,7 @@ class DamagePattern(ContextMenu):
             event.Skip()
             return
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         sFit.setDamagePattern(fitID, pattern)
         setattr(self.mainFrame,"_activeDmgPattern", pattern)

gui/builtinContextMenus/droneRemoveStack.py

@@ -1,6 +1,5 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import wx
 import gui.globalEvents as GE
 
@@ -15,7 +14,7 @@ class ItemRemove(ContextMenu):
         return "Remove {0} Stack".format(itmContext)
 
     def activate(self, fullContext, selection, i):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
 

gui/builtinContextMenus/droneSplit.py

@@ -2,7 +2,6 @@ from gui.contextMenu import ContextMenu
 from gui.itemStats import ItemStatsDialog
 import gui.mainFrame
 import gui.globalEvents as GE
-import service
 import wx
 
 class DroneSplit(ContextMenu):
@@ -48,7 +47,7 @@ class DroneSpinner(wx.Dialog):
         self.button.Bind(wx.EVT_BUTTON, self.split)
 
     def split(self, event):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         mainFrame = gui.mainFrame.MainFrame.getInstance()
         fitID = mainFrame.getActiveFit()
         if self.context == "droneItem":

gui/builtinContextMenus/factorReload.py

@@ -1,9 +1,9 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
 from gui.bitmapLoader import BitmapLoader
+from service.fit import Fit
 
 class FactorReload(ContextMenu):
     def __init__(self):
@@ -16,14 +16,14 @@ class FactorReload(ContextMenu):
         return "Factor in Reload Time"
 
     def activate(self, fullContext, selection, i):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         sFit.serviceFittingOptions["useGlobalForceReload"] = not sFit.serviceFittingOptions["useGlobalForceReload"]
         fitID = self.mainFrame.getActiveFit()
         sFit.refreshFit(fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
     def getBitmap(self, context, selection):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
         if fit.factorReload:

gui/builtinContextMenus/fighterAbilities.py

@@ -1,7 +1,6 @@
 import wx
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 
 class FighterAbility(ContextMenu):
@@ -48,7 +47,7 @@ class FighterAbility(ContextMenu):
             event.Skip()
             return
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         sFit.toggleFighterAbility(fitID, ability)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))

gui/builtinContextMenus/implantSets.py

@@ -1,6 +1,5 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
 
@@ -59,7 +58,7 @@ class ImplantSets(ContextMenu):
 
         if self.context == "implantEditor":
             # we are calling from character editor, the implant source is different
-            sChar = service.Character.getInstance()
+            sChar = Character.getInstance()
             charID = self.selection.getActiveCharacter()
 
             for implant in set.implants:
@@ -67,7 +66,7 @@ class ImplantSets(ContextMenu):
 
             wx.PostEvent(self.selection, GE.CharChanged())
         else:
-            sFit = service.Fit.getInstance()
+            sFit = Fit.getInstance()
             fitID = self.mainFrame.getActiveFit()
             for implant in set.implants:
                 sFit.addImplant(fitID, implant.item.ID, recalc=implant == set.implants[-1])

gui/builtinContextMenus/itemRemove.py

@@ -1,6 +1,5 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import wx
 import gui.globalEvents as GE
 
@@ -21,7 +20,7 @@ class ItemRemove(ContextMenu):
 
     def activate(self, fullContext, selection, i):
         srcContext = fullContext[0]
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
 

gui/builtinContextMenus/itemStats.py

@@ -1,8 +1,8 @@
 from gui.contextMenu import ContextMenu
 from gui.itemStats import ItemStatsDialog
 import gui.mainFrame
-import service
 import wx
+from service.fit import Fit
 
 class ItemStats(ContextMenu):
     def __init__(self):
@@ -27,7 +27,7 @@ class ItemStats(ContextMenu):
         srcContext = fullContext[0]
         if srcContext == "fittingShip":
             fitID = self.mainFrame.getActiveFit()
-            sFit = service.Fit.getInstance()
+            sFit = Fit.getInstance()
             stuff = sFit.getFit(fitID).ship
         else:
             stuff = selection[0]

gui/builtinContextMenus/marketJump.py

@@ -1,7 +1,7 @@
 from gui.contextMenu import ContextMenu
 from gui.itemStats import ItemStatsDialog
 import gui.mainFrame
-import service
+from service.market import Market
 
 class MarketJump(ContextMenu):
     def __init__(self):
@@ -19,7 +19,7 @@ class MarketJump(ContextMenu):
         if not srcContext in validContexts or selection is None or len(selection) < 1:
             return False
 
-        sMkt = service.Market.getInstance()
+        sMkt = Market.getInstance()
         item = getattr(selection[0], "item", selection[0])
         mktGrp = sMkt.getMarketGroupByItem(item)
 

gui/builtinContextMenus/metaSwap.py

@@ -2,9 +2,10 @@
 from gui.contextMenu import ContextMenu
 from gui.itemStats import ItemStatsDialog
 import gui.mainFrame
-import service
 import wx
 import gui.globalEvents as GE
+from service.market import Market
+from service.fit import Fit
 
 class MetaSwap(ContextMenu):
     def __init__(self):
@@ -17,7 +18,7 @@ class MetaSwap(ContextMenu):
 
         # Check if list of variations is same for all of selection
         # If not - don't show the menu
-        mkt = service.Market.getInstance()
+        mkt = Market.getInstance()
         self.variations = None
         for i in selection:
             variations = mkt.getVariationsByItems([i.item])
@@ -88,7 +89,7 @@ class MetaSwap(ContextMenu):
             event.Skip()
             return
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
         

gui/builtinContextMenus/moduleAmmoPicker.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import wx
 from gui.bitmapLoader import BitmapLoader
 from eos.types import Hardpoint
 import gui.globalEvents as GE
+from service.market import Market
+from service.fit import Fit
 
 class ModuleAmmoPicker(ContextMenu):
     DAMAGE_TYPES = ("em", "explosive", "kinetic", "thermal")
@@ -40,7 +41,7 @@ class ModuleAmmoPicker(ContextMenu):
             return False
 
         self.modules = modules
-        self.charges = list(filter(lambda charge: service.Market.getInstance().getPublicityByItem(charge), validCharges))
+        self.charges = list(filter(lambda charge: Market.getInstance().getPublicityByItem(charge), validCharges))
         return len(self.charges) > 0
 
     def getText(self, itmContext, selection):
@@ -214,7 +215,7 @@ class ModuleAmmoPicker(ContextMenu):
             event.Skip()
             return
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
 
         sFit.setAmmo(fitID, charge.ID if charge is not None else None, self.modules)

gui/builtinContextMenus/moduleGlobalAmmoPicker.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import wx
 from gui.bitmapLoader import BitmapLoader
 from eos.types import Hardpoint
@@ -26,7 +25,7 @@ class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
             event.Skip()
             return
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = eos.db.getFit(fitID)
 

gui/builtinContextMenus/priceClear.py

@@ -2,7 +2,7 @@ from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import wx
 import gui.globalEvents as GE
-import service
+from service.market import Market
 
 class PriceClear(ContextMenu):
     def __init__(self):
@@ -15,7 +15,7 @@ class PriceClear(ContextMenu):
         return "Reset Price Cache"
 
     def activate(self, fullContext, selection, i):
-        sMkt = service.Market.getInstance()
+        sMkt = Market.getInstance()
         sMkt.clearPriceCache()
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
 

gui/builtinContextMenus/project.py

@@ -1,9 +1,9 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
 import eos.db
+from service.fit import Fit
 
 class Project(ContextMenu):
     def __init__(self):
@@ -13,7 +13,7 @@ class Project(ContextMenu):
         if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None:
             return False
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
 
@@ -27,7 +27,7 @@ class Project(ContextMenu):
         return "Project {0} onto Fit".format(itmContext)
 
     def activate(self, fullContext, selection, i):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         trigger = sFit.project(fitID, selection[0])
         if trigger:

gui/builtinContextMenus/shipJump.py

@@ -1,8 +1,8 @@
 import wx
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 from gui.shipBrowser import Stage3Selected
+from service.fit import Fit
 
 class ShipJump(ContextMenu):
     def __init__(self):
@@ -16,7 +16,7 @@ class ShipJump(ContextMenu):
 
     def activate(self, fullContext, selection, i):
         fitID = self.mainFrame.getActiveFit()
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         stuff = sFit.getFit(fitID).ship
         groupID = stuff.item.group.ID
 

gui/builtinContextMenus/tacticalMode.py

@@ -1,8 +1,9 @@
 import wx
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
+
 import gui.globalEvents as GE
+from service.fit import Fit
 
 class TacticalMode(ContextMenu):
     def __init__(self):
@@ -12,7 +13,7 @@ class TacticalMode(ContextMenu):
         if self.mainFrame.getActiveFit() is None or srcContext != "fittingShip":
             return False
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
 
@@ -52,7 +53,7 @@ class TacticalMode(ContextMenu):
             event.Skip()
             return
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         sFit.setMode(fitID, self.modeIds[event.Id])
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))

gui/builtinContextMenus/targetResists.py

@@ -1,9 +1,10 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
 from gui.bitmapLoader import BitmapLoader
+from service import targetResists as svc_targetResists
+from service.fit import Fit
 
 try:
     from collections import OrderedDict
@@ -18,7 +19,7 @@ class TargetResists(ContextMenu):
         if self.mainFrame.getActiveFit() is None or srcContext != "firepowerViewFull":
             return False
 
-        sTR = service.TargetResists.getInstance()
+        sTR = svc_targetResists.TargetResists.getInstance()
         self.patterns = sTR.getTargetResistsList()
         self.patterns.sort(key=lambda p: (p.name in ["None"], p.name))
 
@@ -33,7 +34,7 @@ class TargetResists(ContextMenu):
             event.Skip()
             return
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         sFit.setTargetResists(fitID, pattern)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
@@ -50,7 +51,7 @@ class TargetResists(ContextMenu):
         item.pattern = pattern
 
         # determine active pattern
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         f = sFit.getFit(fitID)
         tr = f.targetResists

gui/builtinContextMenus/whProjector.py

@@ -1,8 +1,9 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
-import service
 import wx
+from service.market import Market
+from service.fit import Fit
 
 class WhProjector(ContextMenu):
     def __init__(self):
@@ -16,7 +17,7 @@ class WhProjector(ContextMenu):
 
     def getSubMenu(self, context, selection, rootMenu, i, pitem):
         msw = True if "wxMSW" in wx.PlatformInfo else False
-        sMkt = service.Market.getInstance()
+        sMkt = Market.getInstance()
         effdata = sMkt.getSystemWideEffects()
 
         self.idmap = {}
@@ -48,7 +49,7 @@ class WhProjector(ContextMenu):
             event.Skip()
             return
 
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         sFit.project(fitID, swObj)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))