Cargo works, but needs a more TLC

gui/additionsPane.py

@@ -21,6 +21,7 @@ import wx
 import gui.mainFrame
 from gui.boosterView import BoosterView
 from gui.droneView import DroneView
+from gui.cargoView import CargoView
 from gui.implantView import ImplantView
 from gui.projectedView import ProjectedView
 from gui.pyfatogglepanel import TogglePanel
@@ -55,8 +56,10 @@ class AdditionsPane(TogglePanel):
         boosterImg = bitmapLoader.getImage("booster_small", "icons")
         projectedImg = bitmapLoader.getImage("projected_small", "icons")
         gangImg = bitmapLoader.getImage("fleet_fc_small", "icons")
+        cargoImg = bitmapLoader.getImage("cargo_small", "icons")
 
         self.notebook.AddPage(DroneView(self.notebook), "Drones", tabImage = droneImg, showClose = False)
+        self.notebook.AddPage(CargoView(self.notebook), "Cargo", tabImage = cargoImg, showClose = False)
         self.notebook.AddPage(ImplantView(self.notebook), "Implants", tabImage = implantImg, showClose = False)
         self.notebook.AddPage(BoosterView(self.notebook), "Boosters", tabImage = boosterImg, showClose = False)
 
@@ -68,6 +71,6 @@ class AdditionsPane(TogglePanel):
         self.notebook.SetSelection(0)
 
 
-    PANES = ["Drones", "Implants", "Boosters", "Projected", "Fleet"]
+    PANES = ["Drones", "Cargo", "Implants", "Boosters", "Projected", "Fleet"]
     def select(self, name):
         self.notebook.SetSelection(self.PANES.index(name))

gui/builtinContextMenus/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["moduleAmmoPicker", "itemStats", "damagePattern", "marketJump", "droneSplit", "itemRemove",
-           "droneRemoveStack", "ammoPattern", "project", "factorReload", "whProjector"]
+           "droneRemoveStack", "ammoPattern", "project", "factorReload", "whProjector", "cargo"]

gui/builtinContextMenus/cargo.py

@@ -0,0 +1,101 @@
+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
+
+class Cargo(ContextMenu):
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def display(self, srcContext, selection):
+        # Make sure context menu registers in the correct view
+        if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None:
+            return False
+
+        item = selection[0]
+        sFit = service.Fit.getInstance()
+
+        return sFit.isAmmo(item.ID)
+
+    def getText(self, itmContext, selection):
+        return "Add {0} to Cargo".format(itmContext)
+
+    def activate(self, fullContext, selection, i):
+        sFit = service.Fit.getInstance()
+        fitID = self.mainFrame.getActiveFit()
+
+        cargo = eos.types.Cargo(selection[0])
+
+        dlg = CargoChanger(self.mainFrame, cargo, fullContext)
+        dlg.ShowModal()
+        dlg.Destroy()
+
+        wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+
+Cargo.register()
+
+class CargoAmount(ContextMenu):
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def display(self, srcContext, selection):
+        return srcContext in ("cargoItem",) and selection[0].amount >= 0
+
+    def getText(self, itmContext, selection):
+        return "Change {0} Quantity".format(itmContext)
+
+    def activate(self, fullContext, selection, i):
+        srcContext = fullContext[0]
+        dlg = CargoChanger(self.mainFrame, selection[0], srcContext)
+        dlg.ShowModal()
+        dlg.Destroy()
+
+CargoAmount.register()
+
+class CargoChanger(wx.Dialog):
+
+    def __init__(self, parent, cargo, context):
+        wx.Dialog.__init__(self, parent, title="Select Amount", size=wx.Size(220, 60))
+        self.cargo = cargo
+        self.context = context
+
+        bSizer1 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.input = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+
+        bSizer1.Add(self.input, 0, wx.ALL, 5)
+        self.input.Bind(wx.EVT_CHAR, self.onChar)
+        self.button = wx.Button(self, wx.ID_OK, u"Change")
+        bSizer1.Add(self.button, 0, wx.ALL, 5)
+
+        self.SetSizer(bSizer1)
+        self.Layout()
+        self.Centre(wx.BOTH)
+        self.button.Bind(wx.EVT_BUTTON, self.change)
+
+    def change(self, event):
+        sFit = service.Fit.getInstance()
+        mainFrame = gui.mainFrame.MainFrame.getInstance()
+        fitID = mainFrame.getActiveFit()
+
+        sFit.addChangeCargo(fitID, self.cargo, int(self.input.GetLineText(0)))
+
+        wx.PostEvent(mainFrame, GE.FitChanged(fitID=fitID))
+        event.Skip()
+
+    ## checks to make sure it's valid number
+    def onChar(self, event):
+        key = event.GetKeyCode()
+
+        acceptable_characters = "1234567890"
+        acceptable_keycode    = [3, 22, 13, 8, 127] # modifiers like delete, copy, paste
+
+        if key in acceptable_keycode or key >= 255 or (key < 255 and chr(key) in acceptable_characters):
+            event.Skip()
+            return
+        else:
+            return False
+

