wow/ouroloot: gui.lua comparison

comparison gui.lua @ 6:df3e27edbd60

Much work on history tab.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Wed, 15 Jun 2011 03:59:13 +0000
parents	7adbc59de8fe
children	9a37bd40eb5e

comparison

equal deleted inserted replaced

-:7adbc59de8fe
+:df3e27edbd60
 local addon = select(2,...)
 --[[
 Purely the AceGUI-related routines, and the subroutines needed for support.
 ------ Constants
------- Locals
+------ Globals
 ------ Behind the scenes routines
 ------ Main GUI Window
 ------ Popup dialogs
 ]]
 	[3] = {value=""},
 } }
 local time_column1_used_mt = addon.time_column1_used_mt
------- Locals
+------ Globals
 local GUI = LibStub("AceGUI-3.0")
 local flib = LibStub("LibFarmbuyer")
 local g_loot			= nil
 local g_generated		= nil
 	end
 end
 do
 	function addon:_fill_out_hist_data (opt_starting_index)
+		local new, del = flib.new, flib.del
 		-- Clearing history finishes this function with #hist==0 and hist_clean==0.
 		-- The next call typically detects this (#<1) and handles it.  If loot is
 		-- recorded before then, it results in hist_clean==0 and #hist==1, which
 		-- breaks the first iteration of the loop.  Thus, the "extra" test here:
 		if #self.history < 1 or self.hist_clean == 0 then
 			self.hist_clean = nil
 			opt_starting_index = nil
 		end
 		if not self.history.st then
+			--print"creating ST!"
 			self.history.st = {
 				--[[{ kind = "realm",
 				  cols = setmetatable({
 					{ value = self.history.realm },
 				  }, time_column1_used_mt)
 			    }]]
 			}
 		end
+		-- for now
+		if self.hist_clean == #self.history then return end
 		local st = self.history.st
-		for i = (opt_starting_index or self.hist_clean or 1), #self.history do
+		--print("starting history loop, #st ==", #st, "#history ==", #self.history)
-			local h = self.history[i]
+		for i,t in ipairs(st) do
-			local sti = i
+			del(t.cols[1])
-			if not st[sti] then
+			del(t.cols[2])
-				st[sti] = { kind = "history" }
+			del(t.cols[3])
-			end
+			del(t.cols)
-			local sth = st[sti]   -- corresponding ST entry for h
+			del(t)
+			st[i] = nil
-			sth.cols = sth.cols or {
+		end
-				{ value = h.name },
-				{},--{ value = h[1].id },
+		--for i = (opt_starting_index or self.hist_clean or 1), #self.history do
-				{},--{ value = h[1].when },
+		local cache_okay = true
-			}
+		for pi,player in ipairs(self.history) do
+			local col1 = new()
-			if sth.shown ~= h[1].id then
+			col1.OLi   = pi
-				-- things have changed, redo the row with new data
+			col1.OLn   = #player
-				local itexture = GetItemIcon(h[1].id)
+			col1.value = player.name   -- may spiffy this up in future
-				local iname, ilink, iquality = GetItemInfo(h[1].id)
+			for li,loot in ipairs(player) do
+				local col2 = new()
+				col2.OLi   = li
+				local col3 = new()
+				col3.value = loot.when
+				local itexture = GetItemIcon(loot.id)
+				local iname, ilink, iquality = GetItemInfo(loot.id)
 				local textured
 				if itexture and iname then
-					textured = eoi_st_textured_item_format:format (itexture, self.quality_hexes[iquality], iname, h[1].count or "")
+					textured = eoi_st_textured_item_format:format (itexture,
-					sth.shown = h[1].id
+						self.quality_hexes[iquality], iname, loot.count or "")
 				else
-					textured = eoi_st_textured_item_format:format ([[ICONS\INV_Misc_QuestionMark]], self.quality_hexes[1], 'UNKNOWN', "")
+					textured = eoi_st_textured_item_format:format ([[ICONS\INV_Misc_QuestionMark]],
+						self.quality_hexes[ITEM_QUALITY_COMMON], 'UNKNOWN - TRY AGAIN', "")
+					cache_okay = false
 				end
-				sth.cols[2].value = textured
+				col2.value = textured
-				sth.cols[3].value = h[1].when
+				local dotcols = new (col1, col2, col3)
+				local st_entry = new()
+				st_entry.kind = 'history'
+				st_entry.OLwho = player.name
+				st_entry.cols = dotcols
+				tinsert (st, st_entry)
 			end
+		end
-		end
-		self.hist_clean = #self.history
+		--print("finished history loop, #st ==", #st)
-	end
+		self.hist_clean = cache_okay and #self.history or nil
+	end
 end
 ------ Main GUI Window
 -- Lots of shared data here, kept in a large local scope.  For readability,
 	["hist"] = {title=[[History]], desc=[[A short semi-permanent record]]},
 	["help"] = {title=[[Help]], desc=[[Instructions, reminders, and tips for non-obvious features]]},
 	["opt"] = {title=[[Options]], desc=[[Options for fine-tuning behavior]]},
 	--["adv"] = {title=[[Advanced]], desc=[[Debugging and testing]]},
 }
-if addon.author_debug then
+--if addon.author_debug then
 _taborder = { "eoi", "hist", "help", "opt" }
-else _taborder = { "eoi", "help", "opt" } end
+--else _taborder = { "eoi", "help", "opt" } end
 --[[
 This is a table of callback functions, each responsible for drawing a tab
 into the container passed in the first argument.  Special-purpose buttons
 can optionally be created (mkbutton) and added to the container in the second
 		local name, arg, tiptext
 		name, tiptext = strsplit('|',tag)
 		name, arg = strsplit('%',name)
 		if name == "--" then
 			tinsert (initial, {
-				disabled = true, text = "",
+				disabled = true, notCheckable = true, text = "",
 			})
 		else
 			if not funcs[name] then
 				error(("'%s' not defined as a dropdown function"):format(name))
 			end
 	end
 	return true  -- do not do anything further
 end
-local function hist_st_OnClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, ...)
-	if (row == nil) or (realrow == nil) then return false end  -- click column header, do default resorting
-	local h = data[realrow]
-	local kind = h.kind
-	return true  -- do not do anything further
-end
-local function hist_st_OnDoubleClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, ...)
-	if (row == nil) or (realrow == nil) then return true end  -- they clicked on column header, suppress reordering
-	local h = data[realrow]
-	local kind = h.kind
-	return true  -- do not do anything further
-end
 -- Used for EOI column 2 and Hist column 1.  Both are player name columns.
 local function eoi_st_col2_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable, ...)
 	if not fShow then
 		cellFrame.text:SetText("")
 		if cellFrame.icontexture then
 			cellFrame.icontexture:Hide()
 		end
 		name	= "Notes",
 		width	= 250,
 	},
 }
