From 99ca75c1faf9b4024966aab3fc5372355638f9ce Mon Sep 17 00:00:00 2001 From: Soumith Chintala Date: Mon, 14 Oct 2013 13:20:36 -0400 Subject: fixed a rendering issue for long class-names in case of very long class-names, the legend is written on top of %. this interchange should fix that issue while not breaking anything existing. --- ConfusionMatrix.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ConfusionMatrix.lua b/ConfusionMatrix.lua index 81744d9..04bec65 100644 --- a/ConfusionMatrix.lua +++ b/ConfusionMatrix.lua @@ -197,21 +197,21 @@ function ConfusionMatrix:render(sortmode, display, block, legendwidth) win1:setcolor{r=0,g=0,b=0} win1:rectangle((#render)[2],(i-1)*block,legendwidth,block) win1:fill() + + -- % + win1:setfont(qt.QFont{serif=false, size=fontsize}) + local gscale = freqs[order[i]]/freqs:max()*0.9+0.1 --3/4 + win1:setcolor{r=gscale*0.5+0.2,g=gscale*0.5+0.2,b=gscale*0.8+0.2} + win1:moveto((#render)[2]+10,i*block-block/3) + win1:show(string.format('[%2.2f%% labels]',math.floor(freqs[order[i]]*10000+0.5)/100)) -- legend win1:setfont(qt.QFont{serif=false, size=fontsize}) local gscale = diag[order[i]]*0.8+0.2 win1:setcolor{r=gscale,g=gscale,b=gscale} - win1:moveto((#render)[2]+10,i*block-block/3) + win1:moveto(120+(#render)[2]+10,i*block-block/3) win1:show(classes[order[i]]) - -- % - win1:setfont(qt.QFont{serif=false, size=fontsize}) - local gscale = freqs[order[i]]/freqs:max()*0.9+0.1 --3/4 - win1:setcolor{r=gscale*0.5+0.2,g=gscale*0.5+0.2,b=gscale*0.8+0.2} - win1:moveto(90+(#render)[2]+10,i*block-block/3) - win1:show(string.format('[%2.2f%% labels]',math.floor(freqs[order[i]]*10000+0.5)/100)) - for j in ipairs(classes) do -- scores local score = confusion[order[j]][order[i]] -- cgit v1.2.3