From f4600395c9e187c5f581d86e196aab7096d157e7 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 1 Dec 2011 13:40:23 +1000 Subject: [PATCH] Fix Overview SummaryChart glitch showing bad codes, icon update --- Graphs/gSummaryChart.cpp | 7 ++++++- Graphs/gSummaryChart.h | 1 + daily.cpp | 4 ++-- icons/arrow-end.png | Bin 8549 -> 9026 bytes 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index 3fb90d60..a2373744 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -44,6 +44,7 @@ void SummaryChart::SetDay(Day * nullday) m_times.clear(); m_days.clear(); m_hours.clear(); + m_badcodes.clear(); m_miny=999999999; m_maxy=-999999999; m_minx=0; @@ -105,7 +106,8 @@ void SummaryChart::SetDay(Day * nullday) for (int i=0;imachine_type()!=m_machinetype) continue; - if (type==ST_HOURS || type==ST_SESSIONS || day->channelHasData(code) || day->settingExists(code)) { // too many lookups happening here.. stop the crap.. + bool hascode=day->channelHasData(code) || day->settingExists(code); + if (type==ST_HOURS || type==ST_SESSIONS || hascode) { // too many lookups happening here.. stop the crap.. m_days[dn]=day; switch(m_type[j]) { case ST_AVG: tmp=day->avg(code); break; @@ -139,6 +141,8 @@ void SummaryChart::SetDay(Day * nullday) break; // } + } else { + m_badcodes[code]=1; } } } @@ -430,6 +434,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) for (int j=0;j m_colors; QVector m_codes; + QHash m_badcodes; QVector m_type; QHash > m_values; QHash > m_times; diff --git a/daily.cpp b/daily.cpp index 2e39c399..f06f7275 100644 --- a/daily.cpp +++ b/daily.cpp @@ -201,8 +201,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false))); RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,square))); MV->AddLayer(AddCPAP(new gLineChart(CPAP_MinuteVent,Qt::darkCyan,square))); - TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::yellow,square))); - TV->AddLayer(AddCPAP(new gLineChart("TidalVolume2",Qt::magenta,square))); + TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::magenta,square))); + //TV->AddLayer(AddCPAP(new gLineChart("TidalVolume2",Qt::magenta,square))); FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FLG,Qt::darkBlue,true))); //RE->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent,Qt::magenta,true))); IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,square))); diff --git a/icons/arrow-end.png b/icons/arrow-end.png index 59474a8186487110d5cb42245e68d140265a64a0..3dae415190977cf7b4b6cc63824a9adf38c1c05a 100644 GIT binary patch delta 3426 zcmV-o4W07kLc&I{0v3M_DoI2^RA>e5npUVH7m&&=*z`kh(Za-2zmlL4WSqm1XWv*(=O`QOh*avXmLpQk2&o?r#*CE$x) z;+G_RNx~P|3S3g@i%g)W;V7p)xqt^--@hRq)dT&>ShRfbV0i3>jW1Xi(A^oo`n|tM z(QFa7sBwHH*@8$k1SD0UGrk->oi}4uaN}q^yyp3DhE|O%?nLr4)B66Or0!Miy_y?%2T}mw{DJO<^%VQtxk`}{?dtWCrnp=O3H;!~ldq1eQmZo05bE5G2 z9cxd163{6?Cr>GbLOzH_9Z&+xk+zn>n0z1Eqi-U2>>V#&e}R$fhCSJh!ibDa^Vv=0#dfq{1B8LK|rAS9;z;ukQ@4oijru$#LrHya+15IhV7FmzMG6Jw|1=HpX z%C$W7S{+(VOy>0Fs|}-CrEO8yiZUj%F`Ot&Bba|oNS*240Y@rqJ+No@rX7F#nm>|u zeLvUERAHJjEGGcnDMQx{SH(4hLicDs19JqfE^0PTP6RPLl||Lgp(DLkTCrweEdtus zJ-gr8bpIdMU$~@g@;IEn9fB=@p~A3cVASidOb^o8NB#n%LPtVi&4E)4pg83qU#Y+j zDp-FpaD}w0f5lqJ#*bdxd*Jr1e^|}vc>(I}2oVeGP^iv4OEE|`VM$A`?KD0Wl_oFh zIz1?txU8a5RFSV1(U3GmT6?hS@++kDK*w6E-uU5Lua4bz=d})YV8X{}TEJ`sCi;P`_>Bo&#@HZ#^&QS(O$WuOS2p!wW%wmgZ}<O-HuPkJcVPX54#VpBCJ##CHAm?ke@) zJEWY(G0!F;Bn4my>5|?J(WkxKeBggCaE=mo2ppuP$ds~7DRWY$NoUe16WBr`+=gf@ z0jpIaw2f8N0>}I)ed2`vgF}1kxCfoP9>06?<3rPq1-Fo|#EWxPf1bb(58o83ppvLd z5ur3}!u?M0FV9tRZni2f=B^J;@Y#*%#D0;~h9yJ@tTN#fJy35gs{+#zQg(mP6Y4}H zehnN(V~Z-kvO#6EN7Cb&>Xx_vT_W^Vgns|z>@ep%H7!{p@T~EQHE6EGY2Wn(e(<$d zu2q8=Z0~?n;i}Crw9fEc7oJaOtXNWUO(yruNxRRlq34K8X$(sWx-7KBEF^>Cy$1hP z>AWXUmh31n# zzDJD`lRJyk@&wNOeV`MG>W!mUpOlbbKT)@@xj5hKP(X_&&Y~AFNQB2KK8SNw5)Fi- zCRnR7AuyO66nK=O$ur0)EO*otlFR?hIPnxqXr(54TYi9-@hGTcU*Xlzy?f zxQxI2fN>FtI6{#iVzlKT2Y2YTjhYOt9)=UKnTSlHq}14#44tYUinSn`SO(K5qurEf z`f^_(^Wg(Whx(iyZO?!Gb8!78Z)jJz9Gqj!$5%0)J45e3-oPP>RHnG9QCO3mC>YaF zm_Rs@iVGbelT6?+)jCOFOH)wMS+W^a2a_92^q2uhN5ImX5vn2b+$2q+2d&NkKW2QE zjQfs zch1P{4cx-X3zw&|lSTq&sSR1yTUkYiBAW=1*0cjm(y4-GnD6j#2r8s2bX#tqM%69p zCgX5}M+ioP-r4EKSLHqeOV}q<%60~dbC{J*hTqFFOB_cdP(g#UGLv-P!9tJOl3IzQ zZ$#0z7+A=(2`qok^AbL*e4EziF3Bl>QY}rJlxT}0bE*-9IV(wAA7u)A6}hY^OT_06 zXBeQatAq{-aDJvqgtoXJP(mtRXDrrPIqJyN%P>q0C1aQ>yq|G;AFBEU7l(TXJZ5-I zGWj1iak49g!LGRc=b!aGR2;-FPnn`i=!O6>FM+%e`qY0{7v6bGI7;9;EBV4CC(d}o zvdaxX5=#(A7%Gj|qy{i)N1akO2;1Ophs-$B-AjY-;%5%3S{>81INB>&Br7M8D<8q@ z98sk@OZslA?|#%O8j6f<(`8_a=S&UGcnyU}91ryOtb6JA-x(@2qxr&Vi)+fX$?C@X zfQx)aO`d=MvN!Nlrh$5?fXX2*+!Q+|=&T0K4dQxc@hm`*kQrK@6;g(qSydIwdcp|M zEGSXEmPAFHfu`qCEAB@?I?S5pJucW0uvSNjpaM2Ww=`OYGf_rC3E=6~{p((O`PMVR za=cmCxr^rXW*>?h5i&iRC$RIx^RMt-ifd_2`qqDS-K>i4MJ|6I(kntRW84pjqG$wR zXydfyX{cPgIvtvb=~b?kfaRt-#!7H_U7!g*qby53Jajf#cUpv-ho(GSlbe^YLv5eG zSx6z)!oMccE}hO)R16}gWbSNQ3T;+)D@KF0a+ODkA5RlJOW5N=vPHs{2y5Y)a98T# z?OT7h9rsq_1yglrE{J(>D527B@xbS2gYuN{f^L_7S*H_g@DRm=#Gx&gZ?h&}=Oc&f zLFbJk({2GgPS{EbMLKuFh9BO(ZQIzAeyy05a*)8yOAg{Lf%nw?2NvT94=%=KeM)*B zrt94`-U>CY5PCuY6SG#t6eas~xHbIP_HBRLm-f?)%;?b+u`r9<-II%JR#<$s6Cne1&)g` z=&}RCZF5xS&?@t0m7a=w<|tFxc>!D@Y!Q>L%_b??CBw3N?x2v+9mk==3X)ZpEVq9e zb06~)ujVf>NX(>*l!T@JvglU=1{CHZEPGL=D$l~^2>Wa}5q|W%U zMfB01+_f#cByYTU^4#l&sAAl04r&hFe_gIZ4q8w+o=|qL<}WY^9OY0dp-omlkt#wg zpi1;BC1JCKMH-J(Z(G8?mDjArGoj9+R%N~~_OOndC9;=XV6KBBc5J=AdKP~N?)CaP zo(Yu>36Nk<)k;k0doGjn+oXk0TKlS4<#VDlAluB%p9@CGZ ziW6Mx25WJyyV#8IX#N6=0m5R{ZG?go2)EXRvnp`2;HjRK_*L!p+Bo01a9A-;fGZhl z>aNK`rC9kdv$_e$VGF@193Fq3&3|BwSiu zqY(dBNn~==D2=~mO))P|GF=TZ6-ce%c7;gmJese->$^q~S7bdBvG*h+c<6VZ6m04! zt)`p7mrk)UjTsgz8Q~wfPqC6x?hwI(YVOs11-^3NW+SAU|1foR*HhQOnBjo_squo@ zuWuW(_vQLCn8_SMa5!4#R5gszn#P!Dt?LE8-j9)1)lJwio;t@qF11OL7B zXApAXlr8};T#bwI`jUh%MyW1jx+LL+t8p=2f9@pwf8AQsQF+5s+W-In07*qoM6N<$ Ef?z3-1ONa4 delta 2945 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