Rename controller to service

gui/builtinStatsViews/priceViewFull.py

@@ -22,7 +22,7 @@
 from gui import builtinStatsViews
 from gui import bitmapLoader
 from util import formatAmount
-import controller
+import service
 
 class PriceViewFull(StatsView):
     name = "priceViewFull"
@@ -100,7 +100,7 @@ def refreshPanel(self, fit):
             if self._timer:
                 if self._timer.IsRunning():
                     self._timer.Stop()
-            cMarket = controller.Market.getInstance()
+            cMarket = service.Market.getInstance()
             cMarket.getPrices(typeIDs, self.processPrices)
             self.labelEMStatus.SetLabel("Updating prices from EVE-METRICS...")
             if not self._timerUpdate:

gui/builtinViewColumns/attributeDisplay.py

@@ -20,14 +20,14 @@
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
-import controller
+import service
 from util import formatAmount
 
 class AttributeDisplay(ViewColumn):
     name = "Attribute Display"
     def __init__(self, fittingView, params):
         ViewColumn.__init__(self, fittingView)
-        cAttribute = controller.Attribute.getInstance()
+        cAttribute = service.Attribute.getInstance()
         info = cAttribute.getAttributeInfo(params["attribute"])
         self.info = info
         if params["showIcon"]:

gui/builtinViewColumns/maxRange.py

@@ -20,7 +20,7 @@
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
-import controller
+import service
 from util import formatAmount
 
 class MaxRange(ViewColumn):
@@ -30,7 +30,7 @@ def __init__(self, fittingView, params = None):
             params = {"showIcon": True,
                       "displayName": False}
         ViewColumn.__init__(self, fittingView)
-        cAttribute = controller.Attribute.getInstance()
+        cAttribute = service.Attribute.getInstance()
         info = cAttribute.getAttributeInfo("maxRange")
         self.info = info
         if params["showIcon"]:

gui/characterEditor.py

@@ -22,7 +22,7 @@
 import wx.lib.newevent
 import wx.gizmos
 from gui import bitmapLoader
-import controller
+import service
 import sys
 
 CharListUpdated, CHAR_LIST_UPDATED = wx.lib.newevent.NewEvent()
@@ -37,7 +37,7 @@ def __init__(self, parent):
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         self.navSizer = wx.BoxSizer(wx.HORIZONTAL)
 
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         charList = cChar.getCharacterList()
 
         self.btnSave = wx.Button(self, wx.ID_SAVE)
@@ -142,7 +142,7 @@ def unrestrict(self):
     def charChanged(self, event):
         self.sview.skillTreeListCtrl.DeleteChildren(self.sview.root)
         self.sview.populateSkillTree()
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         charID = self.getActiveCharacter()
         if cChar.getCharName(charID) in ("All 0", "All 5"):
             self.restrict()
@@ -154,7 +154,7 @@ def getActiveCharacter(self):
         return self.skillTreeChoice.GetClientData(selection) if selection is not None else None
 
     def new(self, event):
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         charID = cChar.new()
         id = self.skillTreeChoice.Append(cChar.getCharName(charID), charID)
         self.skillTreeChoice.SetSelection(id)
@@ -178,13 +178,13 @@ def rename(self, event):
         self.navSizer.Add(self.btnSave, 0, wx.ALIGN_CENTER)
         self.navSizer.Layout()
 
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         currName = cChar.getCharName(self.getActiveCharacter())
         self.characterRename.SetValue(currName)
         self.characterRename.SetSelection(0, len(currName))
 
     def processRename(self, event):
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         newName = self.characterRename.GetLineText(0)
         charID = self.getActiveCharacter()
         cChar.rename(charID, newName)
@@ -205,7 +205,7 @@ def processRename(self, event):
         self.skillTreeChoice.SetSelection(selection)
 
     def copy(self, event):
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         charID = cChar.copy(self.getActiveCharacter())
         id = self.skillTreeChoice.Append(cChar.getCharName(charID), charID)
         self.skillTreeChoice.SetSelection(id)
@@ -214,7 +214,7 @@ def copy(self, event):
         self.rename(None)
 
     def delete(self, event):
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         cChar.delete(self.getActiveCharacter())
         sel = self.skillTreeChoice.GetSelection()
         self.skillTreeChoice.Delete(sel)
@@ -269,7 +269,7 @@ def __init__(self, parent):
         self.Layout()
 
     def populateSkillTree(self):
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         groups = cChar.getSkillGroups()
         imageId = self.skillBookImageId
         root = self.root
@@ -290,7 +290,7 @@ def expandLookup(self, event):
             tree.Delete(child)
 
             #Get the real intrestin' stuff
-            cChar = controller.Character.getInstance()
+            cChar = service.Character.getInstance()
             char = self.Parent.Parent.getActiveCharacter()
             for id, name in cChar.getSkills(tree.GetPyData(root)):
                 iconId = self.skillBookImageId
