From 1fbb47d64ba173869042c848b645e061af704b8f Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 5 Aug 2019 20:24:28 +0300 Subject: [PATCH] Add color column --- graphs/gui/lists.py | 11 ++++--- gui/builtinViewColumns/__init__.py | 16 ---------- gui/builtinViewColumns/color.py | 49 ++++++++++++++++++++++++++++++ gui/viewColumn.py | 1 + 4 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 gui/builtinViewColumns/color.py diff --git a/graphs/gui/lists.py b/graphs/gui/lists.py index 4956785e4..3e4c9dd06 100644 --- a/graphs/gui/lists.py +++ b/graphs/gui/lists.py @@ -31,10 +31,6 @@ from service.fit import Fit class BaseWrapperList(gui.display.Display): - DEFAULT_COLS = ( - 'Base Icon', - 'Base Name') - def __init__(self, graphFrame, parent): super().__init__(parent) self.graphFrame = graphFrame @@ -239,6 +235,10 @@ class BaseWrapperList(gui.display.Display): class SourceWrapperList(BaseWrapperList): + DEFAULT_COLS = ( + 'Color', + 'Base Icon', + 'Base Name') wrapperClass = SourceWrapper def __init__(self, graphFrame, parent): @@ -268,6 +268,9 @@ class SourceWrapperList(BaseWrapperList): class TargetWrapperList(BaseWrapperList): + DEFAULT_COLS = ( + 'Base Icon', + 'Base Name') wrapperClass = TargetWrapper def __init__(self, graphFrame, parent): diff --git a/gui/builtinViewColumns/__init__.py b/gui/builtinViewColumns/__init__.py index 9675f178b..e69de29bb 100644 --- a/gui/builtinViewColumns/__init__.py +++ b/gui/builtinViewColumns/__init__.py @@ -1,16 +0,0 @@ -__all__ = [ - "ammo", - "ammoIcon", - "attributeDisplay", - "attributeDisplayGraph", - "baseIcon", - "baseName", - "capacitorUse", - "maxRange", - "price", - "propertyDisplay", - "state", - "misc", - "abilities", - "sideEffects", - "targetResists"] diff --git a/gui/builtinViewColumns/color.py b/gui/builtinViewColumns/color.py new file mode 100644 index 000000000..e7f112363 --- /dev/null +++ b/gui/builtinViewColumns/color.py @@ -0,0 +1,49 @@ +# ============================================================================= +# 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 . +# ============================================================================= + +# noinspection PyPackageRequirements +import wx + +from graphs.wrapper import SourceWrapper +from gui.bitmap_loader import BitmapLoader +from gui.viewColumn import ViewColumn + + +class LineColor(ViewColumn): + + name = 'Color' + + def __init__(self, fittingView, params): + ViewColumn.__init__(self, fittingView) + self.imageId = fittingView.imageList.GetImageIndex(1432, 'icons') + self.bitmap = BitmapLoader.getBitmap(1432, 'icons') + self.mask = wx.LIST_MASK_TEXT + + def getText(self, stuff): + if isinstance(stuff, SourceWrapper): + return '' + return '' + + def getToolTip(self, stuff): + if isinstance(stuff, SourceWrapper): + return '' + return '' + + +LineColor.register() diff --git a/gui/viewColumn.py b/gui/viewColumn.py index 65703b2d4..c1f414a2b 100644 --- a/gui/viewColumn.py +++ b/gui/viewColumn.py @@ -76,6 +76,7 @@ from gui.builtinViewColumns import ( # noqa: E402, F401 baseIcon, baseName, capacitorUse, + color, maxRange, misc, price,