From adae21452a4b65149323508e3c164437d217160c Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Wed, 22 Dec 2010 17:57:21 +0200 Subject: [PATCH] Moved and splitted util.py into gui.utils.numberFormatter and gui.utils.clipboard; GetPartialText moved into gui.utils.drawUtils.py --- gui/builtinStatsViews/capacitorViewFull.py | 2 +- gui/builtinStatsViews/firepowerViewFull.py | 2 +- gui/builtinStatsViews/priceViewFull.py | 2 +- gui/builtinStatsViews/rechargeViewFull.py | 2 +- gui/builtinStatsViews/resistancesViewFull.py | 2 +- gui/builtinStatsViews/resourcesViewFull.py | 2 +- .../targetingMiscViewFull.py | 4 +- gui/builtinViewColumns/attributeDisplay.py | 3 +- gui/builtinViewColumns/capacitorUse.py | 2 +- gui/builtinViewColumns/maxRange.py | 2 +- gui/builtinViewColumns/price.py | 4 +- gui/builtinViewColumns/propertyDisplay.py | 4 +- gui/builtinViewColumns/tracking.py | 3 +- gui/fleetBrowser.py | 2 +- gui/itemStats.py | 2 +- gui/mainFrame.py | 2 +- gui/patternEditor.py | 2 +- gui/utils/clipboard.py | 19 ++++++++ gui/utils/drawUtils.py | 29 ++++++++++- util.py => gui/utils/numberFormatter.py | 48 ------------------- 20 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 gui/utils/clipboard.py rename util.py => gui/utils/numberFormatter.py (72%) diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py index 3594da4ad..b140aea36 100644 --- a/gui/builtinStatsViews/capacitorViewFull.py +++ b/gui/builtinStatsViews/capacitorViewFull.py @@ -21,7 +21,7 @@ import wx from gui.statsView import StatsView from gui import builtinStatsViews from gui import bitmapLoader -from util import formatAmount +from gui.utils.numberFormatter import formatAmount class CapacitorViewFull(StatsView): name = "capacitorViewFull" diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py index 8accb64be..7db56074d 100644 --- a/gui/builtinStatsViews/firepowerViewFull.py +++ b/gui/builtinStatsViews/firepowerViewFull.py @@ -21,7 +21,7 @@ import wx from gui.statsView import StatsView from gui import builtinStatsViews from gui import bitmapLoader -from util import formatAmount +from gui.utils.numberFormatter import formatAmount class FirepowerViewFull(StatsView): name = "firepowerViewFull" diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py index 906aace21..80517f994 100644 --- a/gui/builtinStatsViews/priceViewFull.py +++ b/gui/builtinStatsViews/priceViewFull.py @@ -21,7 +21,7 @@ import wx from gui.statsView import StatsView from gui import builtinStatsViews from gui import bitmapLoader -from util import formatAmount +from gui.utils.numberFormatter import formatAmount import service class PriceViewFull(StatsView): diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index 6fd200993..8ec9a9b55 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/gui/builtinStatsViews/rechargeViewFull.py @@ -20,7 +20,7 @@ import wx from gui.statsView import StatsView from gui import bitmapLoader -from util import formatAmount +from gui.utils.numberFormatter import formatAmount import gui.mainFrame import gui.builtinStatsViews.resistancesViewFull as rvf import service diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 1954f1345..72f471d96 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/gui/builtinStatsViews/resistancesViewFull.py @@ -22,7 +22,7 @@ from gui.statsView import StatsView from gui import builtinStatsViews from gui import bitmapLoader from gui import pygauge as PG -from util import formatAmount +from gui.utils.numberFormatter import formatAmount import service import gui.mainFrame import gui.builtinViews.fittingView as fv diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index 80967805f..f08abf0d8 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -25,7 +25,7 @@ from gui import pygauge as PG from eos.types import Hardpoint -from util import formatAmount +from gui.utils.numberFormatter import formatAmount class ResourcesViewFull(StatsView): name = "resourcesViewFull" diff --git a/gui/builtinStatsViews/targetingMiscViewFull.py b/gui/builtinStatsViews/targetingMiscViewFull.py index cd0ad9ab6..8cae9dae8 100644 --- a/gui/builtinStatsViews/targetingMiscViewFull.py +++ b/gui/builtinStatsViews/targetingMiscViewFull.py @@ -20,7 +20,7 @@ import wx from gui.statsView import StatsView from gui import builtinStatsViews -from util import formatAmount +from gui.utils.numberFormatter import formatAmount class TargetingMiscViewFull(StatsView): name = "targetingmiscViewFull" @@ -132,7 +132,7 @@ class TargetingMiscViewFull(StatsView): elif labelName is "labelFullSigRadius": label.SetToolTip(wx.ToolTip("Probe Size: %.3f" % (fit.probeSize or 0) )) elif labelName is "labelFullWarpSpeed": - label.SetToolTip(wx.ToolTip("Max Warp Distance: %.1f AU" % + label.SetToolTip(wx.ToolTip("Max Warp Distance: %.1f AU" % fit.maxWarpDistance)) elif fit is not None: label.SetToolTip(wx.ToolTip("%.1f" % value)) diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py index a72ed7143..bd2b32f8a 100644 --- a/gui/builtinViewColumns/attributeDisplay.py +++ b/gui/builtinViewColumns/attributeDisplay.py @@ -20,8 +20,9 @@ from gui import builtinViewColumns from gui.viewColumn import ViewColumn from gui import bitmapLoader +from gui.utils.util import formatAmount + import service -from util import formatAmount import wx class AttributeDisplay(ViewColumn): diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py index 68e5fb355..609111c45 100644 --- a/gui/builtinViewColumns/capacitorUse.py +++ b/gui/builtinViewColumns/capacitorUse.py @@ -20,7 +20,7 @@ import wx import service -from util import formatAmount +from gui.utils.numberFormatter import formatAmount from gui.viewColumn import ViewColumn from gui import bitmapLoader diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py index 4fcee9d4e..cee609f32 100644 --- a/gui/builtinViewColumns/maxRange.py +++ b/gui/builtinViewColumns/maxRange.py @@ -21,7 +21,7 @@ from gui import builtinViewColumns from gui.viewColumn import ViewColumn from gui import bitmapLoader import service -from util import formatAmount +from gui.utils.numberFormatter import formatAmount import wx class MaxRange(ViewColumn): diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py index 9c21b1f63..1456e6d09 100644 --- a/gui/builtinViewColumns/price.py +++ b/gui/builtinViewColumns/price.py @@ -19,9 +19,9 @@ from gui.viewColumn import ViewColumn from gui import bitmapLoader -import service -from util import formatAmount +from gui.utils.numberFormatter import formatAmount import wx +import service class Price(ViewColumn): name = "Price" diff --git a/gui/builtinViewColumns/propertyDisplay.py b/gui/builtinViewColumns/propertyDisplay.py index 88339439b..3441b6747 100644 --- a/gui/builtinViewColumns/propertyDisplay.py +++ b/gui/builtinViewColumns/propertyDisplay.py @@ -19,9 +19,9 @@ from gui.viewColumn import ViewColumn from gui import bitmapLoader -import service -from util import formatAmount +from gui.utils.numberFormatter import formatAmount import wx +import service class PropertyDisplay(ViewColumn): name = "prop" diff --git a/gui/builtinViewColumns/tracking.py b/gui/builtinViewColumns/tracking.py index 6640ea721..6f59d7121 100644 --- a/gui/builtinViewColumns/tracking.py +++ b/gui/builtinViewColumns/tracking.py @@ -20,8 +20,9 @@ from gui import builtinViewColumns from gui.viewColumn import ViewColumn from gui import bitmapLoader +from gui.utils.numberFormatter import formatAmount + import service -from util import formatAmount from eos.types import Hardpoint import wx diff --git a/gui/fleetBrowser.py b/gui/fleetBrowser.py index e96dca5fe..5fc5cd95c 100644 --- a/gui/fleetBrowser.py +++ b/gui/fleetBrowser.py @@ -4,7 +4,7 @@ from gui import bitmapLoader import gui.mainFrame from gui.PFListPane import PFListPane import service.fleet -from util import GetPartialText +from gui.utils.drawUtils import GetPartialText from wx.lib.buttons import GenBitmapButton diff --git a/gui/itemStats.py b/gui/itemStats.py index 5ff4afa78..4a89623cb 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -25,7 +25,7 @@ import sys import wx.lib.mixins.listctrl as listmix import wx.html from eos.types import Ship, Module, Skill, Booster, Implant, Drone -from util import formatAmount +from gui.utils.numberFormatter import formatAmount import service class ItemStatsDialog(wx.Dialog): diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 3d1aef104..2e34bf7be 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -38,7 +38,7 @@ import gui.aboutData from wx._core import PyDeadObjectError import os.path import gui.chromeTabs -from util import toClipboard, fromClipboard +from gui.utils.clipboard import toClipboard, fromClipboard from builtinViews import * from gui.fleetBrowser import FleetBrowser diff --git a/gui/patternEditor.py b/gui/patternEditor.py index 12bd8b973..08eab425c 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -21,7 +21,7 @@ import wx import bitmapLoader import service from wx.lib.intctrl import IntCtrl -from util import toClipboard, fromClipboard +from gui.utils.clipboard import toClipboard, fromClipboard ########################################################################### ## Class DmgPatternEditorDlg diff --git a/gui/utils/clipboard.py b/gui/utils/clipboard.py new file mode 100644 index 000000000..17427c6e3 --- /dev/null +++ b/gui/utils/clipboard.py @@ -0,0 +1,19 @@ +import wx + +def toClipboard(text): + clip = wx.TheClipboard + clip.Open() + data = wx.TextDataObject(text) + clip.SetData(data) + clip.Close() + +def fromClipboard(): + clip = wx.TheClipboard + clip.Open() + data = wx.TextDataObject("") + if clip.GetData(data): + clip.Close() + return data.GetText() + else: + clip.Close() + return None \ No newline at end of file diff --git a/gui/utils/drawUtils.py b/gui/utils/drawUtils.py index 0609f098e..31a571bf0 100644 --- a/gui/utils/drawUtils.py +++ b/gui/utils/drawUtils.py @@ -53,4 +53,31 @@ def DrawGradientBar(width, height, gStart, gEnd, gMid = None): mdc.SelectObject(wx.NullBitmap) - return canvas \ No newline at end of file + return canvas + + +def GetPartialText(dc, text , maxWidth): + ellipsis = "..." + base_w, h = dc.GetTextExtent(ellipsis) + + lenText = len(text) + drawntext = text + w, dummy = dc.GetTextExtent(text) + + while lenText > 1: + + if w + base_w <= maxWidth: + break + + w_c, h_c = dc.GetTextExtent(drawntext[-1]) + drawntext = drawntext[0:-1] + lenText -= 1 + w -= w_c + + while len(ellipsis) > 0 and w + base_w > maxWidth: + ellipsis = ellipsis[0:-1] + base_w, h = dc.GetTextExtent(ellipsis) + if len(text) > lenText: + return drawntext + ellipsis + else: + return text diff --git a/util.py b/gui/utils/numberFormatter.py similarity index 72% rename from util.py rename to gui/utils/numberFormatter.py index ceb42842c..7c3086461 100644 --- a/util.py +++ b/gui/utils/numberFormatter.py @@ -1,5 +1,4 @@ import math -import wx def formatAmount(val, prec=3, lowest=0, highest=0): """ @@ -73,50 +72,3 @@ def processAmount(val, prec=3): # Strip trailing zero for integers and convert to string result = str(val)[-2:] == '.0' and str(val)[:-2] or str(val) return result - -def toClipboard(text): - clip = wx.TheClipboard - clip.Open() - data = wx.TextDataObject(text) - clip.SetData(data) - clip.Close() - -def fromClipboard(): - clip = wx.TheClipboard - clip.Open() - data = wx.TextDataObject("") - if clip.GetData(data): - clip.Close() - return data.GetText() - else: - clip.Close() - return None - - - - -def GetPartialText(dc, text , maxWidth): - ellipsis = "..." - base_w, h = dc.GetTextExtent(ellipsis) - - lenText = len(text) - drawntext = text - w, dummy = dc.GetTextExtent(text) - - while lenText > 1: - - if w + base_w <= maxWidth: - break - - w_c, h_c = dc.GetTextExtent(drawntext[-1]) - drawntext = drawntext[0:-1] - lenText -= 1 - w -= w_c - - while len(ellipsis) > 0 and w + base_w > maxWidth: - ellipsis = ellipsis[0:-1] - base_w, h = dc.GetTextExtent(ellipsis) - if len(text) > lenText: - return drawntext + ellipsis - else: - return text