@@ -306,13 +306,13 @@ def spawnMenu(self, event):
         if self.skillTreeListCtrl.GetChildrenCount(item) > 0:
             return
 
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         charID = self.Parent.Parent.getActiveCharacter()
         if cChar.getCharName(charID) not in ("All 0", "All 5"):
             self.PopupMenu(self.levelChangeMenu)
 
     def changeLevel(self, event):
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         charID = self.Parent.Parent.getActiveCharacter()
         selection = self.skillTreeListCtrl.GetSelection()
         skillID = self.skillTreeListCtrl.GetPyData(selection)
@@ -387,7 +387,7 @@ def __init__(self, parent):
         self.Layout()
 
     def fetchCharList(self, event):
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         list = cChar.charList(self.Parent.Parent.getActiveCharacter(), self.inputID.GetLineText(0), self.inputKey.GetLineText(0))
         self.charList.DeleteAllItems()
 
@@ -404,5 +404,5 @@ def fetchSkills(self, event):
         item = self.charList.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_SELECTED)
         charName = self.charList.GetItemText(item)
         if charName:
-            cChar = controller.Character.getInstance()
+            cChar = service.Character.getInstance()
             cChar.apiFetch(self.Parent.Parent.getActiveCharacter(), charName)

gui/characterSelection.py

@@ -18,7 +18,7 @@
 #===============================================================================
 
 import wx
-import controller
+import service
 from gui import characterEditor as ce
 from gui import shipBrowser as sb
 from gui import fittingView as fv
@@ -54,7 +54,7 @@ def getActiveCharacter(self):
 
     def refreshCharacterList(self, event=None):
         choice = self.charChoice
-        cChar = controller.Character.getInstance()
+        cChar = service.Character.getInstance()
         activeChar = self.getActiveCharacter()
 
         choice.Clear()
@@ -75,7 +75,7 @@ def charChanged(self, event):
         fitID = self.mainFrame.fitMultiSwitch.getActiveFit()
         charID = self.getActiveCharacter()
 
-        cFit = controller.Fit.getInstance()
+        cFit = service.Fit.getInstance()
         cFit.changeChar(fitID, charID)
 
         wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
@@ -95,13 +95,13 @@ def fitChanged(self, event):
         self.Enable(event.fitID != None)
 
         choice = self.charChoice
-        cFit = controller.Fit.getInstance()
+        cFit = service.Fit.getInstance()
         currCharID = choice.GetClientData(choice.GetCurrentSelection())
         fit = cFit.getFit(event.fitID)
         newCharID = fit.character.ID if fit is not None else None
 
         if newCharID == None:
-            cChar = controller.Character.getInstance()
+            cChar = service.Character.getInstance()
             self.selectChar(cChar.all0ID())
         elif currCharID != newCharID:
             self.selectChar(newCharID)

gui/droneView.py

@@ -19,7 +19,7 @@
 
 import wx
 
-import controller
+import service
 import gui.fittingView as fv
 import gui.marketBrowser as mb
 import gui.builtinViewColumns.display as d
@@ -41,15 +41,15 @@ def __init__(self, parent):
         self.Bind(wx.EVT_LEFT_DOWN, self.click)
 
     def fitChanged(self, event):
-        cFit = controller.Fit.getInstance()
+        cFit = service.Fit.getInstance()
         fit = cFit.getFit(event.fitID)
 
         stuff = fit.drones if fit is not None else None
         self.populate(stuff)
         self.refresh(stuff)
 
     def addItem(self, event):
-        cFit = controller.Fit.getInstance()
+        cFit = service.Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         trigger = cFit.addDrone(fitID, event.itemID)
         if trigger:
@@ -63,7 +63,7 @@ def removeItem(self, event):
             col = self.getColumn(event.Position)
             if col != self.getColIndex(DroneCheckbox):
                 fitID = self.mainFrame.getActiveFit()
-                cFit = controller.Fit.getInstance()
+                cFit = service.Fit.getInstance()
                 cFit.removeDrone(fitID, self.GetItemData(row))
                 wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
 
@@ -73,6 +73,6 @@ def click(self, event):
             col = self.getColumn(event.Position)
             if col == self.getColIndex(DroneCheckbox):
                 fitID = self.mainFrame.getActiveFit()
-                cFit = controller.Fit.getInstance()
+                cFit = service.Fit.getInstance()
                 cFit.toggleDrone(fitID, row)
                 wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))

gui/fittingView.py

@@ -19,7 +19,7 @@
 
 import wx
 import wx.lib.newevent
-import controller
+import service
 import gui.mainFrame
 import gui.builtinViewColumns.display as d
 import sys
@@ -52,7 +52,7 @@ def changeFit(self, fitID):
     def appendItem(self, itemID):
         fitID = self.activeFitID
         if fitID != None:
