From d029feb2d55f5579f322ec893f95a6aabfcc6560 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Sat, 20 Jan 2018 18:21:39 +0100 Subject: [PATCH] Show ICD in gaschange icons Add an exclamation mark in the gas change icons if the change violates our isobaric counter diffusion criterium. Signed-off-by: Robert C. Helling --- icons/Air_changeICD.png | Bin 0 -> 2640 bytes icons/Nx_changeICD.png | Bin 0 -> 2662 bytes icons/Oxy_changeICD.png | Bin 0 -> 2561 bytes icons/Tmx_changeICD.png | Bin 0 -> 2671 bytes icons/gaschangeICD.png | Bin 0 -> 2459 bytes profile-widget/diveeventitem.cpp | 36 +++++++++++++++++++++---------- profile-widget/diveeventitem.h | 2 +- subsurface.qrc | 5 +++++ 8 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 icons/Air_changeICD.png create mode 100644 icons/Nx_changeICD.png create mode 100644 icons/Oxy_changeICD.png create mode 100644 icons/Tmx_changeICD.png create mode 100644 icons/gaschangeICD.png diff --git a/icons/Air_changeICD.png b/icons/Air_changeICD.png new file mode 100644 index 0000000000000000000000000000000000000000..600e296b7ed75f4f5d078c78ff6544f4df9fea93 GIT binary patch literal 2640 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 X0PkcD*%Dc@00000NkvXXu0mjfyb0qO literal 0 HcmV?d00001 diff --git a/icons/Tmx_changeICD.png b/icons/Tmx_changeICD.png new file mode 100644 index 0000000000000000000000000000000000000000..2b17f86a2784d2641e83741af7f660685f38db14 GIT binary patch literal 2671 zcmV-#3Xt`QP)yE58Cpm27oWQ`7AL zD^{%d*ejVjv98Wm;fP0ID(MnyMX%Gpm+S^j;3wR)u$v=EwX&M$eJ}G zH8mn2Z`A6z_9Yb)Axt262>0_A(D1R(as814H=OzG?>FwadOG7B9k6d7jE(}(RgH|z zP9BVtUD}z6P1VN&&SWwQrS7arrK*qLwt=s&U&roz&D8HN%@Lv+QD`6qOaRBIwjArS zfiIbpO`A4l(&_ZxY&LsSI-OQpYsSNf_*^#&&zxYpH^AE~FA%nes7{4BVwg8D@7&D% z%%#u%^x2-vQo>6uI*wCsj9E}sRYfL~A&z6T=b`2ZI0vMI1ZL&AtGq4iK3|7BGLN2@`$2{IF1iK|NQguB~mDtU0ho0I~>Qswr#Z5 zD5XS1q=J!3b_jwXilXTCBo+;%fhwqSKCF&D0DSk|ch@+M(^gegg=JY&QC3Fy9;TG( zE_8Nw9xpA2E~&e2QFYtC3dQE6?teY7>$cV zM@N*TuAU7W|4`ra;J2vS@Wn(_%&!HuEbA^~47P1oZVVtwDMUo#I96d8svroMoSbBM zcz6#`155*_jj_4cMf)t+^3WEjyAf2?`zgQZpR8ZM-WX%9OQlj`+ct3=6NX`#R~5&x z#Br>A-)DSugu$T+dJ7>PgLV_w-E}`bdf>v1vuNA0i4)&B4c6Nbd6xvP zt*xDBjLD}`DQw#&2m(Z;OtnN&#Q1nYdOFXmlk;z(izSQ|X38!0(XC7UUvMmU4SQ}_ zEn>2Y3{VYh*|w3dKl3`A_&(4FL>~awS}$-Mr#6*Jp_C#F!>QtmqKJ`^A&wp$=9f1= zO8<{rkWtuVKcW8Cf3UPcKm11bpQuOFRtNzXNLMTF-2G*KvhXl)04M;W-#5@*>$8Sa>PaMZTL#f}rh-zcU?0oJd2mgLAy!PNyXd zLyE;BzVD;8rnzyH8PhYQQqyo8yDXW?^Su7PzP=8D+bboh;a9Ky59j~we&7_CK_v8& zvnwBv%;n3MFLoTqHpbw29+Q)kl>4u?47Q!Zvh-B5h~t=IvH0q)UAv?&3@koZCdLh@xmpy~=H{P#EFloBMwWYrgQK>+k&ZMe~|c zXMkcd29^M|u}f_d7d_2PQSCU+Qros;5m9B)s01qaUlCzw@H{6D^?R>0J+hfYD;ggg z_tKj_|J=}YBRPQ{iK53YW>mSvVIwzvZ5=09>bB+0G498OW{6h~63|s)NO4;jfo3`^CpG&X%)b-;} zzT5=|4x?v&NX&T5CMd!}tBEoQ7e@slpuR<2atGXstC3jW*ZT{WZK>0a%`*`eFNqFH^{5N}$H@&wut6 zBvFgT2*$qj=>E|i_kA0Sw~}Q6P^(t0x;B@~JzG~-ca<@weBN|2<{%;zCx+E4uPvwN zw;m`7ewct?3$#LY(4bKuB; z{lp80hVQ&*hn#zQ2byDu6v`BT;O?|`?OMlm-9@%-Z?kQCty0Psk*R!NxX{nhH>St$ z&fBTEE}0$wX7x*Cj~~W%6flXB0mjF>nY?fsI0tGJBzQmQhhExNu3XtzS68=MDb=c! zYVv*G866!R>^yzo%(yrj1pGhR dN22vo_P;DxjR;8I&_MtI002ovPDHLkV1ii3HMsx) literal 0 HcmV?d00001 diff --git a/icons/gaschangeICD.png b/icons/gaschangeICD.png new file mode 100644 index 0000000000000000000000000000000000000000..6174bef58d2130a6e3c6e956ceac2cf9eabf72fc GIT binary patch literal 2459 zcmV;M31s$(P)c0R2`EWK zK~!ko?V4L~RP`OlKmT*t-DH!HYy!DL2;t&1iiRMjT-u_5fKCTz+K!zO+EJ@BeQ7&= z@uhvxmrj}KLtCY^FH*;$0$ zoKa*k%=ABVX3yS!|MT7N@B6!*h5xTFw}Qc-92*;x0Bvn;a@)3T@|kCzkvDoDEtepk ze)?&-Wy=;SDk^yN(MRRs!-tugnj#bm-CAsH+_=&G<;%*-4sG4KRc_d@LAJHE-CB%n z-@ct>GARwi!0YwmI1aXLvw#17UU=aJxqJ6+am%nWF){JG-ripM-h1!K&6_vNJ$v@Z zj*br5-rjygSy6Hgq^zv$DOFWDa^wh#qEKC3O=DxDShsGSxMhI!_4Uc#-d@?>-cDm< zBbAkv^!4>IIXSuImT;%x;bHm48*j+b(NQ@wGb2sYl(uclnwlC3$Q?U&$axPU7K<%A zcI=qEa-BVURs!zP+}u3B!L+or$ZM_FUw=Id2q5?E+b8FxMp|22Wipw(=6fekp1kU{ zXPGt(nKNh5bsZrDs;Z)@svCB%WG4e85D2hj$r2Y`$44K@ zKOQ>$!{aAT%5Mxve}6xkre%S+7NEHrDJv^;zdtrMDvzD`m=DIP`S*!FIy*b%O$RbO zJS-E51d5`#7oQ2i84!x1WQp7~O^S*NFd}1eWOzvS_kGG)LuV$T(G^?DTPNNp91hEy z8h*p!FplH6EL@pKGH!J#k6a)&VGxbYkQAkS{OLs;+afx0o=DMyAZ^lli#gsmN_~6V z&1Gb0Xb34~mLBFV+qRjRnPDhAOmM&?TJ#`l(_RXvmay#Ib9j3Np+!%S^41_Ufg>HP zh3k2xEkb9cz=s2@!NZOEg1U4`wOE}S2KvyuBd)EquLi;m9pPN5y+h!^@NzcGV zSo#<-GoPsoX^hDvGZ#%X$I8A4;h=exONXwY=_*23i7ja6)whG3KYvc<)U~?0y0Xd= zAq0-&V9q8O7@0=YKS5svq&0(>`h;R@kU(A%zu$!E&+V9M9;&XQDgvR2%gib`nvXLx zcQO(l%&kUxdV1VMm~pLiI?eb*jF@i&gX2E(6Q}UUTBt7b;`6GkU%#H(ljATl;M$q> z6{6`XiYic5fueg!U5w!m9c62SLRHOuxdRdkh2-A7dkF*rSt7S>n+qu)7pS3l;(3<% z`lxGMiPz`DvMidLzfFFyo7p+GQraa(1U5=)8vp3~e5Y)L%?~%T^0o%PjM%RmNM~m! z9*@U$DNWNZ_a6$X=AmNxRce-+EUH+GuIt#gjjF0tRaK!B6lB>-=y@=4n#FpEwY3WC zwyt2=@*PxH*NB{l-|p^i7s%W)L{&9bEcRnndhvKXXqx7R;?mMm{C+>Pd3jm3JQzII zG|647@1eT7I#ym@9=Itb%H-tamZ_;J*PS#?bBjV%Rq^}%6ciM=`pJ|gnZ_!mW^dbY z=Sp^c|ADP*)~pfN1LC@Y3=a>#X<3$=2s0g_lrpP?&lHKNR0`8H@p*MlwY|fs!C1Ci z96kEmKp^m+o8Ib%!(nXOzGhjH$?8%{(&;qmbef5Y3C6}onYM}<_pirS`xEMl-zG3+ zAR%m9)`4s7bGD~jo(oOWd{-UiuP9)*SE_;ah z!cEw!3Z69o{LyZn+0eSjN4= z63eogj2iR}Mu>Y>VVB*5D6B=-y`-drCKNnIFZX}Yg8kYd>TLTT=W1(zwQ6v1U}z{L zKRbVx=U;jgqofI^auu~Bf1z-}uG|2L$KzQ^Fry7ACFX2`^F|(4{V$2zMMxD?6jbS; zp`v?qcDDY3B||+KbGz(@hFvfHelLIf`@iUC6${txL8u-sw!g-EgSS0N@y6{WH4n+r z5G&O|?p%FGZlYEs5+NRsyJH^5aj+~4%d&7B2UXLkDwsw@PJ+0sAtf_Oxir0gt!X#2 zm%&(y#_=7$#$VTfmhZ)KAU%*@%pL#ex}G(JQ&p9kiejSOf5vJ04bsw(0(7s6uILCwCFRQ_6j+F^tB7Qh zWHgLt`cv-68{_`n57BV@9bajbdR=qZU@#~T9z4kS_&9#QKdVE`L@(1c35SO`mukZI ztw+#wi69N1y-cCM0Q7u3szttXk*Xqx+mq<-5(R@pyDJUB~Y)plCrcMMXtVmX?L~F;;%O6s+AkE4ZYskgADgQi(#bP!6{hu8Lg*9s$8*{P8 Z{{Wh{j1du7-;@9V002ovPDHLkV1lV%uh9Si literal 0 HcmV?d00001 diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index 630587375..e904bbefc 100644 --- a/profile-widget/diveeventitem.cpp +++ b/profile-widget/diveeventitem.cpp @@ -56,12 +56,12 @@ void DiveEventItem::setEvent(struct event *ev, struct gasmix *lastgasmix) free(internalEvent); internalEvent = clone_event(ev); - setupPixmap(); + setupPixmap(lastgasmix); setupToolTipString(lastgasmix); recalculatePos(true); } -void DiveEventItem::setupPixmap() +void DiveEventItem::setupPixmap(struct gasmix *lastgasmix) { const IconMetrics& metrics = defaultIconMetrics(); #ifndef SUBSURFACE_MOBILE @@ -86,14 +86,29 @@ void DiveEventItem::setupPixmap() setPixmap(EVENT_PIXMAP(":dive-bookmark-icon")); } else if (event_is_gaschange(internalEvent)) { struct gasmix *mix = get_gasmix_from_event(&displayed_dive, internalEvent); - if (mix->he.permille) - setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-trimix-icon")); - else if (gasmix_is_air(mix)) - setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-air-icon")); - else if (mix->o2.permille == 1000) - setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-oxygen-icon")); - else - setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-ean-icon")); + struct icd_data icd_data; + bool icd = isobaric_counterdiffusion(lastgasmix, mix, &icd_data); + if (mix->he.permille) { + if (icd) + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-trimix-ICD-icon")); + else + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-trimix-icon")); + } else if (gasmix_is_air(mix)) { + if (icd) + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-air-ICD-icon")); + else + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-air-icon")); + } else if (mix->o2.permille == 1000) { + if (icd) + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-oxygen-ICD-icon")); + else + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-oxygen-icon")); + } else { + if (icd) + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-ean-ICD-icon")); + else + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-ean-icon")); + } #ifdef SAMPLE_FLAGS_SEVERITY_SHIFT } else if ((((internalEvent->flags & SAMPLE_FLAGS_SEVERITY_MASK) >> SAMPLE_FLAGS_SEVERITY_SHIFT) == 1) || // those are useless internals of the dive computer @@ -180,7 +195,6 @@ void DiveEventItem::setupToolTipString(struct gasmix *lastgasmix) name += internalEvent->flags & SAMPLE_FLAGS_BEGIN ? tr(" begin", "Starts with space!") : internalEvent->flags & SAMPLE_FLAGS_END ? tr(" end", "Starts with space!") : ""; } - // qDebug() << name; setToolTip(name); } diff --git a/profile-widget/diveeventitem.h b/profile-widget/diveeventitem.h index 51eead5d0..f56a92898 100644 --- a/profile-widget/diveeventitem.h +++ b/profile-widget/diveeventitem.h @@ -26,7 +26,7 @@ slots: private: void setupToolTipString(struct gasmix *lastgasmix); - void setupPixmap(); + void setupPixmap(struct gasmix *lastgasmix); DiveCartesianAxis *vAxis; DiveCartesianAxis *hAxis; DivePlotDataModel *dataModel; diff --git a/subsurface.qrc b/subsurface.qrc index cad50a400..c5ba1c7a2 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -36,6 +36,11 @@ icons/Nx_change.png icons/Tmx_change.png icons/Oxy_change.png + icons/gaschangeICD.png + icons/Air_changeICD.png + icons/Nx_changeICD.png + icons/Tmx_changeICD.png + icons/Oxy_changeICD.png icons/flag.png icons/scale.png icons/ruler.png