From 0d25eca6e501a6b393c7d23c7f43836b3401ec85 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Fri, 10 Jun 2016 21:10:04 -0700 Subject: [PATCH 1/6] Added base column --- gui/itemStats.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/gui/itemStats.py b/gui/itemStats.py index ad3e49b6c..21dd9f56d 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -84,9 +84,9 @@ class ItemStatsDialog(wx.Dialog): self.SetMinSize((300, 200)) if "wxGTK" in wx.PlatformInfo: # GTK has huge tab widgets, give it a bit more room - self.SetSize((530, 300)) + self.SetSize((580, 500)) else: - self.SetSize((500, 300)) + self.SetSize((550, 500)) #self.SetMaxSize((500, -1)) self.mainSizer = wx.BoxSizer(wx.VERTICAL) self.container = ItemStatsContainer(self, victim, item, itmContext) @@ -246,7 +246,7 @@ class ItemDescription ( wx.Panel ): if not item.description: return - desc = item.description.replace("\n", "
") + desc = item.description.replace("\r", "
") # Strip font tags desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P.*?)<( *)/( *)font( *)>", "\g", desc) # Strip URLs @@ -341,9 +341,12 @@ class ItemParams (wx.Panel): def PopulateList(self): self.paramList.InsertColumn(0,"Attribute") - self.paramList.InsertColumn(1,"Value") - self.paramList.SetColumnWidth(1,150) - self.paramList.setResizeColumn(1) + self.paramList.InsertColumn(1,"Current Value") + self.paramList.InsertColumn(2,"Base Value") + self.paramList.SetColumnWidth(0,110) + self.paramList.SetColumnWidth(1,90) + self.paramList.SetColumnWidth(2,90) + self.paramList.setResizeColumn(0) self.imageList = wx.ImageList(16, 16) self.paramList.SetImageList(self.imageList,wx.IMAGE_LIST_SMALL) @@ -354,9 +357,11 @@ class ItemParams (wx.Panel): idCount = 0 for name in names: info = self.attrInfo.get(name) - - att = self.attrValues[name] + + valDefault = getattr(info, "value", None) + valueDefault = valDefault if valDefault is not None else att + val = getattr(att, "value", None) value = val if val is not None else att @@ -395,8 +400,15 @@ class ItemParams (wx.Panel): else: valueUnit = formatAmount(value, 3, 0, 0) + if self.toggleView != 1: + valueUnitDefault = str(valueDefault) + elif info and info.unit: + valueUnitDefault = self.TranslateValueUnit(valueDefault, info.unit.displayName, info.unit.name) + else: + valueUnitDefault = formatAmount(valueDefault, 3, 0, 0) self.paramList.SetStringItem(index, 1, valueUnit) + self.paramList.SetStringItem(index, 2, valueUnitDefault) From 45006fe0439a7ff4af6f434fd561cc26fb85872a Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Sun, 12 Jun 2016 12:30:29 -0700 Subject: [PATCH 2/6] reverted back to original --- gui/itemStats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/itemStats.py b/gui/itemStats.py index 21dd9f56d..f93c9a34f 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -246,7 +246,7 @@ class ItemDescription ( wx.Panel ): if not item.description: return - desc = item.description.replace("\r", "
") + desc = item.description.replace("\n", "
") # Strip font tags desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P.*?)<( *)/( *)font( *)>", "\g", desc) # Strip URLs From 25e298ff69f4d4121004c68547ec0e947f3d0fb8 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Sun, 12 Jun 2016 16:46:18 -0700 Subject: [PATCH 3/6] Updated ECM to be more descriptive Gave it the RAH treatment. Now shows min/max values if it's a racial, and only one for multispectral. Tooltip shows all four broken out. --- gui/builtinViewColumns/misc.py | 35 ++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index c50f23e47..2bd5ee4a6 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -210,23 +210,26 @@ class Miscellanea(ViewColumn): ladar = stuff.getModifiedItemAttr("scanLadarStrengthBonus") radar = stuff.getModifiedItemAttr("scanRadarStrengthBonus") magnet = stuff.getModifiedItemAttr("scanMagnetometricStrengthBonus") - if grav is None or ladar is None or radar is None or magnet is None: + displayMax = max(grav, ladar, radar, magnet) + displayMin = min(grav, ladar, radar, magnet) + if grav is None or ladar is None or radar is None or magnet is None or displayMax is None: return "", None - display = max(grav, ladar, radar, magnet) - if not display: - return "", None - text = "{0}".format(formatAmount(display, 3, 0, 3)) - ttEntries = [] - if display == grav: - ttEntries.append("gravimetric") - if display == ladar: - ttEntries.append("ladar") - if display == magnet: - ttEntries.append("magnetometric") - if display == radar: - ttEntries.append("radar") - plu = "" if len(ttEntries) == 1 else "s" - tooltip = "{0} strength{1}".format(formatList(ttEntries), plu).capitalize() + + if displayMax == displayMin or displayMin is None: + text = "{0}".format( + formatAmount(displayMax, 3, 0, 3), + ) + else: + text = "{0} | {1}".format( + formatAmount(displayMax, 3, 0, 3), + formatAmount(displayMin, 3, 0, 3), + ) + tooltip = "ECM Jammer Strength:\n{0} gravimetric | {1} ladar | {2} magnetometric | {3} radar".format( + formatAmount(grav, 3, 0, 3), + formatAmount(ladar, 3, 0, 3), + formatAmount(radar, 3, 0, 3), + formatAmount(magnet, 3, 0, 3), + ) return text, tooltip elif itemGroup in ("Remote Sensor Booster", "Sensor Booster", "Signal Amplifier"): scanResBonus = stuff.getModifiedItemAttr("scanResolutionBonus") From 32f671b4f278558520461b15a0ee871927efc185 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Sun, 12 Jun 2016 17:06:28 -0700 Subject: [PATCH 4/6] No longer show "base" column when looking at a market item Since they are identical. --- gui/itemStats.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gui/itemStats.py b/gui/itemStats.py index f93c9a34f..c64164a47 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -342,10 +342,12 @@ class ItemParams (wx.Panel): def PopulateList(self): self.paramList.InsertColumn(0,"Attribute") self.paramList.InsertColumn(1,"Current Value") - self.paramList.InsertColumn(2,"Base Value") + if self.stuff is not None: + self.paramList.InsertColumn(2,"Base Value") self.paramList.SetColumnWidth(0,110) self.paramList.SetColumnWidth(1,90) - self.paramList.SetColumnWidth(2,90) + if self.stuff is not None: + self.paramList.SetColumnWidth(2,90) self.paramList.setResizeColumn(0) self.imageList = wx.ImageList(16, 16) self.paramList.SetImageList(self.imageList,wx.IMAGE_LIST_SMALL) @@ -408,7 +410,8 @@ class ItemParams (wx.Panel): valueUnitDefault = formatAmount(valueDefault, 3, 0, 0) self.paramList.SetStringItem(index, 1, valueUnit) - self.paramList.SetStringItem(index, 2, valueUnitDefault) + if self.stuff is not None: + self.paramList.SetStringItem(index, 2, valueUnitDefault) From 4c05d9a6871c8ac506abca3e128de921888223b3 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Mon, 13 Jun 2016 13:54:15 -0700 Subject: [PATCH 5/6] Grouped Attributes override Users are confused because they find the menu to edit attribute overrides, change values, then do not see their values reflected. There is an option that needs to be enabled under the edit menu to show the users overrides. Moved this option from the edit menu to the window menu (next to the existing attributes override editor), and grouped them together. Functionality is not changed, merely placement of the overrides toggle. --- gui/mainMenuBar.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index e8c3cb614..f7d15e574 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -136,12 +136,11 @@ class MainMenuBar(wx.MenuBar): self.Enable(self.exportToEveId, False) if not gui.mainFrame.disableOverrideEditor: + windowMenu.AppendSeparator() attrItem = wx.MenuItem(windowMenu, self.attrEditorId, "Attribute Overrides\tCTRL+B") attrItem.SetBitmap(BitmapLoader.getBitmap("fit_rename_small", "gui")) windowMenu.AppendItem(attrItem) - - editMenu.AppendSeparator() - editMenu.Append(self.toggleOverridesId, "Turn Overrides On") + windowMenu.Append(self.toggleOverridesId, "Turn Overrides On") # Help menu helpMenu = wx.Menu() From 2f6f14fef214fd1ebb1bfc8921c4b71e4c56c75a Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Mon, 13 Jun 2016 18:14:41 -0700 Subject: [PATCH 6/6] Update misc.py --- gui/builtinViewColumns/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 2bd5ee4a6..37e88526c 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -224,7 +224,7 @@ class Miscellanea(ViewColumn): formatAmount(displayMax, 3, 0, 3), formatAmount(displayMin, 3, 0, 3), ) - tooltip = "ECM Jammer Strength:\n{0} gravimetric | {1} ladar | {2} magnetometric | {3} radar".format( + tooltip = "ECM Jammer Strength:\n{0} Gravimetric | {1} Ladar | {2} Magnetometric | {3} Radar".format( formatAmount(grav, 3, 0, 3), formatAmount(ladar, 3, 0, 3), formatAmount(radar, 3, 0, 3),