-local rowfilter_all
+local player_filter_all
-local rowfilter_by_name = function (st, e)
+local player_filter_by_name = function (st, e)
 	if e.kind ~= 'loot' then return true end
 	return e.person == _d:GetUserData("player filter name")
 end
 -- Tab 1:  Events Of Interest (implementation)
 	end
 	-- No need to keep creating function closures that all just "return true",
 	-- instead we grab the one made inside lib-st.  There's no "get filter" API
 	-- so we just reach inside.
-	rowfilter_all = ST.Filter
+	player_filter_all = ST.Filter
 	-- Now set up the future drawing function...
 	tabs_OnGroupSelected["eoi"] = function(container,specials)
 		local st_widget = GUI:Create("lib-st")
 		local st = _d:GetUserData("eoiST")
 		-- This is actually required each time
-		_d:SetUserData ("player filter clear", rowfilter_all)
+		_d:SetUserData ("player filter clear", player_filter_all)
-		_d:SetUserData ("player filter by name", rowfilter_by_name)
+		_d:SetUserData ("player filter by name", player_filter_by_name)
 		st:OuroLoot_Refresh()
 		st_widget:WrapST(st)
 		st_widget.head_offset = 15
 		st_widget.tail_offset = 0
 		local b = mkbutton('eoi_filter_reset', "Reset Player Filter",
 			[[Return to showing complete loot information.]])
 		b:SetFullWidth(true)
 		b:SetCallback("OnClick", function (_b)
 			local st = _d:GetUserData("eoiST")
-			st:SetFilter(rowfilter_all)
+			st:SetFilter(player_filter_all)
 			_b:SetDisabled(true)
 		end)
-		b:SetDisabled(st.Filter == rowfilter_all)
+		b:SetDisabled(st.Filter == player_filter_all)
 		specials:AddChild(b)
 		local people = { "<nobody>" }
 		for i=1,GetNumRaidMembers() do
 			tinsert(people,(GetRaidRosterInfo(i)))
 			sort = "asc",
 			sortnext = 1,
 		},
 	}
