Apply stat transform in data.powerStatList.GetFromOutput and fix anoint

Author: vaisest

src/Classes/CalcsTab.lua

@@ -674,10 +674,6 @@ end
 function CalcsTabClass:CalculatePowerStat(selection, original, modified)
 	local originalValue = data.powerStatList.GetFromOutput(original, selection)
 	local modifiedValue = data.powerStatList.GetFromOutput(modified, selection)
-	if selection.transform then
-		originalValue = selection.transform(originalValue)
-		modifiedValue = selection.transform(modifiedValue)
-	end
 	return originalValue - modifiedValue
 end
 

src/Classes/CompareTab.lua

@@ -2652,10 +2652,7 @@ function CompareTabClass:ComparePowerBuilder(compareEntry, powerStat, categories
 	end
 
 	-- Get baseline stat value for percentage calculation
-	local baseStatValue = data.powerStatList.GetFromOutput(calcBase, powerStat)[powerStat.stat]
-	if powerStat.transform then
-		baseStatValue = powerStat.transform(baseStatValue)
-	end
+	local baseStatValue = data.powerStatList.GetFromOutput(calcBase, powerStat)
 
 	-- Helper to format an impact value and compute percentage
 	local function formatImpact(impact)

src/Classes/ItemDBControl.lua

@@ -244,9 +244,6 @@ function ItemDBClass:ListBuilder()
 				if self.itemsTab:IsItemValidForSlot(item, slotName) and not slot.inactive and (not slot.weaponSet or slot.weaponSet == (self.itemsTab.activeItemSet.useSecondWeaponSet and 2 or 1)) then
 					local output = calcFunc(item.base.flask and { toggleFlask = item } or item.base.charm and { toggleCharm = item } or { repSlotName = slotName, repItem = item }, useFullDPS)
 					local measuredPower = data.powerStatList.GetFromOutput(output, self.sortDetail)
-					if self.sortDetail.transform then
-						measuredPower = self.sortDetail.transform(measuredPower)
-					end
 					item.measuredPower = item.measuredPower and m_max(item.measuredPower, measuredPower) or measuredPower
 				end
 			end

src/Classes/ItemsTab.lua

@@ -1144,7 +1144,15 @@ function ItemsTabClass:Load(xml, dbFileName)
 					stat = child.attrib.stat,
 					weightMult = tonumber(child.attrib.weightMult)
 				}
-				t_insert(self.tradeQuery.statSortSelectionList, statSort)
+				for _, statEntry in ipairs(data.powerStatList) do
+					if statSort.stat == statEntry.stat then
+						-- update information which can be out of data or missing in the xml
+						statSort.label = statEntry.label
+						statSort.transform = statEntry.transform
+						t_insert(self.tradeQuery.statSortSelectionList, statSort)
+						break
+					end
+				end
 			end
 		end
 	end

src/Classes/NotableDBControl.lua

@@ -135,7 +135,7 @@ end
 
 function NotableDBClass:BuildSortOrder()
 	wipeTable(self.sortDropList)
-	for id,stat in pairs(data.powerStatList) do
+	for id, stat in ipairs(data.powerStatList) do
 		if not stat.ignoreForItems then
 			t_insert(self.sortDropList, {
 				label="Sort by "..stat.label,
@@ -161,10 +161,6 @@ end
 function NotableDBClass:CalculatePowerStat(selection, original, modified)
 	local originalValue = data.powerStatList.GetFromOutput(original, selection)
 	local modifiedValue = data.powerStatList.GetFromOutput(modified, selection)
-	if selection.transform then
-		originalValue = selection.transform(originalValue)
-		modifiedValue = selection.transform(modifiedValue)
-	end
 	return originalValue - modifiedValue
 end
 

src/Modules/Data.lua

@@ -180,27 +180,34 @@ data.powerStatList = {
 
 ---@param output any Calc output
 ---@param statTable StatTable Table with stats as in data.powerStatList
+---@param skipTransform? boolean Whether the stat transform should be skipped. This is useful if you want to e.g. divide two less is better stats
 ---@return number
-function data.powerStatList.GetFromOutput(output, statTable)
-	if statTable.stat == "FullDPS" then
-		if output[statTable.stat] ~= nil then
-			return output[statTable.stat] or 0
+function data.powerStatList.GetFromOutput(output, statTable, skipTransform)
+	local function getEntry()
+		if statTable.stat == "FullDPS" then
+			if output[statTable.stat] ~= nil then
+				return output[statTable.stat] or 0
+			end
+			-- if the user doesn't have full dps, we default to adding the player and minion dps together
+			return (output.CombinedDPS or 0) + (output.Minion and output.Minion.CombinedDPS)
 		end
-		-- if the user doesn't have full dps, we default to adding the player and minion dps together
-		return (output.CombinedDPS or 0) + (output.Minion and output.Minion.CombinedDPS)
-	end
-	-- minion-only stats
-	local minionStat = statTable.stat:match("^Minion(.+)")
-	if minionStat then
-		return output.Minion and output.Minion[minionStat] or 0
+		-- minion-only stats
+		local minionStat = statTable.stat:match("^Minion(.+)")
+		if minionStat then
+			return output.Minion and output.Minion[minionStat] or 0
+		end
+		-- damage stats use a combination of player and minion dps
+		local isDamageStat = statTable.stat == "AverageDamage" or statTable.stat == "TotalDot" or
+			statTable.stat:match("DPS")
+		if isDamageStat then
+			return (output[statTable.stat] or 0) + (output.Minion and output.Minion[statTable.stat] or 0)
+		end
+		return output[statTable.stat] or 0
 	end
-	-- damage stats use a combination of player and minion dps
-	local isDamageStat = statTable.stat == "AverageDamage" or statTable.stat == "TotalDot" or
-		statTable.stat:match("DPS")
-	if isDamageStat then
-		return (output[statTable.stat] or 0) + (output.Minion and output.Minion[statTable.stat] or 0)
+	if statTable.transform and not skipTransform then
+		return statTable.transform(getEntry())
 	end
-	return output[statTable.stat] or 0
+	return getEntry()
 end
 -- these stats don't exist on minions or generally don't exist on both player and minion
 local minionNonApplicableStats = {