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

Moved and splitted util.py into gui.utils.numberFormatter and gui.utils.clipboard; GetPartialText moved into gui.utils.drawUtils.py

Browse Source
This commit is contained in:
HomeWorld
2010-12-22 17:57:21 +02:00
parent 11d5f37606
commit adae21452a
20 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinStatsViews/capacitorViewFull.py
View File

@@ -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"

2
gui/builtinStatsViews/firepowerViewFull.py
View File

@@ -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"

2
gui/builtinStatsViews/priceViewFull.py
View File

@@ -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):

2
gui/builtinStatsViews/rechargeViewFull.py
View File

@@ -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

2
gui/builtinStatsViews/resistancesViewFull.py
View File

@@ -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

2
gui/builtinStatsViews/resourcesViewFull.py
View File

@@ -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"

4
gui/builtinStatsViews/targetingMiscViewFull.py
View File

@@ -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))

3
gui/builtinViewColumns/attributeDisplay.py
View File

@@ -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):

2
gui/builtinViewColumns/capacitorUse.py
View File

@@ -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

2
gui/builtinViewColumns/maxRange.py
View File

@@ -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):

4
gui/builtinViewColumns/price.py
View File

@@ -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"

4
gui/builtinViewColumns/propertyDisplay.py
View File

@@ -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"

3
gui/builtinViewColumns/tracking.py
View File

@@ -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

2
gui/fleetBrowser.py
View File

@@ -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

2
gui/itemStats.py
View File

@@ -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):

2
gui/mainFrame.py
View File

@@ -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

2
gui/patternEditor.py
View File

@@ -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

19
gui/utils/clipboard.py Normal file
View File

@@ -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

29
gui/utils/drawUtils.py
View File

@@ -53,4 +53,31 @@ def DrawGradientBar(width, height, gStart, gEnd, gMid = None):
mdc.SelectObject(wx.NullBitmap)
return canvas
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

48
util.py → gui/utils/numberFormatter.py
View File

@@ -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