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

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
HomeWorld
2010-10-21 12:38:17 +03:00
parent ab2ffc68a5 415f126356
commit a343f6fd16
12 changed files with 150 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/additionsPane.py
View File

@@ -49,7 +49,6 @@ class AdditionsPane(TogglePanel):
size.SetHeight(200)
self.notebook.SetMinSize(size)
baseSizer.Add(self.notebook, 1, wx.EXPAND)
self.notebook.AddPage(DroneView(self.notebook), "Drones")
self.notebook.AddPage(ImplantView(self.notebook), "Implants")
self.notebook.AddPage(BoosterView(self.notebook), "Boosters")
@@ -57,3 +56,6 @@ class AdditionsPane(TogglePanel):
# self.Expand()
PANES = ["Drones", "Implants", "Boosters"]
def select(self, name):
self.notebook.SetSelection(self.PANES.index(name))

1
gui/boosterView.py
View File

@@ -48,6 +48,7 @@ class BoosterView(d.Display):
trigger = cFit.addBooster(fitID, event.itemID)
if trigger:
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
self.mainFrame.additionsPane.select("Boosters")
event.Skip()

2
gui/builtinContextMenus/__init__.py
View File

@@ -1 +1 @@
__all__ = ["moduleAmmoPicker", "itemStats", "damagePattern"]
__all__ = ["moduleAmmoPicker", "itemStats", "damagePattern", "marketJump"]

26
gui/builtinContextMenus/marketJump.py Normal file
View File

@@ -0,0 +1,26 @@
from gui.contextMenu import ContextMenu
from gui.itemStats import ItemStatsDialog
import gui.mainFrame
import service
class MarketJump(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
def display(self, context, selection):
return context in ("module", "ammo", "itemSearch") and (not selection[0].isEmpty if context == "module" else True)
def getText(self, context, selection):
return "Jump to %s Market Group" % (context.capitalize() if context != "itemSearch" else "Item")
def activate(self, context, selection, i):
if context == "module":
item = selection[0].item
elif context == "ammo":
item = selection[0].charge
else:
item = selection[0]
self.mainFrame.marketBrowser.jump(item)
MarketJump.register()

21
gui/builtinContextMenus/moduleAmmoPicker.py
View File

@@ -24,7 +24,7 @@ class ModuleAmmoPicker(ContextMenu):
validCharges = currCharges
self.charges = list(validCharges)
self.hardpoint = mod.hardpoint
self.module = mod
return len(self.charges) > 0
def getText(self, context, selection):
@@ -34,23 +34,15 @@ class ModuleAmmoPicker(ContextMenu):
pass
def turretSorter(self, charge):
s = []
damage = 0
range = charge.getAttribute("weaponRangeMultiplier")
falloff = charge.getAttribute("fallofMultiplier") or 1
types = []
range = self.module.getModifiedItemAttr("maxRange") * charge.getAttribute("weaponRangeMultiplier")
falloff = self.module.getModifiedItemAttr("falloff") * (charge.getAttribute("fallofMultiplier") or 1)
for type in ("em", "explosive", "kinetic", "thermal"):
d = charge.getAttribute("%sDamage" % type)
if d > 0:
types.append(type)
damage += d
s.append(-range)
s.append(-falloff)
s.append(charge.name.rsplit()[-2:])
s.append(damage)
s.append(charge.name)
return s
return (-range - falloff, charge.name.rsplit()[-2:], damage, charge.name)
MISSILE_ORDER = ["em", "thermal", "kinetic", "explosive"]
def missileSorter(self, charge):
@@ -86,7 +78,8 @@ class ModuleAmmoPicker(ContextMenu):
m = wx.Menu()
m.Bind(wx.EVT_MENU, self.handleAmmoSwitch)
self.chargeIds = {}
if self.hardpoint == Hardpoint.TURRET:
hardpoint = self.module.hardpoint
if hardpoint == Hardpoint.TURRET:
self.addSeperator(m, "Long Range")
items = []
range = None
@@ -122,7 +115,7 @@ class ModuleAmmoPicker(ContextMenu):
m.AppendItem(item)
self.addSeperator(m, "High Damage")
elif self.hardpoint == Hardpoint.MISSILE:
elif hardpoint == Hardpoint.MISSILE:
self.charges.sort(key=self.missileSorter)
type = None
sub = None

2
gui/builtinViewColumns/__init__.py
View File

@@ -1,3 +1,3 @@
__all__ = ["moduleState", "moduleNameOrSlot", "attributeDisplay", "maxRange",
"name", "droneDps", "droneNameAmount", "droneCheckbox", "moduleAmmo",
"capacitorUse"]
"capacitorUse", "implantCheckbox"]

47
gui/builtinViewColumns/implantCheckbox.py Normal file
View File