+	local hist_normal_status = [[Click on a row to view all history for that player only.  (Click column headers to re-sort.)]]
+	local hist_name_status = [[Right-click on any row to return to normal history display.]]
+	local history_filter_by_recent = function (st, e)
+		if e.kind ~= 'history' then return true end
+		return e.cols[2].OLi == 1
+	end
+	local history_filter_who
+	local history_filter_by_name = function (st, e)
+		if e.kind ~= 'history' then return true end
+		return e.OLwho == history_filter_who
+	end
 	-- Loot column
 	local function hist_st_col2_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable, ...)
+		print("col2 DCU", realrow)
 	end
 	-- Formatted timestamp column
 	local function hist_st_col3_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable, ...)
+		print("col3 DCU", realrow)
 		if not fShow then
 			cellFrame.text:SetText("")
 			return
 		end
 			stable:SetHighLightColor (rowFrame, eoi_st_otherrow_bgcolortable[d.kind])
 		--else
 		--	table:SetHighLightColor (rowFrame, table:GetDefaultHighlightBlank())
 		--end
 	end
+	local function hist_st_OnClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, ...)
+		if (row == nil) or (realrow == nil) then return false end  -- click column header, do default resorting
+		local h = data[realrow]
+		local kind = h.kind
+		if history_filter_who and button == "RightButton" then  -- now filtering and wanting not to
+			history_filter_who = nil
+			stable:SetFilter(history_filter_by_recent)
+			setstatus(hist_normal_status)
+		elseif (not history_filter_who) and button == "LeftButton" then  -- not filtering and wanting to
+			history_filter_who = h.OLwho
+			stable:SetFilter(history_filter_by_name)
+			setstatus(hist_name_status)
+		end
+		return true  -- do not do anything further
+	end
+	--[[
+	local function hist_st_OnDoubleClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, ...)
+		if (row == nil) or (realrow == nil) then return true end  -- they clicked on column header, suppress reordering
+		local h = data[realrow]
+		local kind = h.kind
+		return true  -- do not do anything further
+	end]]
 	tabs_OnGroupSelected["hist"] = function(container,specials)
 		histST = LibStub("ScrollingTable"):CreateST(hist_st_cols,eoi_st_displayed_rows,eoi_st_rowheight)
 		if addon.author_debug then
 			_G.OLHST = histST
 		histST:SetData(addon.history.st)
 		histST:RegisterEvents{
 			OnEnter = eoi_st_OnEnter,
 			OnLeave = eoi_st_OnLeave,
 			OnClick = hist_st_OnClick,
-			--OnDoubleClick = eoi_st_OnDoubleClick,
+			--OnDoubleClick = hist_st_OnDoubleClick,
 		}
 		local oldrefresh = histST.Refresh
 		histST.Refresh = function (self, opt_index)
 			addon:_fill_out_hist_data(opt_index)
 			return oldrefresh(self)
 		histST.OuroLoot_Refresh = function (self, opt_index)
 			addon:_fill_out_hist_data(opt_index)
 			self:SortData()  -- calls hooked refresh
 		end
-		local function reset_current_realm()
+		histST:SetFilter(history_filter_by_recent)
-			local r = assert(GetRealmName())
+		-- Zaps history for the given realm, or the current (current-playing
+		-- realm, not currently-displayed realm) one if not specified.
+		local function reset_current_realm (opt_realmname)
+			local r = assert(opt_realmname or GetRealmName())
 			-- new .history table:
 			addon.history_all[r] = addon:_prep_new_history_category (nil, r)
 			addon.history = addon.history_all[r]
 			addon.hist_clean = nil
 			-- new .history.st table:
 			histST:OuroLoot_Refresh()
 			histST:SetData(addon.history.st)
-			addon:Print("You've clicked the history erase button!")
 		end
 		tabs_OnGroupSelected["hist"] = function(container,specials)
 			local st_widget = GUI:Create("lib-st")
 			histST:OuroLoot_Refresh()
 			st_widget:WrapST(histST)
 			st_widget.head_offset = 15
 			st_widget.tail_offset = 0
 			container:SetLayout("Fill")
 			container:AddChild(st_widget)
+			setstatus(hist_normal_status)
 			local b
 			do
 				local realms,current = {},1
 				for realmname,histtable in pairs(addon.history_all) do
 				b:SetFullWidth(true)
 				b:SetLabel()  -- required even when empty, see ace3 ticket #234
 				b:SetList(realms)
 				b:SetValue(current)
 				b:SetCallback("OnValueChanged", function(_dd,event,choice)
-					print("chose realm", choice, realms[choice])
+					local r = realms[choice]
+					addon.history = addon:_prep_new_history_category (addon.history_all[r], r)
+					addon.hist_clean = nil
+					histST:OuroLoot_Refresh()
+					histST:SetData(addon.history.st)
+					-- Reset filters to normal
+					history_filter_who = nil
+					histST:SetFilter(history_filter_by_recent)
+					setstatus(hist_normal_status)
+					return addon:redisplay()
 				end)
 				specials:AddChild(b)
 			end
