From 15ba7c863c662145a956823250a86c6cbe946e29 Mon Sep 17 00:00:00 2001 From: Michael Specht Date: Thu, 15 Feb 2018 11:06:20 +0100 Subject: [PATCH] cleaned up watch diagrams --- champ.rb | 250 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 164 insertions(+), 86 deletions(-) diff --git a/champ.rb b/champ.rb index 95e7fed..17f1c5e 100755 --- a/champ.rb +++ b/champ.rb @@ -14,6 +14,34 @@ KEYWORDS = <= 0x20 && c.ord < 0x80 + font_index = (c.ord - 0x20) * 5 + (0...5).each do |px| + (0...7).each do |py| + if ((FONT[font_index + px] >> py) & 1) == 1 + pixels[(y + py) * width + (x + px)] = color + end + end + end + end + end + + def print_c_r(pixels, width, height, x, y, c, color) + if c.ord >= 0x20 && c.ord < 0x80 + font_index = (c.ord - 0x20) * 5 + (0...5).each do |px| + (0...7).each do |py| + if ((FONT[font_index + px] >> (6 - py)) & 1) == 1 + pixels[(y + px) * width + (x + py)] = color + end + end + end + end + end + + def print_s(pixels, width, height, x, y, s, color) + s.each_char.with_index do |c, i| + print_c(pixels, width, height, x + i * 6, y, c, color) + end + end + + def print_s_r(pixels, width, height, x, y, s, color) + s.each_char.with_index do |c, i| + print_c_r(pixels, width, height, x, y + i * 6, c, color) + end + end + def write_report html_name = 'report.html' print "Writing report to file://#{File.absolute_path(html_name)} ..." File::open(html_name, 'w') do |f| report = DATA.read - report.sub!('#{source_name}', File.basename(@source_path)) # write frames io = StringIO.new @@ -246,7 +311,6 @@ class Champ io = StringIO.new @watches_for_index.each.with_index do |watch, index| io.puts "
" - io.puts "

#{watch[:components].map { |x| x[:name] }.join('/')} (#{File.basename(@source_path)}:#{watch[:line_number]})

