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

Roll up #967 and #974

Browse Source 
Takes the import fixes and cleanup out of those and rolls it into this
one
This commit is contained in:
Ebag333
2017-02-08 13:12:54 -08:00
parent 25182de365
commit e18deb5eeb
17 changed files with 53 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eos/__init__.py
View File

@@ -1,8 +1,2 @@
version = "0.2.3"
tag = "git"
def test():
import tests.runTests
import unittest
unittest.main(defaultTest="discover", testLoader=tests.runTests.loader)

4
eos/db/__init__.py
View File

@@ -67,8 +67,8 @@ if saveddata_connectionstring is not None:
sd_lock = threading.Lock()
# Import all the definitions for all our database stuff
from eos.db.gamedata import *
from eos.db.saveddata import *
from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, miscData, module, override, price, queries, skill, targetResists, user
# Import queries
from eos.db.gamedata.queries import *

10
gui/additionsPane.py
View File

@@ -18,7 +18,6 @@
# =============================================================================
import wx
import gui.mainFrame
from gui.boosterView import BoosterView
from gui.droneView import DroneView
from gui.fighterView import FighterView
@@ -31,7 +30,7 @@ from gui.notesView import NotesView
from gui.pyfatogglepanel import TogglePanel
from gui.bitmapLoader import BitmapLoader
import gui.chromeTabs
from gui.chromeTabs import PFNotebook
class AdditionsPane(TogglePanel):
@@ -45,9 +44,7 @@ class AdditionsPane(TogglePanel):
baseSizer = wx.BoxSizer(wx.HORIZONTAL)
pane.SetSizer(baseSizer)
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.notebook = gui.chromeTabs.PFNotebook(pane, False)
self.notebook = PFNotebook(pane, False)
self.notebook.SetMinSize((-1, 1000))
baseSizer.Add(self.notebook, 1, wx.EXPAND)
@@ -92,9 +89,6 @@ class AdditionsPane(TogglePanel):
def select(self, name):
self.notebook.SetSelection(self.PANES.index(name))
def toggleBoosters(self, event):
self.notebook.ToggleShown(self.booster)
def getName(self, idx):
return self.PANES[idx]

4
gui/builtinContextMenus/moduleGlobalAmmoPicker.py
View File

@@ -3,7 +3,7 @@ import gui.mainFrame
import wx
import gui.globalEvents as GE
from gui.builtinContextMenus.moduleAmmoPicker import ModuleAmmoPicker
import eos.db
from eos.db.saveddata.queries import getFit as db_getFit
from service.fit import Fit
@@ -26,7 +26,7 @@ class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
sFit = Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
fit = eos.db.getFit(fitID)
fit = db_getFit(fitID)
selectedModule = self.modules[0]
allModules = []

4
gui/builtinStatsViews/resourcesViewFull.py
View File

@@ -22,7 +22,7 @@ from gui.statsView import StatsView
from gui.bitmapLoader import BitmapLoader
from gui import pygauge as PG
import gui.mainFrame
import gui.chromeTabs
from gui.chromeTabs import EVT_NOTEBOOK_PAGE_CHANGED
from eos.saveddata.module import Hardpoint
@@ -37,7 +37,7 @@ class ResourcesViewFull(StatsView):
StatsView.__init__(self)
self.parent = parent
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.mainFrame.additionsPane.notebook.Bind(gui.chromeTabs.EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged)
self.mainFrame.additionsPane.notebook.Bind(EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged)
def pageChanged(self, event):
page = self.mainFrame.additionsPane.getName(event.GetSelection())

6
gui/builtinViews/emptyView.py
View File

@@ -1,6 +1,6 @@
import wx
import gui.globalEvents as GE
import gui.chromeTabs
from gui.chromeTabs import EVT_NOTEBOOK_PAGE_CHANGED
import gui.mainFrame
@@ -11,13 +11,13 @@ class BlankPage(wx.Panel):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
self.parent.Bind(gui.chromeTabs.EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged)
self.parent.Bind(EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged)
self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=None))
def Destroy(self):
self.parent.Unbind(gui.chromeTabs.EVT_NOTEBOOK_PAGE_CHANGED, handler=self.pageChanged)
self.parent.Unbind(EVT_NOTEBOOK_PAGE_CHANGED, handler=self.pageChanged)
wx.Panel.Destroy(self)
def pageChanged(self, event):

4
gui/contextMenu.py
View File

@@ -177,4 +177,6 @@ class ContextMenu(object):
return None
from gui.builtinContextMenus import * # noqa
from gui.builtinContextMenus import ammoPattern, amount, cargo, changeAffectingSkills, damagePattern, droneRemoveStack, \
droneSplit, factorReload, fighterAbilities, implantSets, itemRemove, itemStats, marketJump, metaSwap, moduleAmmoPicker, \
moduleGlobalAmmoPicker, openFit, priceClear, project, shipJump, tacticalMode, targetResists, whProjector

6
gui/crestFittings.py
View File