gui/builtinStatsViews/priceViewFull.py

@@ -102,6 +102,9 @@ class PriceViewFull(StatsView):
             for drone in fit.drones:
                 for _ in xrange(drone.amount):
                     typeIDs.append(drone.itemID)
+            for cargo in fit.cargo:
+                for _ in xrange(cargo.amount):
+                    typeIDs.append(cargo.itemID)
             if self._timer:
                 if self._timer.IsRunning():
                     self._timer.Stop()

gui/builtinViewColumns/baseName.py

@@ -22,7 +22,7 @@ from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 import wx
-from eos.types import Drone, Fit, Module, Slot, Rack
+from eos.types import Drone, Cargo, Fit, Module, Slot, Rack
 import service
 
 class BaseName(ViewColumn):
@@ -36,6 +36,8 @@ class BaseName(ViewColumn):
     def getText(self, stuff):
         if isinstance(stuff, Drone):
             return "%dx %s" % (stuff.amount, stuff.item.name)
+        elif isinstance(stuff, Cargo):
+            return "%dx %s" % (stuff.amount, stuff.item.name)
         elif isinstance(stuff, Fit):
             return "%s (%s)" % (stuff.name, stuff.ship.item.name)
         elif isinstance(stuff, Rack):

gui/cargoView.py

@@ -0,0 +1,115 @@
+#===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+import wx
+import service
+import gui.display as d
+import gui.marketBrowser as mb
+from gui.builtinViewColumns.state import State
+from gui.contextMenu import ContextMenu
+import globalEvents as GE
+
+#  @todo: Was copied form another class and modified. Look through entire file, refine
+class CargoView(d.Display):
+    DEFAULT_COLS = ["Base Name"]
+
+    def __init__(self, parent):
+        d.Display.__init__(self, parent, style=wx.LC_SINGLE_SEL | wx.BORDER_NONE)
+
+        self.lastFitId = None
+
+        self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
+        #self.mainFrame.Bind(mb.ITEM_SELECTED, self.addItem)
+        self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)
+        self.Bind(wx.EVT_KEY_UP, self.kbEvent)
+
+        if "__WXGTK__" in  wx.PlatformInfo:
+            self.Bind(wx.EVT_RIGHT_UP, self.scheduleMenu)
+        else:
+            self.Bind(wx.EVT_RIGHT_DOWN, self.scheduleMenu)
+
+    def kbEvent(self,event):
+        keycode = event.GetKeyCode()
+        if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
+            fitID = self.mainFrame.getActiveFit()
+            cFit = service.Fit.getInstance()
+            row = self.GetFirstSelected()
+            if row != -1:
+                cFit.removeCargo(fitID, self.GetItemData(row))
+                wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+        event.Skip()
+
+    def fitChanged(self, event):
+        #Clear list and get out if current fitId is None
+        if event.fitID is None and self.lastFitId is not None:
+            self.DeleteAllItems()
+            self.lastFitId = None
+            event.Skip()
+            return
+
+        cFit = service.Fit.getInstance()
+        fit = cFit.getFit(event.fitID)
+
+        self.original = fit.cargo if fit is not None else None
+        self.cargo = stuff = fit.cargo if fit is not None else None
+        if stuff is not None: stuff.sort(key=lambda cargo: cargo.itemID)
+
+        if event.fitID != self.lastFitId:
+            self.lastFitId = event.fitID
+
+            item = self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_DONTCARE)
+
+            if item != -1:
+                self.EnsureVisible(item)
+
+            self.deselectItems()
+
+        self.populate(stuff)
+        self.refresh(stuff)
+        event.Skip()
+
+    def removeItem(self, event):
+        row, _ = self.HitTest(event.Position)
+        if row != -1:
+            col = self.getColumn(event.Position)
+            if col != self.getColIndex(State):
+                fitID = self.mainFrame.getActiveFit()
+                cFit = service.Fit.getInstance()
+                cargo = self.cargo[self.GetItemData(row)]
+                cFit.removeCargo(fitID, self.original.index(cargo))
+                wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+
+    def scheduleMenu(self, event):
+        event.Skip()
+        if self.getColumn(event.Position) != self.getColIndex(State):
+            wx.CallAfter(self.spawnMenu)
+
+    def spawnMenu(self):
+        sel = self.GetFirstSelected()
+        if sel != -1:
+            cFit = service.Fit.getInstance()
+            fit = cFit.getFit(self.mainFrame.getActiveFit())
+            cargo = fit.cargo[sel]
+
+            sMkt = service.Market.getInstance()
+            sourceContext = "cargoItem"
+            itemContext = sMkt.getCategoryByItem(cargo.item).name
+
+            menu = ContextMenu.getMenu((cargo,), (sourceContext, itemContext))
+            self.PopupMenu(menu)