@@ -0,0 +1,47 @@
#===============================================================================
# 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/>.
#===============================================================================
from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
import gui.mainFrame
import wx
class ImplantCheckbox(ViewColumn):
name = "Implant Checkbox"
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
self.resizable = False
self.size = 24
for name, state in (("checked", wx.CONTROL_CHECKED), ("unchecked", 0)):
bitmap = wx.EmptyBitmap(16, 16)
dc = wx.MemoryDC()
dc.SelectObject(bitmap)
dc.SetBackground(wx.TheBrushList.FindOrCreateBrush(fittingView.GetBackgroundColour(), wx.SOLID))
dc.Clear()
wx.RendererNative.Get().DrawCheckBox(fittingView, dc, wx.Rect(0, 0, 16, 16), state)
dc.Destroy()
setattr(self, "%sId" % name, fittingView.imageList.Add(bitmap))
def getText(self, mod):
return ""
def getImageId(self, implant):
return self.checkedId if implant.active else self.uncheckedId
ImplantCheckbox.register()

1
gui/droneView.py
View File

@@ -55,6 +55,7 @@ class DroneView(d.Display):
trigger = cFit.addDrone(fitID, event.itemID)
if trigger:
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
self.mainFrame.additionsPane.select("Drones")
event.Skip()

33
gui/fittingView.py
View File

@@ -70,13 +70,14 @@ class FittingView(d.Display):
self.Bind(wx.EVT_RIGHT_DOWN, self.click)
def startDrag(self, event):
data = wx.PyTextDataObject()
row = event.GetIndex()
data.SetText(str(self.GetItemData(row)))
if row != -1:
data = wx.PyTextDataObject()
data.SetText(str(self.GetItemData(row)))
dropSource = wx.DropSource(self)
dropSource.SetData(data)
res = dropSource.DoDragDrop()
dropSource = wx.DropSource(self)
dropSource.SetData(data)
res = dropSource.DoDragDrop()
def getSelectedMods(self):
@@ -226,18 +227,18 @@ class FittingView(d.Display):
def click(self, event):
event.Skip()
row, _ = self.HitTest(event.Position)
sel = []
curr = self.GetFirstSelected()
while curr != -1:
sel.append(curr)
curr = self.GetNextSelected(curr)
if curr not in sel:
mods = [self.mods[self.GetItemData(row)]]
else:
mods = self.getSelectedMods()
if row != -1:
sel = []
curr = self.GetFirstSelected()
while curr != -1:
sel.append(curr)
curr = self.GetNextSelected(curr)
if curr not in sel:
mods = [self.mods[self.GetItemData(row)]]
else:
mods = self.getSelectedMods()
col = self.getColumn(event.Position)
if col == self.getColIndex(ModuleState):
sFit = service.Fit.getInstance()

19
gui/implantView.py
View File

@@ -22,9 +22,11 @@ import service
import gui.display as d
import gui.fittingView as fv
import gui.marketBrowser as mb
from gui.builtinViewColumns.implantCheckbox import ImplantCheckbox
class ImplantView(d.Display):
DEFAULT_COLS = ["Name",
DEFAULT_COLS = ["Implant Checkbox",
"Name",
"attr:implantness"]
def __init__(self, parent):
@@ -33,6 +35,7 @@ class ImplantView(d.Display):
self.mainFrame.Bind(mb.ITEM_SELECTED, self.addItem)
self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)
self.Bind(wx.EVT_KEY_UP, self.kbEvent)
self.Bind(wx.EVT_LEFT_DOWN, self.click)
def kbEvent(self,event):
keycode = event.GetKeyCode()
@@ -44,6 +47,7 @@ class ImplantView(d.Display):
cFit.removeImplant(fitID, self.GetItemData(row))
row = self.GetNextSelected(row)
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
def fitChanged(self, event):
cFit = service.Fit.getInstance()
fit = cFit.getFit(event.fitID)
@@ -59,6 +63,7 @@ class ImplantView(d.Display):
trigger = cFit.addImplant(fitID, event.itemID)
if trigger:
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
self.mainFrame.additionsPane.select("Implants")
event.Skip()
@@ -68,4 +73,14 @@ class ImplantView(d.Display):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeImplant(fitID, self.GetItemData(row))
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
def click(self, event):
row, _ = self.HitTest(event.Position)
if row != -1:
col = self.getColumn(event.Position)
if col == self.getColIndex(ImplantCheckbox):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.toggleImplant(fitID, row)
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))

19
gui/marketBrowser.py
View File

@@ -129,6 +129,25 @@ class MarketBrowser(wx.Panel):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
def jump(self, item):
mg = item.marketGroup
jumpList = []
while mg is not None:
jumpList.append(mg.ID)
mg = mg.parent
item = self.marketRoot
for i in range(len(jumpList) -1, -1, -1):
target = jumpList[i]
child, cookie = self.marketView.GetFirstChild(item)
while self.marketView.GetItemPyData(child) != target:
child, cookie = self.marketView.GetNextChild(child, cookie)
item = child
self.marketView.Expand(item)
self.marketView.SelectItem(item)
def addMarketViewImage(self, iconFile):
if iconFile is None:
return -1

10
service/fit.py
View File

@@ -234,6 +234,16 @@ class Fit(object):
fit.calculateModifiedAttributes()
return True
def toggleImplant(self, fitID, i):
fit = eos.db.getFit(fitID)
implant = fit.implants[i]
implant.active = not implant.active
eos.db.commit()
fit.clear()
fit.calculateModifiedAttributes()
return True
def changeChar(self, fitID, charID):
if fitID is None or charID is None:
return