-			--[[
+			--[[ b = GUI:Create("Spacer") b:SetFullWidth(true) b:SetHeight(10) specials:AddChild(b) ]]
-			b = GUI:Create("Spacer")
-			b:SetFullWidth(true)
-			b:SetHeight(10)
-			specials:AddChild(b)
-			]]
 			b = mkbutton("Regenerate",
 				[[Erases all history entries from the displayed realm, and regenerates it from current loot information.]])
 			b:SetFullWidth(true)
 			b:SetDisabled (#addon.history == 0)
 			b:SetCallback("OnClick", function(_b)
+				addon:rewrite_history (addon.history.realm)
+				histST:OuroLoot_Refresh()
+				histST:SetData(addon.history.st)
 				addon:Print("%s history has been regenerated.", addon.history.realm)
 				return addon:redisplay()
-				--return tabs_OnGroupSelected_func(container,"OnGroupSelected","hist")
 			end)
 			specials:AddChild(b)
 			b = mkbutton('hist_clear', "Clear Realm History",
 				[[No confirmation!  |cffff1010Erases absolutely all> history entries from the displayed realm.]])
 			b:SetFullWidth(true)
 			b:SetCallback("OnClick", function (_b)
-				reset_current_realm()
+				reset_current_realm(addon.history.realm)
+				addon:Print("Stimpy, you idiot!  You've pushed the history erase button!")
 				return addon:redisplay()
 			end)
 			specials:AddChild(b)
 			b = mkbutton('hist_clear_all', "Clear All History",
 				[[No confirmation!  |cffff1010Erases absolutely all> history entries from ALL realms.]])
 			b:SetFullWidth(true)
 			b:SetCallback("OnClick", function (_b)
 				addon.history_all = {}
 				reset_current_realm()
+				addon:Print("Stimpy, you idiot!  You've pushed the history erase button!")
 				return addon:redisplay()
 			end)
 			specials:AddChild(b)
 			b = mkbutton('hist_clear_old', "Clear Older",
-				[[Preserves only the latest loot entry for each player on the current realm, removing all earlier ones.]])
+				[[Preserves only the latest loot entry for each player on the displayed realm, removing all earlier ones.]])
 			b:SetFullWidth(true)
 			b:SetCallback("OnClick", function (_b)
+				addon:preen_history(addon.history.realm)
 				addon:Print("All loot prior to the most recent entries has been erased.")
+				addon.hist_clean = nil
+				histST:OuroLoot_Refresh()
 				return addon:redisplay()
-				--return tabs_OnGroupSelected_func(container,"OnGroupSelected","hist")
 			end)
 			specials:AddChild(b)
 		end
 		return tabs_OnGroupSelected["hist"](container,specials)
 	end
 end
--- Tab 5:  Help (content in lootaux.lua)
+-- Tab 5:  Help (content in verbage.lua)
 do
 	local tabs_help_OnGroupSelected_func = function (treeg,event,category)
 		treeg:ReleaseChildren()
 		local txt = GUI:Create("Label")
 		txt:SetFullWidth(true)
 				addon:Print("No longer filtering out", val_name)
 			end)
 			grp:AddChild(w)
 		end
-		scroll:AddChild(grp)
 		addon.sender_list.sort()
 		if #addon.sender_list.namesI > 0 then
 			local senders = table.concat(addon.sender_list.namesI,'\n')   -- sigh
 			-- If 39 other people in the raid are running this, the label will
 			-- explode... is it likely enough to care about?  No.
 			w = GUI:Create("Label")
 			w:SetRelativeWidth(0.4)
 			w:SetText(addon.quality_hexes[3].."Echo from latest ping:|r\n"..senders)
 			grp:AddChild(w)
 		end
+		scroll:AddChild(grp)
 		w = mkbutton("ReloadUI", [[Does what you think it does.  Loot information is written out and restored.]])
 		w:SetFullWidth(true)
 		w:SetCallback("OnClick", ReloadUI)
 		specials:AddChild(w)
 	]]
 	display:SetCallback("OnClose", function(_display)
 		_d = _display:GetUserData("eoiST")
 		self.display = nil
 		GUI:Release(_display)
+		flib.clear()
 		collectgarbage()
 	end)
 	----- Right-hand panel
 	local rhs_width = 0.20

Mercurial > wow > ouroloot

comparison gui.lua @ 6:df3e27edbd60