@@ -10,7 +10,7 @@ from service.fit import Fit
from eos.saveddata.cargo import Cargo
from eos.db import getItem
import gui.display as d
from gui.display import Display
import gui.globalEvents as GE
if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
@@ -411,10 +411,10 @@ class FittingsTreeView(wx.Panel):
self.parent.fitView.update(list)
class FitView(d.Display):
class FitView(Display):
DEFAULT_COLS = ["Base Icon",
"Base Name"]
def __init__(self, parent):
d.Display.__init__(self, parent, style=wx.LC_SINGLE_SEL)
Display.__init__(self, parent, style=wx.LC_SINGLE_SEL)
self.fitSelection = None

12
gui/droneView.py
View File

@@ -20,8 +20,8 @@
import wx
import gui.globalEvents as GE
import gui.marketBrowser as mb
import gui.display as d
from gui.marketBrowser import ITEM_SELECTED, ItemSelected
from gui.display import Display
from gui.builtinViewColumns.state import State
from gui.contextMenu import ContextMenu
from service.fit import Fit
@@ -43,7 +43,7 @@ class DroneViewDrop(wx.PyDropTarget):
return t
class DroneView(d.Display):
class DroneView(Display):
DEFAULT_COLS = [
"State",
# "Base Icon",
@@ -56,7 +56,7 @@ class DroneView(d.Display):
]
def __init__(self, parent):
d.Display.__init__(self, parent, style=wx.LC_SINGLE_SEL | wx.BORDER_NONE)
Display.__init__(self, parent, style=wx.LC_SINGLE_SEL | wx.BORDER_NONE)
self.lastFitId = None
@@ -64,7 +64,7 @@ class DroneView(d.Display):
self.hoveredColumn = None
self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
self.mainFrame.Bind(mb.ITEM_SELECTED, self.addItem)
self.mainFrame.Bind(ITEM_SELECTED, self.addItem)
self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)
self.Bind(wx.EVT_LEFT_DOWN, self.click)
self.Bind(wx.EVT_KEY_UP, self.kbEvent)
@@ -141,7 +141,7 @@ class DroneView(d.Display):
if srcRow != -1 and dstRow != -1:
self._merge(srcRow, dstRow)
elif data[0] == "market":
wx.PostEvent(self.mainFrame, mb.ItemSelected(itemID=int(data[1])))
wx.PostEvent(self.mainFrame, ItemSelected(itemID=int(data[1])))
def _merge(self, src, dst):
sFit = Fit.getInstance()

2
gui/graph.py
View File

@@ -35,4 +35,4 @@ class Graph(object):
return None
from gui.builtinGraphs import * # noqa
from gui.builtinGraphs import fitDps

20
gui/mainFrame.py
View File

@@ -35,7 +35,7 @@ import config
from eos.config import gamedata_version
import gui.aboutData
import gui.chromeTabs
from gui.chromeTabs import PFNotebook
import gui.globalEvents as GE
from gui.bitmapLoader import BitmapLoader
@@ -55,7 +55,7 @@ from gui.graphFrame import GraphFrame
from gui.copySelectDialog import CopySelectDialog
from gui.utils.clipboard import toClipboard, fromClipboard
from gui.updateDialog import UpdateDialog
from gui.builtinViews import * # TODO: unsure if this is needed here
from gui.builtinViews import emptyView, entityEditor, fittingView, implantEditor
from gui import graphFrame
from service.settings import SettingsProvider
@@ -66,7 +66,7 @@ from service.update import Update
# import this to access override setting
from eos.modifiedAttributeDict import ModifiedAttributeDict
from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues
from eos import db
from eos.db.saveddata.queries import getFit as db_getFit
from service.port import Port
from service.settings import HTMLExportSettings
@@ -171,7 +171,7 @@ class MainFrame(wx.Frame):
self.fitMultiSwitch = MultiSwitch(self.fitting_additions_split)
self.additionsPane = AdditionsPane(self.fitting_additions_split)
self.notebookBrowsers = gui.chromeTabs.PFNotebook(self.browser_fitting_split, False)
self.notebookBrowsers = PFNotebook(self.browser_fitting_split, False)
marketImg = BitmapLoader.getImage("market_small", "gui")
shipBrowserImg = BitmapLoader.getImage("ship_small", "gui")
@@ -700,27 +700,27 @@ class MainFrame(wx.Frame):
self.marketBrowser.search.Focus()
def clipboardEft(self):
fit = db.getFit(self.getActiveFit())
fit = db_getFit(self.getActiveFit())
toClipboard(Port.exportEft(fit))
def clipboardEftImps(self):
fit = db.getFit(self.getActiveFit())
fit = db_getFit(self.getActiveFit())
toClipboard(Port.exportEftImps(fit))
def clipboardDna(self):
fit = db.getFit(self.getActiveFit())
fit = db_getFit(self.getActiveFit())
toClipboard(Port.exportDna(fit))
def clipboardCrest(self):
fit = db.getFit(self.getActiveFit())
fit = db_getFit(self.getActiveFit())
toClipboard(Port.exportCrest(fit))
def clipboardXml(self):
fit = db.getFit(self.getActiveFit())
fit = db_getFit(self.getActiveFit())
toClipboard(Port.exportXml(None, fit))
def clipboardMultiBuy(self):
fit = db.getFit(self.getActiveFit())
fit = db_getFit(self.getActiveFit())
toClipboard(Port.exportMultiBuy(fit))
def importFromClipboard(self, event):