-            cFit = controller.Fit.getInstance()
+            cFit = service.Fit.getInstance()
             populate = cFit.appendModule(fitID, itemID)
             if populate:
                 self.slotsChanged()
@@ -62,15 +62,15 @@ def appendItem(self, itemID):
     def removeItem(self, event):
         row, _ = self.HitTest(event.Position)
         if row != -1:
-            cFit = controller.Fit.getInstance()
+            cFit = service.Fit.getInstance()
             populate = cFit.removeModule(self.activeFitID, self.mods[self.GetItemData(row)].position)
 
             if populate is not None:
                 if populate: self.slotsChanged()
                 wx.PostEvent(self.mainFrame, FitChanged(fitID=self.activeFitID))
 
     def generateMods(self):
-        cFit = controller.Fit.getInstance()
+        cFit = service.Fit.getInstance()
         fit = cFit.getFit(self.activeFitID)
 
         slotOrder = [Slot.SUBSYSTEM, Slot.HIGH, Slot.MED, Slot.LOW, Slot.RIG]

gui/marketBrowser.py

@@ -20,7 +20,7 @@
 import sys
 import wx
 import wx.lib.newevent
-import controller
+import service
 import bitmapLoader
 from gui.itemStats import ItemStatsMenu
 import gui.mainFrame
@@ -91,7 +91,7 @@ def __init__(self, parent):
         self.itemImageList = wx.ImageList(16, 16)
         self.itemView.SetImageList(self.itemImageList, wx.IMAGE_LIST_SMALL)
 
-        cMarket = controller.Market.getInstance()
+        cMarket = service.Market.getInstance()
 
         root = cMarket.getMarketRoot()
         for id, name, iconFile in root:
@@ -152,7 +152,7 @@ def expandLookup(self, event):
         root = event.Item
         child, cookie = self.marketView.GetFirstChild(root)
         if self.marketView.GetItemText(child) == "dummy":
-            cMarket = controller.Market.getInstance()
+            cMarket = service.Market.getInstance()
             #A DUMMY! Keeeel!!! EBUL DUMMY MUST DIAF!
             self.marketView.Delete(child)
 
@@ -178,7 +178,7 @@ def selectionMade(self, event):
             if self.marketView.GetChildrenCount(root) != 0:
                 return
 
-            cMarket = controller.Market.getInstance()
+            cMarket = service.Market.getInstance()
             idNameMap = {}
             for id, name, iconFile in cMarket.getVariations(self.marketView.GetPyData(root)):
                 iconId = self.addItemViewImage(iconFile)
@@ -196,7 +196,7 @@ def selectionMade(self, event):
 
     def toggleMetagroup(self, event):
         ctrl = wx.GetMouseState().ControlDown()
-        cMarket = controller.Market.getInstance()
+        cMarket = service.Market.getInstance()
         btn = event.EventObject
         if not ctrl:
             for name in ("normal", "faction", "complex", "officer"):
@@ -233,7 +233,7 @@ def startSearch(self, event):
             self.clearSearch(event, False)
             return
 
-        cMarket = controller.Market.getInstance()
+        cMarket = service.Market.getInstance()
         if not self.searching:
             for name in ("normal", "faction", "complex", "officer"):
                 getattr(self, name).SetValue(True)
@@ -249,7 +249,7 @@ def clearSearch(self, event, clear=True):
         if clear:
             self.search.Clear()
 
-        cMarket = controller.Market.getInstance()
+        cMarket = service.Market.getInstance()
         for name in ("normal", "faction", "complex", "officer"):
             btn = getattr(self, name)
             btn.Enable(True)
@@ -268,7 +268,7 @@ def filteredSearchAdd(self):
         idNameMap = {}
         idGroupMap = {}
         usedMetas = set()
-        cMarket = controller.Market.getInstance()
+        cMarket = service.Market.getInstance()
         for id, name, group, metaGroupID, iconFile in self.searchResults:
             usedMetas.add(metaGroupID)
             if cMarket.isMetaIdActive(metaGroupID):

gui/multiSwitch.py

@@ -23,7 +23,7 @@
 import gui.fittingView as fv
 import gui.marketBrowser as mb
 import gui.shipBrowser as sb
-import controller
+import service
 
 class MultiSwitch(wx.Notebook):
     def __init__(self, parent):
@@ -104,7 +104,7 @@ def setTabTitle(self, tab, fitID):
                 self.SetPageText(tab, "Empty Tab")
                 self.SetPageImage(tab, -1)
             else:
-                cFit = controller.Fit.getInstance()
+                cFit = service.Fit.getInstance()
                 fit = cFit.getFit(fitID)
                 self.SetPageText(tab, "%s: %s" % (fit.ship.item.name, fit.name))
                 bitmap = bitmapLoader.getBitmap("race_%s_small" % fit.ship.item.race, "icons")