" if @watch_values.include?(index) pixels = nil width = nil @@ -279,18 +343,24 @@ class Champ end histogram_max = histogram.values.max - width = 256 - height = (watch[:components].size == 1) ? 128 : 256 - pixels = [64] * width * height + width = 276 + height = (watch[:components].size == 1) ? 148 : 276 + canvas_top = 20 + canvas_left = 40 + canvas_width = width - 60 + canvas_height = height - 60 + pixels = [0] * width * height histogram.each_pair do |key, value| x = key & 0xff; - y = height - 1 - ((key >> 8) & 0xff) + y = (((key ^ 0xff) >> 8) & 0xff) + x = (x * canvas_width) / 255 + canvas_left + y = (y * canvas_height) / 255 + canvas_top ymin = y ymax = y if watch[:components].size == 1 - ymin = height - 1 - (value.to_f * (height - 1) / histogram_max).to_i - ymax = height - 1 + ymin = canvas_top + canvas_height - 1 - (value.to_f * (canvas_height - 1) / histogram_max).to_i + ymax = canvas_top + canvas_height - 1 end (ymin..ymax).each do |y| (0..6).each do |dy| @@ -300,8 +370,8 @@ class Champ next if mask[dy][dx] == 0 px = x + dx - 3 if px >= 0 && px < width - if pixels[py * width + px] == 64 - pixels[py * width + px] = 0 + if pixels[py * width + px] == 0 + pixels[py * width + px] = 1 end end end @@ -310,85 +380,93 @@ class Champ pixels[y * width + x] = (((value.to_f / histogram_max) ** 0.5) * 63).to_i end end -# if watch[:components].size == 1 -# @watch_values[index].each do |item| -# if watch[:components][0][:type] == 's8' -# item[0] += 128 -# elsif watch[:components][0][:type] == 'u16' -# item[0] >>= 8 -# elsif watch[:components][0][:type] == 's16' -# item[0] = (item[0] + 32768) >> 8 -# end -# histogram[item] ||= 0 -# histogram[item] += 1 -# end -# histogram_max = histogram.values.max -# width = 256 -# height = 128 -# pixels = [64] * width * height -# histogram.each_pair do |key, value| -# key_parts = key -# (0..(((value.to_f / histogram_max) * 127).to_i)).each do |y| -# x = key_parts[0] -# pixels[(127 - y) * width + x] = (((value.to_f / histogram_max) ** 0.5) * 63).to_i -# end -# end -# elsif watch[:components].size == 2 -# @watch_values[index].each do |item| -# normalized_item = [] -# item.each.with_index do |x, i| -# if watch[:components][i][:type] == 's8' -# x += 128 -# elsif watch[:components][i][:type] == 'u16' -# x >>= 8 -# elsif watch[:components][i][:type] == 's16' -# x = (x + 32768) >> 8 -# end -# normalized_item << x -# end -# offset = (normalized_item[1] << 8) + normalized_item[0] -# histogram[offset] ||= 0 -# histogram[offset] += 1 -# end -# histogram_max = histogram.values.max -# width = 256 -# height = 256 -# pixels = [64] * width * height -# histogram.each_pair do |key, value| -# x = key & 0xff; -# y = 255 - ((key >> 8) & 0xff) -# (0..6).each do |dy| -# py = y + dy - 3 -# if py >= 0 && py < height -# (0..6).each do |dx| -# next if mask[dy][dx] == 0 -# px = x + dx - 3 -# if py >= 0 && py < height -# if pixels[py * width + px] == 64 -# pixels[py * width + px] = 0 -# end -# end -# end -# end -# end -# pixels[y * width + x] = (((value.to_f / histogram_max) ** 0.5) * 63).to_i -# end -# end + + watch[:components].each.with_index do |component, component_index| + labels = [] + if component[:type] == 'u8' + labels << [0.0, '0'] + labels << [64.0/255, '64'] + labels << [128.0/255, '128'] + labels << [192.0/255, '192'] + labels << [1.0, '255'] + elsif component[:type] == 's8' + labels << [0.0, '-128'] + labels << [64.0/255, '-64'] + labels << [128.0/255, '0'] + labels << [192.0/255, '64'] + labels << [1.0, '127'] + elsif component[:type] == 'u16' + labels << [0.0, '0'] + labels << [64.0/255, '16k'] + labels << [128.0/255, '32k'] + labels << [192.0/255, '48k'] + labels << [1.0, '64k'] + elsif component[:type] == 's16' + labels << [0.0, '-32k'] + labels << [64.0/255, '-16k'] + labels << [128.0/255, '0'] + labels << [192.0/255, '16k'] + labels << [1.0, '32k'] + end + labels.each do |label| + s = label[1] + if component_index == 0 + x = (label[0] * canvas_width).to_i + canvas_left + print_s(pixels, width, height, + (x - s.size * (6 * label[0])).to_i, + canvas_top + canvas_height + 7, s, 63) + (0..(canvas_height + 3)).each do |y| + pixels[(y + canvas_top) * width + x] |= 0x40 + end + else + y = ((1.0 - label[0]) * canvas_height).to_i + canvas_top + print_s_r(pixels, width, height, canvas_left - 12, + (y - s.size * (6 * (1.0 - label[0]))).to_i, s, 63) + (-3..canvas_width).each do |x| + pixels[y * width + (x + canvas_left)] |= 0x40 + end + end + end + if component_index == 0 + print_s(pixels, width, height, + (canvas_left + canvas_width * 0.5 - component[:name].size * 3).to_i, + canvas_top + canvas_height + 18, + component[:name], 63) + else + print_s_r(pixels, width, height, + canvas_left - 22, + (canvas_top + canvas_height * 0.5 - component[:name].size * 3).to_i, + component[:name], 63) + end + end + label = "#{watch[:path]}:#{watch[:line_number]}" + print_s(pixels, width, height, width - 6 * label.size - 3, height - 10, label, 63) if pixels - gi, go, gt = Open3.popen2("./pgif #{width} #{height} 65") + gi, go, gt = Open3.popen2("./pgif #{width} #{height} 128") + palette = [''] * 128 (0...64).each do |i| - l = (((63 - i) + 1) << 2) - 1 - # fce98d - r = 0xfc - g = 0xe9 - b = 0x8d - gi.puts sprintf('%02x%02x%02x', - l * r / 255, - l * g / 255, - l * b / 255) + if (i == 0) + r = 0xff + g = 0xff + b = 0xff + else + l = (((63 - i) + 1) << 2) - 1 + # fce98d + tr = 0xfc + tg = 0xe9 + tb = 0x8d + r = l * tr / 255 + g = l * tg / 255 + b = l * tb / 255 + end + palette[i] = sprintf('%02x%02x%02x', r, g, b) + r = r * 4 / 5 + g = g * 4 / 5 + b = b * 4 / 5 + palette[i + 64] = sprintf('%02x%02x%02x', r, g, b) end - gi.puts 'ffffff' + gi.puts palette.join("\n") gi.puts 'f' gi.puts pixels.map { |x| sprintf('%02x', x) }.join("\n") gi.close @@ -530,6 +608,7 @@ class Champ # Au Au(post) As Xs(post) RX u8 Au,Xu,Yu result = {} s = s[1, s.size - 1] if s[0] == '@' + result[:path] = File.basename(@source_path) if global_variable if ['u8', 's8', 'u16', 's16'].include?(s) result[:type] = s @@ -601,7 +680,6 @@ __END__ -

champ report for #{source_name}

Frames

#{screenshots}