10
gui/marketBrowser.py
View File

@@ -20,7 +20,7 @@
import wx
from service.market import Market
from service.attribute import Attribute
import gui.display as d
from gui.display import Display
import gui.PFSearchBox as SBox
from gui.cachingImageList import CachingImageList
from gui.contextMenu import ContextMenu
@@ -216,14 +216,14 @@ class MarketTree(wx.TreeCtrl):
self.marketBrowser.itemView.selectionMade()
class ItemView(d.Display):
class ItemView(Display):
DEFAULT_COLS = ["Base Icon",
"Base Name",
"attr:power,,,True",
"attr:cpu,,,True"]
def __init__(self, parent, marketBrowser):
d.Display.__init__(self, parent)
Display.__init__(self, parent)
marketBrowser.Bind(wx.EVT_TREE_SEL_CHANGED, self.selectionMade)
self.unfilteredStore = set()
@@ -429,7 +429,7 @@ class ItemView(d.Display):
# Mark current item list as active
self.active = items
# Show them
d.Display.populate(self, items)
Display.populate(self, items)
def refresh(self, items):
if len(items) > 1:
@@ -445,7 +445,7 @@ class ItemView(d.Display):
# set shortcut info for first 9 modules
item.marketShortcut = i + 1
d.Display.refresh(self, items)
Display.refresh(self, items)
def makeReverseMetaMap(self):
"""

10
gui/multiSwitch.py
View File

@@ -17,13 +17,13 @@
# along with pyfa. If not, see <http://www.gnu.org/licenses/>.
# =============================================================================
import gui.chromeTabs
from gui.chromeTabs import PFNotebook
import gui.builtinViews.emptyView
class MultiSwitch(gui.chromeTabs.PFNotebook):
class MultiSwitch(PFNotebook):
def __init__(self, parent):
gui.chromeTabs.PFNotebook.__init__(self, parent)
PFNotebook.__init__(self, parent)
# self.AddPage() # now handled by mainFrame
self.handlers = handlers = []
for type in TabSpawner.tabTypes:
@@ -40,10 +40,10 @@ class MultiSwitch(gui.chromeTabs.PFNotebook):
tabWnd = gui.builtinViews.emptyView.BlankPage(self)
tabWnd.handleDrag = lambda type, info: self.handleDrag(type, info)
gui.chromeTabs.PFNotebook.AddPage(self, tabWnd, tabTitle, tabImage, True)
PFNotebook.AddPage(self, tabWnd, tabTitle, tabImage, True)
def DeletePage(self, n, *args, **kwargs):
gui.chromeTabs.PFNotebook.DeletePage(self, n, *args, **kwargs)
PFNotebook.DeletePage(self, n, *args, **kwargs)
if self.GetPageCount() == 0:
self.AddPage()

3
gui/preferenceView.py
View File

@@ -37,4 +37,5 @@ class PreferenceView(object):
return wx.NullBitmap
from gui.builtinPreferenceViews import * # noqa
from gui.builtinPreferenceViews import pyfaCrestPreferences, pyfaGeneralPreferences, \
pyfaHTMLExportPreferences, pyfaNetworkPreferences, pyfaUpdatePreferences

6
gui/propertyEditor.py
View File

@@ -11,7 +11,7 @@ except:
else:
raise
import eos.db
from eos.db.gamedata.queries import getItem, getAttributeInfo
from service.market import Market
import gui.display as d
import gui.globalEvents as GE
@@ -104,8 +104,8 @@ class AttributeEditor(wx.Frame):
spamreader = csv.reader(csvfile)
for row in spamreader:
itemID, attrID, value = row
item = eos.db.getItem(int(itemID))
attr = eos.db.getAttributeInfo(int(attrID))
item = getItem(int(itemID))
attr = getAttributeInfo(int(attrID))
item.setOverride(attr, float(value))
self.itemView.updateItems(True)

3
gui/statsView.py
View File

@@ -42,4 +42,5 @@ class StatsView(object):
raise NotImplementedError()
from gui.builtinStatsViews import * # noqa
from gui.builtinStatsViews import capacitorViewFull, firepowerViewFull, miningyieldViewFull, priceViewFull, rechargeViewFull, \
resistancesViewFull, resourcesViewFull, targetingMiscViewFull

3
gui/viewColumn.py
View File

@@ -65,4 +65,5 @@ class ViewColumn(object):
raise NotImplementedError()
from gui.builtinViewColumns import * # noqa
from gui.builtinViewColumns import abilities, ammo, ammoIcon, attributeDisplay, baseIcon, baseName, capacitorUse, maxRange, \
misc, price, propertyDisplay, state