dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge pull request #1194 from petosorus/pricing-pane-1158

Browse Source 
Pricing pane 1158
This commit is contained in:
Ryan Holmes
2017-05-30 21:42:05 -04:00
committed by GitHub
parent cff3d0ee95 33410f0618
commit 2ec9c5addb
5 changed files with 121 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
gui/builtinContextMenus/priceOptions.py Normal file
View File

@@ -0,0 +1,50 @@
import wx
import gui.globalEvents as GE
import gui.mainFrame
from gui.contextMenu import ContextMenu
from service.settings import PriceMenuSettings
class PriceOptions(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = PriceMenuSettings.getInstance()
self.optionList = ["Ship", "Modules", "Drones", "Cargo", "Character"]
def display(self, srcContext, selection):
return srcContext in ("priceViewFull", "priceViewMinimal")
def getText(self, itmContext, selection):
return "Include in total"
def addOption(self, menu, option):
label = option
id = ContextMenu.nextID()
self.optionIds[id] = option
menuItem = wx.MenuItem(menu, id, label, kind=wx.ITEM_CHECK)
menu.Bind(wx.EVT_MENU, self.handleMode, menuItem)
return menuItem
def getSubMenu(self, context, selection, rootMenu, i, pitem):
msw = True if "wxMSW" in wx.PlatformInfo else False
self.context = context
self.optionIds = {}
sub = wx.Menu()
for option in self.optionList:
menuItem = self.addOption(rootMenu if msw else sub, option)
sub.AppendItem(menuItem)
menuItem.Check(self.settings.get(option.lower()))
return sub
def handleMode(self, event):
option = self.optionIds[event.Id]
self.settings.set(option.lower(), event.Int)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
PriceOptions.register()

30
gui/builtinStatsViews/priceViewFull.py
View File

@@ -19,10 +19,12 @@
# noinspection PyPackageRequirements
import wx
from gui.statsView import StatsView
from gui.bitmapLoader import BitmapLoader
from gui.statsView import StatsView
from gui.utils.numberFormatter import formatAmount
from service.price import Price
from service.settings import PriceMenuSettings
class PriceViewFull(StatsView):
@@ -31,6 +33,7 @@ class PriceViewFull(StatsView):
def __init__(self, parent):
StatsView.__init__(self)
self.parent = parent
self.settings = PriceMenuSettings.getInstance()
def getHeaderText(self, fit):
return "Price"
@@ -49,7 +52,7 @@ class PriceViewFull(StatsView):
gridPrice = wx.GridSizer(2, 3)
contentSizer.Add(gridPrice, 0, wx.EXPAND | wx.ALL, 0)
for _type in ("ship", "fittings", "drones", "cargoBay", "character", "total"):
for _type in ("ship", "fittings", "total", "drones", "cargoBay", "character"):
if _type in "ship":
image = "ship_big"
elif _type in ("fittings", "total"):
@@ -125,8 +128,18 @@ class PriceViewFull(StatsView):
for implant in fit.implants:
implant_price += implant.item.price.price
fitting_price = module_price + drone_price + fighter_price + cargo_price + booster_price + implant_price
total_price = ship_price + fitting_price
total_price = 0
if (self.settings.get("ship")):
total_price += ship_price
if (self.settings.get("modules")):
total_price += module_price
if (self.settings.get("drones")):
total_price += drone_price + fighter_price
if (self.settings.get("cargo")):
total_price += cargo_price
if (self.settings.get("character")):
total_price += booster_price + implant_price
self.labelPriceShip.SetLabel("%s ISK" % formatAmount(ship_price, 3, 3, 9, currency=True))
self.labelPriceShip.SetToolTip(wx.ToolTip('{:,.2f}'.format(ship_price)))
@@ -134,18 +147,19 @@ class PriceViewFull(StatsView):
self.labelPriceFittings.SetLabel("%s ISK" % formatAmount(module_price, 3, 3, 9, currency=True))
self.labelPriceFittings.SetToolTip(wx.ToolTip('{:,.2f}'.format(module_price)))
self.labelPriceTotal.SetLabel("%s ISK" % formatAmount(total_price, 3, 3, 9, currency=True))
self.labelPriceTotal.SetToolTip(wx.ToolTip('{:,.2f}'.format(total_price)))
self.labelPriceDrones.SetLabel("%s ISK" % formatAmount(drone_price + fighter_price, 3, 3, 9, currency=True))
self.labelPriceDrones.SetToolTip(wx.ToolTip('{:,.2f}'.format(drone_price + fighter_price)))
self.labelPriceCargobay.SetLabel("%s ISK" % formatAmount(cargo_price, 3, 3, 9, currency=True))
self.labelPriceCargobay.SetToolTip(wx.ToolTip('{:,.2f}'.format(cargo_price)))
self.labelPriceCharacter.SetLabel("%s ISK" % formatAmount(booster_price + implant_price, 3, 3, 9, currency=True))
self.labelPriceCharacter.SetLabel(
"%s ISK" % formatAmount(booster_price + implant_price, 3, 3, 9, currency=True))
self.labelPriceCharacter.SetToolTip(wx.ToolTip('{:,.2f}'.format(booster_price + implant_price)))
self.labelPriceTotal.SetLabel("%s ISK" % formatAmount(total_price, 3, 3, 9, currency=True))
self.labelPriceTotal.SetToolTip(wx.ToolTip('{:,.2f}'.format(total_price)))
def processPrices(self, prices):
self.refreshPanelPrices(self.fit)

18
gui/builtinStatsViews/priceViewMinimal.py
View File

@@ -23,6 +23,7 @@ from gui.statsView import StatsView
from gui.bitmapLoader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
from service.price import Price
from service.settings import PriceMenuSettings
class PriceViewMinimal(StatsView):
@@ -31,6 +32,7 @@ class PriceViewMinimal(StatsView):
def __init__(self, parent):
StatsView.__init__(self)
self.parent = parent
self.settings = PriceMenuSettings.getInstance()
def getHeaderText(self, fit):
return "Price"
@@ -119,8 +121,20 @@ class PriceViewMinimal(StatsView):
for implant in fit.implants:
implant_price += implant.item.price.price
fitting_price = module_price + drone_price + fighter_price + cargo_price + booster_price + implant_price
total_price = ship_price + fitting_price
fitting_price = module_price
total_price = 0
if (self.settings.get("ship")):
total_price += ship_price
if (self.settings.get("modules")):
total_price += module_price
if (self.settings.get("drones")):
total_price += drone_price + fighter_price
if (self.settings.get("cargo")):
total_price += cargo_price
if (self.settings.get("character")):
total_price += booster_price + implant_price
self.labelPriceShip.SetLabel("%s ISK" % formatAmount(ship_price, 3, 3, 9, currency=True))
self.labelPriceShip.SetToolTip(wx.ToolTip('{:,.2f}'.format(ship_price)))

1
gui/contextMenu.py
View File

@@ -199,6 +199,7 @@ from gui.builtinContextMenus import ( # noqa: E402,F401
tacticalMode,
targetResists,
priceClear,
priceOptions,
amount,
cargoAmmo,
droneStack,

32
service/settings.py
View File

@@ -421,6 +421,38 @@ class StatViewSettings(object):
self.serviceStatViewDefaultSettings[type] = value
class PriceMenuSettings(object):
_instance = None
@classmethod
def getInstance(cls):
if cls._instance is None:
cls._instance = PriceMenuSettings()
return cls._instance
def __init__(self):
# mode
# 0 - Do not add to total
# 1 - Add to total
PriceMenuDefaultSettings = {
"ship" : 1,
"modules" : 1,
"drones" : 0,
"cargo" : 0,
"character" : 0
}
self.PriceMenuDefaultSettings = SettingsProvider.getInstance().getSettings("pyfaPriceMenuSettings",
PriceMenuDefaultSettings)
def get(self, type):
return self.PriceMenuDefaultSettings[type]
def set(self, type, value):
self.PriceMenuDefaultSettings[type] = value
class ContextMenuSettings(object):
_instance = None