Update graph info when fit name changes
This commit is contained in:
@@ -31,7 +31,7 @@ import config
|
||||
pyfalog = Logger(__name__)
|
||||
|
||||
|
||||
class BitmapLoader(object):
|
||||
class BitmapLoader:
|
||||
# try:
|
||||
# archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
|
||||
# logging.info("Using zipped image files.")
|
||||
|
||||
@@ -42,13 +42,13 @@ from service.market import Market
|
||||
pyfalog = Logger(__name__)
|
||||
|
||||
|
||||
class DummyItem(object):
|
||||
class DummyItem:
|
||||
def __init__(self, txt):
|
||||
self.name = txt
|
||||
self.iconID = None
|
||||
|
||||
|
||||
class DummyEntry(object):
|
||||
class DummyEntry:
|
||||
def __init__(self, txt):
|
||||
self.item = DummyItem(txt)
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ BTN_HOVER = 4
|
||||
BTN_DISABLED = 8
|
||||
|
||||
|
||||
class PFBaseButton(object):
|
||||
class PFBaseButton:
|
||||
def __init__(self, normalBitmap=wx.NullBitmap, label="", callback=None, hoverBitmap=None, disabledBitmap=None,
|
||||
show=True):
|
||||
|
||||
@@ -85,7 +85,7 @@ class PFBaseButton(object):
|
||||
return self.dropShadowBmp
|
||||
|
||||
|
||||
class PFToolbar(object):
|
||||
class PFToolbar:
|
||||
def __init__(self, parent):
|
||||
self.Parent = parent
|
||||
self.buttons = []
|
||||
|
||||
@@ -31,7 +31,7 @@ import datetime
|
||||
pyfalog = Logger(__name__)
|
||||
|
||||
|
||||
class ErrorHandler(object):
|
||||
class ErrorHandler:
|
||||
__parent = None
|
||||
__frame = None
|
||||
|
||||
|
||||
@@ -172,7 +172,7 @@ class EveFittings(wx.Frame):
|
||||
self.statusbar.SetStatusText(msg)
|
||||
|
||||
|
||||
class ESIServerExceptionHandler(object):
|
||||
class ESIServerExceptionHandler:
|
||||
def __init__(self, parentWindow, ex):
|
||||
dlg = wx.MessageDialog(parentWindow,
|
||||
"There was an issue starting up the localized server, try setting "
|
||||
@@ -185,7 +185,7 @@ class ESIServerExceptionHandler(object):
|
||||
pyfalog.error(ex)
|
||||
|
||||
|
||||
class ESIExceptionHandler(object):
|
||||
class ESIExceptionHandler:
|
||||
# todo: make this a generate excetpion handler for all calls
|
||||
def __init__(self, parentWindow, ex):
|
||||
if ex.response['error'].startswith('Token is not valid') or ex.response['error'] == 'invalid_token': # todo: this seems messy, figure out a better response
|
||||
|
||||
@@ -31,6 +31,7 @@ import gui.globalEvents as GE
|
||||
import gui.mainFrame
|
||||
from gui.bitmap_loader import BitmapLoader
|
||||
from gui.builtinGraphs.base import FitGraph
|
||||
from gui.builtinShipBrowser.events import EVT_FIT_RENAMED
|
||||
from service.const import GraphCacheCleanupReason
|
||||
from service.settings import GraphSettings
|
||||
from .panel import GraphControlPanel
|
||||
@@ -123,6 +124,7 @@ class GraphFrame(wx.Frame):
|
||||
self.Bind(wx.EVT_CHAR_HOOK, self.kbEvent)
|
||||
# Event bindings - external events
|
||||
self.mainFrame.Bind(GE.FIT_CHANGED, self.OnFitChanged)
|
||||
self.mainFrame.Bind(EVT_FIT_RENAMED, self.OnFitRenamed)
|
||||
self.mainFrame.Bind(GE.GRAPH_OPTION_CHANGED, self.OnGraphOptionChanged)
|
||||
|
||||
self.Layout()
|
||||
@@ -156,6 +158,10 @@ class GraphFrame(wx.Frame):
|
||||
self.clearCache(reason=GraphCacheCleanupReason.fitChanged, extraData=event.fitID)
|
||||
self.draw()
|
||||
|
||||
def OnFitRenamed(self, event):
|
||||
event.Skip()
|
||||
self.draw()
|
||||
|
||||
def OnGraphOptionChanged(self, event):
|
||||
event.Skip()
|
||||
self.clearCache(reason=GraphCacheCleanupReason.optionChanged)
|
||||
@@ -171,6 +177,7 @@ class GraphFrame(wx.Frame):
|
||||
|
||||
def closeWindow(self):
|
||||
self.mainFrame.Unbind(GE.FIT_CHANGED, handler=self.OnFitChanged)
|
||||
self.mainFrame.Unbind(EVT_FIT_RENAMED, handler=self.OnFitRenamed)
|
||||
self.mainFrame.Unbind(GE.GRAPH_OPTION_CHANGED, handler=self.OnGraphOptionChanged)
|
||||
self.ctrlPanel.unbindExternalEvents()
|
||||
self.Destroy()
|
||||
|
||||
@@ -23,6 +23,7 @@ import wx
|
||||
|
||||
import gui.display
|
||||
import gui.globalEvents as GE
|
||||
from gui.builtinShipBrowser.events import EVT_FIT_RENAMED
|
||||
from service.fit import Fit
|
||||
|
||||
|
||||
@@ -46,6 +47,7 @@ class BaseList(gui.display.Display):
|
||||
self.contextMenu.Bind(wx.EVT_MENU, self.ContextMenuHandler, removeItem)
|
||||
|
||||
self.graphFrame.mainFrame.Bind(GE.FIT_REMOVED, self.OnFitRemoved)
|
||||
self.graphFrame.mainFrame.Bind(EVT_FIT_RENAMED, self.OnFitRenamed)
|
||||
self.Bind(wx.EVT_LEFT_DCLICK, self.OnLeftDClick)
|
||||
self.Bind(wx.EVT_CHAR_HOOK, self.kbEvent)
|
||||
self.Bind(wx.EVT_CONTEXT_MENU, self.OnContextMenu)
|
||||
@@ -85,6 +87,10 @@ class BaseList(gui.display.Display):
|
||||
if fit is not None:
|
||||
self.removeFits([fit])
|
||||
|
||||
def OnFitRenamed(self, event):
|
||||
event.Skip()
|
||||
self.update(self.fits)
|
||||
|
||||
def getSelectedFits(self):
|
||||
fits = []
|
||||
for row in self.getSelectedRows():
|
||||
@@ -108,6 +114,7 @@ class BaseList(gui.display.Display):
|
||||
|
||||
def unbindExternalEvents(self):
|
||||
self.graphFrame.mainFrame.Unbind(GE.FIT_REMOVED, handler=self.OnFitRemoved)
|
||||
self.graphFrame.mainFrame.Unbind(EVT_FIT_RENAMED, handler=self.OnFitRenamed)
|
||||
|
||||
def handleDrag(self, type, fitID):
|
||||
if type == 'fit':
|
||||
|
||||
@@ -47,7 +47,7 @@ class MultiSwitch(ChromeNotebook):
|
||||
if self.GetPageCount() == 0:
|
||||
self.AddPage()
|
||||
|
||||
class TabSpawner(object):
|
||||
class TabSpawner:
|
||||
tabTypes = []
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -13,7 +13,7 @@ from eos.db import getFit
|
||||
pyfalog = Logger(__name__)
|
||||
|
||||
|
||||
class exportHtml(object):
|
||||
class exportHtml:
|
||||
_instance = None
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
import wx
|
||||
|
||||
|
||||
class ViewColumn(object):
|
||||
class ViewColumn:
|
||||
"""
|
||||
Abstract class that columns can inherit from.
|
||||
Once the missing methods are correctly implemented,
|
||||
|
||||
Reference in New Issue
Block a user