From d213e948602f78b3a7a05f7d61b56911dc0bab63 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 3 Aug 2019 17:23:34 +0300 Subject: [PATCH] Reorganize graph folder structure --- graphs/__init__.py | 0 graphs/data/__init__.py | 25 +++++++++++++++++++ .../data}/base/__init__.py | 3 --- .../data}/base/cache.py | 0 .../data}/base/defs.py | 0 .../data}/base/getter.py | 0 .../data}/base/graph.py | 0 graphs/data/fitCapRegen/__init__.py | 24 ++++++++++++++++++ .../data}/fitCapRegen/getter.py | 2 +- .../data}/fitCapRegen/graph.py | 7 ++---- graphs/data/fitDamageStats/__init__.py | 24 ++++++++++++++++++ .../data}/fitDamageStats/cache/__init__.py | 0 .../data}/fitDamageStats/cache/projected.py | 2 +- .../data}/fitDamageStats/cache/time.py | 4 +-- .../data}/fitDamageStats/calc/__init__.py | 0 .../data}/fitDamageStats/calc/application.py | 2 +- .../data}/fitDamageStats/calc/projected.py | 2 +- .../data}/fitDamageStats/getter.py | 6 ++--- .../data}/fitDamageStats/graph.py | 7 ++---- .../data}/fitDamageStats/helper.py | 0 graphs/data/fitMobility/__init__.py | 24 ++++++++++++++++++ .../data}/fitMobility/getter.py | 2 +- .../data}/fitMobility/graph.py | 5 +--- graphs/data/fitShieldRegen/__init__.py | 24 ++++++++++++++++++ .../data}/fitShieldRegen/getter.py | 2 +- .../data}/fitShieldRegen/graph.py | 5 +--- graphs/data/fitWarpTime/__init__.py | 24 ++++++++++++++++++ .../data}/fitWarpTime/cache.py | 2 +- .../data}/fitWarpTime/getter.py | 2 +- .../data}/fitWarpTime/graph.py | 7 ++---- {gui/graphFrame => graphs/gui}/__init__.py | 0 {gui/graphFrame => graphs/gui}/frame.py | 2 +- {gui/graphFrame => graphs/gui}/lists.py | 0 {gui/graphFrame => graphs/gui}/panel.py | 2 +- {gui/graphFrame => graphs/gui}/vector.py | 0 gui/builtinGraphs/__init__.py | 7 ------ gui/builtinGraphs/fitCapRegen/__init__.py | 1 - gui/builtinGraphs/fitDamageStats/__init__.py | 1 - gui/builtinGraphs/fitMobility/__init__.py | 1 - gui/builtinGraphs/fitShieldRegen/__init__.py | 1 - gui/builtinGraphs/fitWarpTime/__init__.py | 1 - gui/mainFrame.py | 11 ++++---- gui/mainMenuBar.py | 4 +-- 43 files changed, 175 insertions(+), 61 deletions(-) create mode 100644 graphs/__init__.py create mode 100644 graphs/data/__init__.py rename {gui/builtinGraphs => graphs/data}/base/__init__.py (93%) rename {gui/builtinGraphs => graphs/data}/base/cache.py (100%) rename {gui/builtinGraphs => graphs/data}/base/defs.py (100%) rename {gui/builtinGraphs => graphs/data}/base/getter.py (100%) rename {gui/builtinGraphs => graphs/data}/base/graph.py (100%) create mode 100644 graphs/data/fitCapRegen/__init__.py rename {gui/builtinGraphs => graphs/data}/fitCapRegen/getter.py (98%) rename {gui/builtinGraphs => graphs/data}/fitCapRegen/graph.py (91%) create mode 100644 graphs/data/fitDamageStats/__init__.py rename {gui/builtinGraphs => graphs/data}/fitDamageStats/cache/__init__.py (100%) rename {gui/builtinGraphs => graphs/data}/fitDamageStats/cache/projected.py (99%) rename {gui/builtinGraphs => graphs/data}/fitDamageStats/cache/time.py (99%) rename {gui/builtinGraphs => graphs/data}/fitDamageStats/calc/__init__.py (100%) rename {gui/builtinGraphs => graphs/data}/fitDamageStats/calc/application.py (99%) rename {gui/builtinGraphs => graphs/data}/fitDamageStats/calc/projected.py (98%) rename {gui/builtinGraphs => graphs/data}/fitDamageStats/getter.py (98%) rename {gui/builtinGraphs => graphs/data}/fitDamageStats/graph.py (98%) rename {gui/builtinGraphs => graphs/data}/fitDamageStats/helper.py (100%) create mode 100644 graphs/data/fitMobility/__init__.py rename {gui/builtinGraphs => graphs/data}/fitMobility/getter.py (97%) rename {gui/builtinGraphs => graphs/data}/fitMobility/graph.py (94%) create mode 100644 graphs/data/fitShieldRegen/__init__.py rename {gui/builtinGraphs => graphs/data}/fitShieldRegen/getter.py (98%) rename {gui/builtinGraphs => graphs/data}/fitShieldRegen/graph.py (96%) create mode 100644 graphs/data/fitWarpTime/__init__.py rename {gui/builtinGraphs => graphs/data}/fitWarpTime/cache.py (98%) rename {gui/builtinGraphs => graphs/data}/fitWarpTime/getter.py (97%) rename {gui/builtinGraphs => graphs/data}/fitWarpTime/graph.py (94%) rename {gui/graphFrame => graphs/gui}/__init__.py (100%) rename {gui/graphFrame => graphs/gui}/frame.py (99%) rename {gui/graphFrame => graphs/gui}/lists.py (100%) rename {gui/graphFrame => graphs/gui}/panel.py (100%) rename {gui/graphFrame => graphs/gui}/vector.py (100%) delete mode 100644 gui/builtinGraphs/__init__.py delete mode 100644 gui/builtinGraphs/fitCapRegen/__init__.py delete mode 100644 gui/builtinGraphs/fitDamageStats/__init__.py delete mode 100644 gui/builtinGraphs/fitMobility/__init__.py delete mode 100644 gui/builtinGraphs/fitShieldRegen/__init__.py delete mode 100644 gui/builtinGraphs/fitWarpTime/__init__.py diff --git a/graphs/__init__.py b/graphs/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/graphs/data/__init__.py b/graphs/data/__init__.py new file mode 100644 index 000000000..23b872114 --- /dev/null +++ b/graphs/data/__init__.py @@ -0,0 +1,25 @@ +# ============================================================================= +# 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 . +# ============================================================================= + + +from . import fitDamageStats +from . import fitShieldRegen +from . import fitCapRegen +from . import fitMobility +from . import fitWarpTime diff --git a/gui/builtinGraphs/base/__init__.py b/graphs/data/base/__init__.py similarity index 93% rename from gui/builtinGraphs/base/__init__.py rename to graphs/data/base/__init__.py index 2d670876d..90b89b2d9 100644 --- a/gui/builtinGraphs/base/__init__.py +++ b/graphs/data/base/__init__.py @@ -21,6 +21,3 @@ from .cache import FitDataCache from .defs import XDef, YDef, VectorDef, Input from .getter import PointGetter, SmoothPointGetter from .graph import FitGraph - -# noinspection PyUnresolvedReferences -from gui.builtinGraphs import * diff --git a/gui/builtinGraphs/base/cache.py b/graphs/data/base/cache.py similarity index 100% rename from gui/builtinGraphs/base/cache.py rename to graphs/data/base/cache.py diff --git a/gui/builtinGraphs/base/defs.py b/graphs/data/base/defs.py similarity index 100% rename from gui/builtinGraphs/base/defs.py rename to graphs/data/base/defs.py diff --git a/gui/builtinGraphs/base/getter.py b/graphs/data/base/getter.py similarity index 100% rename from gui/builtinGraphs/base/getter.py rename to graphs/data/base/getter.py diff --git a/gui/builtinGraphs/base/graph.py b/graphs/data/base/graph.py similarity index 100% rename from gui/builtinGraphs/base/graph.py rename to graphs/data/base/graph.py diff --git a/graphs/data/fitCapRegen/__init__.py b/graphs/data/fitCapRegen/__init__.py new file mode 100644 index 000000000..5d3405b9f --- /dev/null +++ b/graphs/data/fitCapRegen/__init__.py @@ -0,0 +1,24 @@ +# ============================================================================= +# 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 . +# ============================================================================= + + +from .graph import FitCapRegenGraph + + +FitCapRegenGraph.register() diff --git a/gui/builtinGraphs/fitCapRegen/getter.py b/graphs/data/fitCapRegen/getter.py similarity index 98% rename from gui/builtinGraphs/fitCapRegen/getter.py rename to graphs/data/fitCapRegen/getter.py index 53852d2fc..ae6f5c2b0 100644 --- a/gui/builtinGraphs/fitCapRegen/getter.py +++ b/graphs/data/fitCapRegen/getter.py @@ -20,7 +20,7 @@ import math -from gui.builtinGraphs.base import SmoothPointGetter +from graphs.data.base import SmoothPointGetter class Time2CapAmountGetter(SmoothPointGetter): diff --git a/gui/builtinGraphs/fitCapRegen/graph.py b/graphs/data/fitCapRegen/graph.py similarity index 91% rename from gui/builtinGraphs/fitCapRegen/graph.py rename to graphs/data/fitCapRegen/graph.py index 8d89de625..1933fb20c 100644 --- a/gui/builtinGraphs/fitCapRegen/graph.py +++ b/graphs/data/fitCapRegen/graph.py @@ -18,8 +18,8 @@ # ============================================================================= -from gui.builtinGraphs.base import FitGraph, XDef, YDef, Input -from .getter import Time2CapAmountGetter, Time2CapRegenGetter, CapAmount2CapAmountGetter, CapAmount2CapRegenGetter +from graphs.data.base import FitGraph, Input, XDef, YDef +from .getter import CapAmount2CapAmountGetter, CapAmount2CapRegenGetter, Time2CapAmountGetter, Time2CapRegenGetter class FitCapRegenGraph(FitGraph): @@ -51,6 +51,3 @@ class FitCapRegenGraph(FitGraph): ('capAmount', 'capRegen'): CapAmount2CapRegenGetter} _denormalizers = { ('capAmount', '%'): lambda v, fit, tgt: v * 100 / fit.ship.getModifiedItemAttr('capacitorCapacity')} - - -FitCapRegenGraph.register() diff --git a/graphs/data/fitDamageStats/__init__.py b/graphs/data/fitDamageStats/__init__.py new file mode 100644 index 000000000..45ceec3fd --- /dev/null +++ b/graphs/data/fitDamageStats/__init__.py @@ -0,0 +1,24 @@ +# ============================================================================= +# 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 . +# ============================================================================= + + +from .graph import FitDamageStatsGraph + + +FitDamageStatsGraph.register() diff --git a/gui/builtinGraphs/fitDamageStats/cache/__init__.py b/graphs/data/fitDamageStats/cache/__init__.py similarity index 100% rename from gui/builtinGraphs/fitDamageStats/cache/__init__.py rename to graphs/data/fitDamageStats/cache/__init__.py diff --git a/gui/builtinGraphs/fitDamageStats/cache/projected.py b/graphs/data/fitDamageStats/cache/projected.py similarity index 99% rename from gui/builtinGraphs/fitDamageStats/cache/projected.py rename to graphs/data/fitDamageStats/cache/projected.py index 43d1f242d..f1cc85d88 100644 --- a/gui/builtinGraphs/fitDamageStats/cache/projected.py +++ b/graphs/data/fitDamageStats/cache/projected.py @@ -20,9 +20,9 @@ from collections import namedtuple -from gui.builtinGraphs.base import FitDataCache from eos.const import FittingModuleState from eos.modifiedAttributeDict import getResistanceAttrID +from graphs.data.base import FitDataCache ModProjData = namedtuple('ModProjData', ('boost', 'optimal', 'falloff', 'stackingGroup', 'resAttrID')) diff --git a/gui/builtinGraphs/fitDamageStats/cache/time.py b/graphs/data/fitDamageStats/cache/time.py similarity index 99% rename from gui/builtinGraphs/fitDamageStats/cache/time.py rename to graphs/data/fitDamageStats/cache/time.py index c557eaecf..a7721023b 100644 --- a/gui/builtinGraphs/fitDamageStats/cache/time.py +++ b/graphs/data/fitDamageStats/cache/time.py @@ -21,9 +21,9 @@ from copy import copy from eos.utils.float import floatUnerr -from eos.utils.spoolSupport import SpoolType, SpoolOptions +from eos.utils.spoolSupport import SpoolOptions, SpoolType from eos.utils.stats import DmgTypes -from gui.builtinGraphs.base import FitDataCache +from graphs.data.base import FitDataCache class TimeCache(FitDataCache): diff --git a/gui/builtinGraphs/fitDamageStats/calc/__init__.py b/graphs/data/fitDamageStats/calc/__init__.py similarity index 100% rename from gui/builtinGraphs/fitDamageStats/calc/__init__.py rename to graphs/data/fitDamageStats/calc/__init__.py diff --git a/gui/builtinGraphs/fitDamageStats/calc/application.py b/graphs/data/fitDamageStats/calc/application.py similarity index 99% rename from gui/builtinGraphs/fitDamageStats/calc/application.py rename to graphs/data/fitDamageStats/calc/application.py index e3029d54a..9568e5f9b 100644 --- a/gui/builtinGraphs/fitDamageStats/calc/application.py +++ b/graphs/data/fitDamageStats/calc/application.py @@ -24,7 +24,7 @@ from functools import lru_cache from eos.const import FittingHardpoint from eos.saveddata.fit import Fit from eos.utils.float import floatUnerr -from gui.builtinGraphs.fitDamageStats.helper import getTgtRadius +from graphs.data.fitDamageStats.helper import getTgtRadius from service.const import GraphDpsDroneMode from service.settings import GraphSettings diff --git a/gui/builtinGraphs/fitDamageStats/calc/projected.py b/graphs/data/fitDamageStats/calc/projected.py similarity index 98% rename from gui/builtinGraphs/fitDamageStats/calc/projected.py rename to graphs/data/fitDamageStats/calc/projected.py index cb62c0c0a..809802490 100644 --- a/gui/builtinGraphs/fitDamageStats/calc/projected.py +++ b/graphs/data/fitDamageStats/calc/projected.py @@ -22,7 +22,7 @@ import math from eos.saveddata.fit import Fit from eos.utils.float import floatUnerr -from gui.builtinGraphs.fitDamageStats.helper import getTgtMaxVelocity, getTgtSigRadius +from graphs.data.fitDamageStats.helper import getTgtMaxVelocity, getTgtSigRadius from service.const import GraphDpsDroneMode from service.settings import GraphSettings from .application import _calcRangeFactor diff --git a/gui/builtinGraphs/fitDamageStats/getter.py b/graphs/data/fitDamageStats/getter.py similarity index 98% rename from gui/builtinGraphs/fitDamageStats/getter.py rename to graphs/data/fitDamageStats/getter.py index debc60b1f..d5ebd1d00 100644 --- a/gui/builtinGraphs/fitDamageStats/getter.py +++ b/graphs/data/fitDamageStats/getter.py @@ -19,12 +19,12 @@ import eos.config -from eos.utils.spoolSupport import SpoolType, SpoolOptions +from eos.utils.spoolSupport import SpoolOptions, SpoolType from eos.utils.stats import DmgTypes -from gui.builtinGraphs.base import PointGetter, SmoothPointGetter +from graphs.data.base import PointGetter, SmoothPointGetter from service.settings import GraphSettings from .calc.application import getApplicationPerKey -from .calc.projected import getWebbedSpeed, getTpMult +from .calc.projected import getTpMult, getWebbedSpeed from .helper import getTgtSigRadius diff --git a/gui/builtinGraphs/fitDamageStats/graph.py b/graphs/data/fitDamageStats/graph.py similarity index 98% rename from gui/builtinGraphs/fitDamageStats/graph.py rename to graphs/data/fitDamageStats/graph.py index ae2c6b2d3..bbf19175f 100644 --- a/gui/builtinGraphs/fitDamageStats/graph.py +++ b/graphs/data/fitDamageStats/graph.py @@ -18,15 +18,15 @@ # ============================================================================= -from gui.builtinGraphs.base import FitGraph, XDef, YDef, Input, VectorDef +from graphs.data.base import FitGraph, XDef, YDef, Input, VectorDef from service.const import GraphCacheCleanupReason +from .cache import ProjectedDataCache, TimeCache from .getter import ( Distance2DpsGetter, Distance2VolleyGetter, Distance2InflictedDamageGetter, Time2DpsGetter, Time2VolleyGetter, Time2InflictedDamageGetter, TgtSpeed2DpsGetter, TgtSpeed2VolleyGetter, TgtSpeed2InflictedDamageGetter, TgtSigRadius2DpsGetter, TgtSigRadius2VolleyGetter, TgtSigRadius2InflictedDamageGetter) from .helper import getTgtMaxVelocity, getTgtSigRadius -from .cache import ProjectedDataCache, TimeCache class FitDamageStatsGraph(FitGraph): @@ -99,6 +99,3 @@ class FitDamageStatsGraph(FitGraph): ('distance', 'km'): lambda v, fit, tgt: None if v is None else v / 1000, ('tgtSpeed', '%'): lambda v, fit, tgt: v * 100 / getTgtMaxVelocity(tgt), ('tgtSigRad', '%'): lambda v, fit, tgt: v * 100 / getTgtSigRadius(tgt)} - - -FitDamageStatsGraph.register() diff --git a/gui/builtinGraphs/fitDamageStats/helper.py b/graphs/data/fitDamageStats/helper.py similarity index 100% rename from gui/builtinGraphs/fitDamageStats/helper.py rename to graphs/data/fitDamageStats/helper.py diff --git a/graphs/data/fitMobility/__init__.py b/graphs/data/fitMobility/__init__.py new file mode 100644 index 000000000..b5544d5a5 --- /dev/null +++ b/graphs/data/fitMobility/__init__.py @@ -0,0 +1,24 @@ +# ============================================================================= +# 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 . +# ============================================================================= + + +from .graph import FitMobilityVsTimeGraph + + +FitMobilityVsTimeGraph.register() diff --git a/gui/builtinGraphs/fitMobility/getter.py b/graphs/data/fitMobility/getter.py similarity index 97% rename from gui/builtinGraphs/fitMobility/getter.py rename to graphs/data/fitMobility/getter.py index 46ef7ee50..fabacd06a 100644 --- a/gui/builtinGraphs/fitMobility/getter.py +++ b/graphs/data/fitMobility/getter.py @@ -20,7 +20,7 @@ import math -from gui.builtinGraphs.base import SmoothPointGetter +from graphs.data.base import SmoothPointGetter class Time2SpeedGetter(SmoothPointGetter): diff --git a/gui/builtinGraphs/fitMobility/graph.py b/graphs/data/fitMobility/graph.py similarity index 94% rename from gui/builtinGraphs/fitMobility/graph.py rename to graphs/data/fitMobility/graph.py index f5113ada3..2598d20a1 100644 --- a/gui/builtinGraphs/fitMobility/graph.py +++ b/graphs/data/fitMobility/graph.py @@ -18,7 +18,7 @@ # ============================================================================= -from gui.builtinGraphs.base import FitGraph, XDef, YDef, Input +from graphs.data.base import FitGraph, XDef, YDef, Input from .getter import Time2SpeedGetter, Time2DistanceGetter @@ -42,6 +42,3 @@ class FitMobilityVsTimeGraph(FitGraph): ('time', 'distance'): Time2DistanceGetter} _denormalizers = { ('distance', 'km'): lambda v, fit, tgt: v / 1000} - - -FitMobilityVsTimeGraph.register() diff --git a/graphs/data/fitShieldRegen/__init__.py b/graphs/data/fitShieldRegen/__init__.py new file mode 100644 index 000000000..52a1251c6 --- /dev/null +++ b/graphs/data/fitShieldRegen/__init__.py @@ -0,0 +1,24 @@ +# ============================================================================= +# 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 . +# ============================================================================= + + +from .graph import FitShieldRegenGraph + + +FitShieldRegenGraph.register() diff --git a/gui/builtinGraphs/fitShieldRegen/getter.py b/graphs/data/fitShieldRegen/getter.py similarity index 98% rename from gui/builtinGraphs/fitShieldRegen/getter.py rename to graphs/data/fitShieldRegen/getter.py index 395ac7ba4..5135ef4e9 100644 --- a/gui/builtinGraphs/fitShieldRegen/getter.py +++ b/graphs/data/fitShieldRegen/getter.py @@ -20,7 +20,7 @@ import math -from gui.builtinGraphs.base import SmoothPointGetter +from graphs.data.base import SmoothPointGetter class Time2ShieldAmountGetter(SmoothPointGetter): diff --git a/gui/builtinGraphs/fitShieldRegen/graph.py b/graphs/data/fitShieldRegen/graph.py similarity index 96% rename from gui/builtinGraphs/fitShieldRegen/graph.py rename to graphs/data/fitShieldRegen/graph.py index ba34bd6c0..c05e297c3 100644 --- a/gui/builtinGraphs/fitShieldRegen/graph.py +++ b/graphs/data/fitShieldRegen/graph.py @@ -18,7 +18,7 @@ # ============================================================================= -from gui.builtinGraphs.base import FitGraph, XDef, YDef, Input +from graphs.data.base import FitGraph, XDef, YDef, Input from .getter import ( Time2ShieldAmountGetter, Time2ShieldRegenGetter, ShieldAmount2ShieldAmountGetter, ShieldAmount2ShieldRegenGetter) @@ -58,6 +58,3 @@ class FitShieldRegenGraph(FitGraph): ('shieldAmount', '%'): lambda v, fit, tgt: v * 100 / fit.ship.getModifiedItemAttr('shieldCapacity'), ('shieldAmount', 'EHP'): lambda v, fit, tgt: fit.damagePattern.effectivify(fit, v, 'shield'), ('shieldRegen', 'EHP/s'): lambda v, fit, tgt: fit.damagePattern.effectivify(fit, v, 'shield')} - - -FitShieldRegenGraph.register() diff --git a/graphs/data/fitWarpTime/__init__.py b/graphs/data/fitWarpTime/__init__.py new file mode 100644 index 000000000..f670fdf2d --- /dev/null +++ b/graphs/data/fitWarpTime/__init__.py @@ -0,0 +1,24 @@ +# ============================================================================= +# 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 . +# ============================================================================= + + +from .graph import FitWarpTimeGraph + + +FitWarpTimeGraph.register() diff --git a/gui/builtinGraphs/fitWarpTime/cache.py b/graphs/data/fitWarpTime/cache.py similarity index 98% rename from gui/builtinGraphs/fitWarpTime/cache.py rename to graphs/data/fitWarpTime/cache.py index 2eabb9be7..abbd62d2b 100644 --- a/gui/builtinGraphs/fitWarpTime/cache.py +++ b/graphs/data/fitWarpTime/cache.py @@ -19,7 +19,7 @@ from eos.const import FittingModuleState -from gui.builtinGraphs.base import FitDataCache +from graphs.data.base import FitDataCache class SubwarpSpeedCache(FitDataCache): diff --git a/gui/builtinGraphs/fitWarpTime/getter.py b/graphs/data/fitWarpTime/getter.py similarity index 97% rename from gui/builtinGraphs/fitWarpTime/getter.py rename to graphs/data/fitWarpTime/getter.py index 2b5a71355..1094641a9 100644 --- a/gui/builtinGraphs/fitWarpTime/getter.py +++ b/graphs/data/fitWarpTime/getter.py @@ -20,7 +20,7 @@ import math -from gui.builtinGraphs.base import SmoothPointGetter +from graphs.data.base import SmoothPointGetter AU_METERS = 149597870700 diff --git a/gui/builtinGraphs/fitWarpTime/graph.py b/graphs/data/fitWarpTime/graph.py similarity index 94% rename from gui/builtinGraphs/fitWarpTime/graph.py rename to graphs/data/fitWarpTime/graph.py index 1ad725d5a..b2d02fdcd 100644 --- a/gui/builtinGraphs/fitWarpTime/graph.py +++ b/graphs/data/fitWarpTime/graph.py @@ -18,10 +18,10 @@ # ============================================================================= +from graphs.data.base import FitGraph, Input, XDef, YDef from service.const import GraphCacheCleanupReason -from gui.builtinGraphs.base import FitGraph, XDef, YDef, Input -from .getter import Distance2TimeGetter, AU_METERS from .cache import SubwarpSpeedCache +from .getter import AU_METERS, Distance2TimeGetter class FitWarpTimeGraph(FitGraph): @@ -60,6 +60,3 @@ class FitWarpTimeGraph(FitGraph): _denormalizers = { ('distance', 'AU'): lambda v, fit, tgt: v / AU_METERS, ('distance', 'km'): lambda v, fit, tgt: v / 1000} - - -FitWarpTimeGraph.register() diff --git a/gui/graphFrame/__init__.py b/graphs/gui/__init__.py similarity index 100% rename from gui/graphFrame/__init__.py rename to graphs/gui/__init__.py diff --git a/gui/graphFrame/frame.py b/graphs/gui/frame.py similarity index 99% rename from gui/graphFrame/frame.py rename to graphs/gui/frame.py index 0b91c88d5..0c3a92b14 100644 --- a/gui/graphFrame/frame.py +++ b/graphs/gui/frame.py @@ -31,8 +31,8 @@ import gui.globalEvents as GE import gui.mainFrame from eos.saveddata.fit import Fit from eos.saveddata.targetProfile import TargetProfile +from graphs.data.base import FitGraph from gui.bitmap_loader import BitmapLoader -from gui.builtinGraphs.base import FitGraph from service.const import GraphCacheCleanupReason from service.settings import GraphSettings from .panel import GraphControlPanel diff --git a/gui/graphFrame/lists.py b/graphs/gui/lists.py similarity index 100% rename from gui/graphFrame/lists.py rename to graphs/gui/lists.py diff --git a/gui/graphFrame/panel.py b/graphs/gui/panel.py similarity index 100% rename from gui/graphFrame/panel.py rename to graphs/gui/panel.py index dee3d87b3..8db9c3cb2 100644 --- a/gui/graphFrame/panel.py +++ b/graphs/gui/panel.py @@ -25,9 +25,9 @@ import wx from gui.bitmap_loader import BitmapLoader from gui.contextMenu import ContextMenu +from gui.utils.inputs import FloatBox, FloatRangeBox from service.const import GraphCacheCleanupReason from service.fit import Fit -from gui.utils.inputs import FloatBox, FloatRangeBox from .lists import FitList, TargetList from .vector import VectorPicker diff --git a/gui/graphFrame/vector.py b/graphs/gui/vector.py similarity index 100% rename from gui/graphFrame/vector.py rename to graphs/gui/vector.py diff --git a/gui/builtinGraphs/__init__.py b/gui/builtinGraphs/__init__.py deleted file mode 100644 index 6f55feae6..000000000 --- a/gui/builtinGraphs/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# noinspection PyUnresolvedReferences -from gui.builtinGraphs import ( # noqa: E402,F401 - fitDamageStats, - fitShieldRegen, - fitCapRegen, - fitMobility, - fitWarpTime) diff --git a/gui/builtinGraphs/fitCapRegen/__init__.py b/gui/builtinGraphs/fitCapRegen/__init__.py deleted file mode 100644 index 78799d6a2..000000000 --- a/gui/builtinGraphs/fitCapRegen/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import gui.builtinGraphs.fitCapRegen.graph # noqa: E402,F401 diff --git a/gui/builtinGraphs/fitDamageStats/__init__.py b/gui/builtinGraphs/fitDamageStats/__init__.py deleted file mode 100644 index b01f971ca..000000000 --- a/gui/builtinGraphs/fitDamageStats/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import gui.builtinGraphs.fitDamageStats.graph # noqa: E402,F401 diff --git a/gui/builtinGraphs/fitMobility/__init__.py b/gui/builtinGraphs/fitMobility/__init__.py deleted file mode 100644 index ca7b9a995..000000000 --- a/gui/builtinGraphs/fitMobility/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import gui.builtinGraphs.fitMobility.graph # noqa: E402,F401 diff --git a/gui/builtinGraphs/fitShieldRegen/__init__.py b/gui/builtinGraphs/fitShieldRegen/__init__.py deleted file mode 100644 index 7d3c26546..000000000 --- a/gui/builtinGraphs/fitShieldRegen/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import gui.builtinGraphs.fitShieldRegen.graph # noqa: E402,F401 diff --git a/gui/builtinGraphs/fitWarpTime/__init__.py b/gui/builtinGraphs/fitWarpTime/__init__.py deleted file mode 100644 index 860a43eb2..000000000 --- a/gui/builtinGraphs/fitWarpTime/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import gui.builtinGraphs.fitWarpTime.graph # noqa: E402,F401 diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 007df2ff7..eae23d641 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -34,11 +34,12 @@ from logbook import Logger from wx.lib.inspection import InspectionTool import config +import gui.fitCommands as cmd import gui.globalEvents as GE from eos.config import gamedata_date, gamedata_version # import this to access override setting from eos.modifiedAttributeDict import ModifiedAttributeDict -from gui import graphFrame +from graphs.gui import GraphFrame, frame as graphFrame from gui.additionsPane import AdditionsPane from gui.bitmap_loader import BitmapLoader from gui.builtinMarketBrowser.events import ItemSelected @@ -51,16 +52,15 @@ from gui.chrome_tabs import ChromeNotebook from gui.copySelectDialog import CopySelectDialog from gui.devTools import DevTools from gui.esiFittings import EveFittings, ExportToEve, SsoCharacterMgmt -from gui.graphFrame import GraphFrame from gui.mainMenuBar import MainMenuBar from gui.marketBrowser import MarketBrowser from gui.multiSwitch import MultiSwitch from gui.patternEditor import DmgPatternEditorDlg from gui.preferenceDialog import PreferenceDialog -from gui.targetProfileEditor import TargetProfileEditorDlg from gui.setEditor import ImplantSetEditorDlg from gui.shipBrowser import ShipBrowser from gui.statsPane import StatsPane +from gui.targetProfileEditor import TargetProfileEditorDlg from gui.updateDialog import UpdateDialog from gui.utils.clipboard import fromClipboard from service.character import Character @@ -70,7 +70,6 @@ from service.port import IPortUser, Port from service.price import Price from service.settings import HTMLExportSettings, SettingsProvider from service.update import Update -import gui.fitCommands as cmd pyfalog = Logger(__name__) @@ -963,9 +962,9 @@ class MainFrame(wx.Frame): if not self.graphFrame: self.graphFrame = GraphFrame(self) - if graphFrame.frame.graphFrame_enabled: + if graphFrame.graphFrame_enabled: self.graphFrame.Show() - elif graphFrame.frame.graphFrame_enabled: + elif graphFrame.graphFrame_enabled: self.graphFrame.SetFocus() def openWXInspectTool(self, event): diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index c4cc8e09f..9aa557075 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -23,7 +23,7 @@ import wx import config from service.character import Character from service.fit import Fit -import gui.graphFrame +from graphs.gui import GraphFrame, frame as graphFrame import gui.globalEvents as GE from gui.bitmap_loader import BitmapLoader @@ -101,7 +101,7 @@ class MainMenuBar(wx.MenuBar): graphFrameItem = wx.MenuItem(fitMenu, self.graphFrameId, "&Graphs\tCTRL+G") graphFrameItem.SetBitmap(BitmapLoader.getBitmap("graphs_small", "gui")) fitMenu.Append(graphFrameItem) - if not gui.graphFrame.frame.graphFrame_enabled: + if not graphFrame.graphFrame_enabled: self.Enable(self.graphFrameId, False) self.ignoreRestrictionItem = fitMenu.Append(self.toggleIgnoreRestrictionID, "Disable Fitting Re&strictions")