From 152857553867cce413be0980273a940e834ac0f8 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 23 May 2017 11:01:49 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app-prime-modbus/include/dirtylevel.cpp | 51 --------------------- app/app-prime-modbus/include/dirtylevel.h | 13 ------ .../config_service/108_wash_icon.png | Bin 2266 -> 0 bytes app/gui/oven_control/images/symbol/wash.png | Bin 0 -> 2266 bytes app/gui/oven_control/washwarnicon.cpp | 6 +++ app/gui/oven_control/washwarnicon.h | 11 +++++ 6 files changed, 17 insertions(+), 64 deletions(-) delete mode 100644 app/app-prime-modbus/include/dirtylevel.cpp delete mode 100644 app/app-prime-modbus/include/dirtylevel.h delete mode 100644 app/gui/oven_control/images/not_recognized/config_service/108_wash_icon.png create mode 100644 app/gui/oven_control/images/symbol/wash.png create mode 100644 app/gui/oven_control/washwarnicon.cpp create mode 100644 app/gui/oven_control/washwarnicon.h diff --git a/app/app-prime-modbus/include/dirtylevel.cpp b/app/app-prime-modbus/include/dirtylevel.cpp deleted file mode 100644 index d72d618..0000000 --- a/app/app-prime-modbus/include/dirtylevel.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include "dirtylevel.h" - -#include - -namespace { -QDateTime cookStartTime; -qint64 cookingTime; -int cookingCount; -} - - -void DirtyLevel::cookStart() -{ - cookStartTime = QDateTime.currentDateTime(); - cookingCount++; -} - -void DirtyLevel::cookEnd() -{ - cookingTime += cookStartTime.secsTo(QDateTime.currentDateTime()); -} - -int DirtyLevel::dirty() -{ - if (cookingCount < 1) - return 0; - if (cookingTime < 1 * 3600) - return 1; - if (cookingTime < 3 * 3600) - return 2; - if (cookingTime < 5 * 3600) - return 3; - if (cookingTime < 7 * 3600) - return 4; - return 5; -} - -int DirtyLevel::state() -{ - if (cookingCount < 1) - return 0; - if (cookingCount < 4) - return 1; - if (cookingCount < 7) - return 2; - if (cookingCount < 10) - return 3; - if (cookingCount < 13) - return 4; - return 5; -} diff --git a/app/app-prime-modbus/include/dirtylevel.h b/app/app-prime-modbus/include/dirtylevel.h deleted file mode 100644 index adf970b..0000000 --- a/app/app-prime-modbus/include/dirtylevel.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef DIRTYLEVEL_H -#define DIRTYLEVEL_H - - -namespace DirtyLevel { -void cookStart(); -void cookEnd(); - -int dirty(); -int state(); -} - -#endif // DIRTYLEVEL_H diff --git a/app/gui/oven_control/images/not_recognized/config_service/108_wash_icon.png b/app/gui/oven_control/images/not_recognized/config_service/108_wash_icon.png deleted file mode 100644 index 392f475c0f9f23d3d5180ebc02a21de495a6ac3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2266 zcmV<02qpK4P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_000McNliru;RFr>E+*a`>&pND2tP?gK~!ko?VD|IRMi>B z|A)jRu!$(57)?;nfEF}VF-oZxm~j*d7!+S-sDm>q`XOzxI25%CD1-P$6-&idM-+TT zAc~ZN8bPqlAP@y=5{Vj-Xcf$h*(4;8{QF_=-o5ACb9V3DyFowj4R+!K(a;m6dP5t=h5Rq$TQ@6t9|s?8v~*5m zCH>eImax~+flK3b?(+o~wNH6{&*P2qS#zqD^A|k_cN`xM1Q)SR&ZOuGyfavl0=$U* zlPBrQ2*AxktVgbW`y48fg&c&?8`;P~7D6~4r{fgQ0jqJP_$qa^H&lnQCL`c-0ARi$^}!%`*J=V*@oY`b)p6QdE3e@> zTxm${W>KzB7N4@NPvAF(qCfD6Segu8e}}RFCqYYjG z@IgswXTBZnEl+@TegMZQ&e8VwYeVom0S=dxCmqp7c&x*-y#qd=xL$7QZ)gK|F&6;1 z-BcL2x_oLmiyIZ~R_}moB*!o_0f2oC?QgB+HQiSBDe)e1`3wRmxLeYmNO!noppT2I zS+=;nh8zHZx>!Hx@@WAC*(_<1QW@gihAEU?JP%9yqn5fz z>s1|F@7jZ-GMU$SmUEIz-3x$&SY>FUEq1sZC1tv$Z`AtT;sD8Ir=_0jP=%`t(pv-A zJ5JX9j$&k+Wa%{;ug~RCluIprZES`TXDTb(VQ{wdmi4T2{B5-Zo~byFvGjUP(Cd_k zc^ccTlyxkmU=C;6wVKetUDj0_OWmsqyO2BspnJok!o39NqmJ};Wh9PoU9i8)c*HUG zRU9W;y1RLd(|Eh5X*z4;Lwu55lGX(4;(a7A#nGAyaf4FG9)tH^Jph&h0Ow2E7t!wE zqeOtHlkTFU!Y(D(N`tpacUl+#&?0Gd(T=(;p?ejaOX>@(&ku2zlxwTOdmFltXqB;m zX~@7ml2+{;NycL?GVR;Lm?z%mN#X|^aDv0}5@v}*0NzEXG?vur%NFhY-m#CPw_H5y z(msv0!MOmJDQ#jEz!Do@U1VD?6 z@jL5k20CoD*brw@+*0;p1PbtPm;MqEuML&~EaQ5+7LK=vtcbO+zm+o6*1|khQ-7HW zw%Gp&035HV``HUfd<uCUc_Ihz;qMCNk} zw-}IG`LNPtWSbK$(jVXe*PdThY;TLdXPbxGBFSo=4{)3@|Ch9uA3l$w#COV21e}BN zD56-5^YLcFAcrsqg<=;V%2AAVZJtummJ}d>rFc(KhT}ic>Aa{FB`CrQL$SdBFdqZO z10vcn<$;=9%f!0aL-X{AS;Et8k5e>ze?M}nvjp~L2_IoOYuUsm9$+=!j0d{9sJn-+rh~aAo*K|*Cg$3 zR3{g6kO#O+jmHzMt{trypf;2fFf1(`ry7oEy1AA&nPxQ{%o)nwfz#UD3x;%fw-CxW zDteqRUScEO&`bdYicySi?#4FM;wyyFiV*r^Aco@t#M=xyh^vHqX78g0NpiEZ0dr)M z$JqK;qd-UCx0|^Puf>+-Vmk^^<}-rc{*EHCHx+Zal0_| zoXPyC;VP6n5B$W77=p)fC@HvR+=pR~ZaF1@z{S|ciyVl};x6Q40UCWp`3AF*FXoH* zU(M%B60^g+Tb=nalasmH!-S!k%Xx*j!!AGFjOw`n6L^cLanxi7)?f`YP=qn~C5E8D zv5W=U@EK~b9h*=oy1W+?#71KemtdZd9n$Y3vt$wuO80H0t)@KCNAgwf8le*j?r z5Gt4n-ibwy`&Q*G3?UufR}&f1X3|)(DHS!C8Sq~PO!jgr>Mw$r$DJw1D`TJFWHH1H omU5f&>$YSq%y&2?b^qJ&e{oKUi0Y--(f|Me07*qoM6N<$f}uq*kpKVy diff --git a/app/gui/oven_control/images/symbol/wash.png b/app/gui/oven_control/images/symbol/wash.png new file mode 100644 index 0000000000000000000000000000000000000000..392f475c0f9f23d3d5180ebc02a21de495a6ac3b GIT binary patch literal 2266 zcmV<02qpK4P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_000McNliru;RFr>E+*a`>&pND2tP?gK~!ko?VD|IRMi>B z|A)jRu!$(57)?;nfEF}VF-oZxm~j*d7!+S-sDm>q`XOzxI25%CD1-P$6-&idM-+TT zAc~ZN8bPqlAP@y=5{Vj-Xcf$h*(4;8{QF_=-o5ACb9V3DyFowj4R+!K(a;m6dP5t=h5Rq$TQ@6t9|s?8v~*5m zCH>eImax~+flK3b?(+o~wNH6{&*P2qS#zqD^A|k_cN`xM1Q)SR&ZOuGyfavl0=$U* zlPBrQ2*AxktVgbW`y48fg&c&?8`;P~7D6~4r{fgQ0jqJP_$qa^H&lnQCL`c-0ARi$^}!%`*J=V*@oY`b)p6QdE3e@> zTxm${W>KzB7N4@NPvAF(qCfD6Segu8e}}RFCqYYjG z@IgswXTBZnEl+@TegMZQ&e8VwYeVom0S=dxCmqp7c&x*-y#qd=xL$7QZ)gK|F&6;1 z-BcL2x_oLmiyIZ~R_}moB*!o_0f2oC?QgB+HQiSBDe)e1`3wRmxLeYmNO!noppT2I zS+=;nh8zHZx>!Hx@@WAC*(_<1QW@gihAEU?JP%9yqn5fz z>s1|F@7jZ-GMU$SmUEIz-3x$&SY>FUEq1sZC1tv$Z`AtT;sD8Ir=_0jP=%`t(pv-A zJ5JX9j$&k+Wa%{;ug~RCluIprZES`TXDTb(VQ{wdmi4T2{B5-Zo~byFvGjUP(Cd_k zc^ccTlyxkmU=C;6wVKetUDj0_OWmsqyO2BspnJok!o39NqmJ};Wh9PoU9i8)c*HUG zRU9W;y1RLd(|Eh5X*z4;Lwu55lGX(4;(a7A#nGAyaf4FG9)tH^Jph&h0Ow2E7t!wE zqeOtHlkTFU!Y(D(N`tpacUl+#&?0Gd(T=(;p?ejaOX>@(&ku2zlxwTOdmFltXqB;m zX~@7ml2+{;NycL?GVR;Lm?z%mN#X|^aDv0}5@v}*0NzEXG?vur%NFhY-m#CPw_H5y z(msv0!MOmJDQ#jEz!Do@U1VD?6 z@jL5k20CoD*brw@+*0;p1PbtPm;MqEuML&~EaQ5+7LK=vtcbO+zm+o6*1|khQ-7HW zw%Gp&035HV``HUfd<uCUc_Ihz;qMCNk} zw-}IG`LNPtWSbK$(jVXe*PdThY;TLdXPbxGBFSo=4{)3@|Ch9uA3l$w#COV21e}BN zD56-5^YLcFAcrsqg<=;V%2AAVZJtummJ}d>rFc(KhT}ic>Aa{FB`CrQL$SdBFdqZO z10vcn<$;=9%f!0aL-X{AS;Et8k5e>ze?M}nvjp~L2_IoOYuUsm9$+=!j0d{9sJn-+rh~aAo*K|*Cg$3 zR3{g6kO#O+jmHzMt{trypf;2fFf1(`ry7oEy1AA&nPxQ{%o)nwfz#UD3x;%fw-CxW zDteqRUScEO&`bdYicySi?#4FM;wyyFiV*r^Aco@t#M=xyh^vHqX78g0NpiEZ0dr)M z$JqK;qd-UCx0|^Puf>+-Vmk^^<}-rc{*EHCHx+Zal0_| zoXPyC;VP6n5B$W77=p)fC@HvR+=pR~ZaF1@z{S|ciyVl};x6Q40UCWp`3AF*FXoH* zU(M%B60^g+Tb=nalasmH!-S!k%Xx*j!!AGFjOw`n6L^cLanxi7)?f`YP=qn~C5E8D zv5W=U@EK~b9h*=oy1W+?#71KemtdZd9n$Y3vt$wuO80H0t)@KCNAgwf8le*j?r z5Gt4n-ibwy`&Q*G3?UufR}&f1X3|)(DHS!C8Sq~PO!jgr>Mw$r$DJw1D`TJFWHH1H omU5f&>$YSq%y&2?b^qJ&e{oKUi0Y--(f|Me07*qoM6N<$f}uq*kpKVy literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/washwarnicon.cpp b/app/gui/oven_control/washwarnicon.cpp new file mode 100644 index 0000000..8608b62 --- /dev/null +++ b/app/gui/oven_control/washwarnicon.cpp @@ -0,0 +1,6 @@ +#include "washwarnicon.h" + +WashWarnIcon::WashWarnIcon() +{ + +} diff --git a/app/gui/oven_control/washwarnicon.h b/app/gui/oven_control/washwarnicon.h new file mode 100644 index 0000000..3dcdf58 --- /dev/null +++ b/app/gui/oven_control/washwarnicon.h @@ -0,0 +1,11 @@ +#ifndef WASHWARNICON_H +#define WASHWARNICON_H + + +class WashWarnIcon : public QLabel +{ +public: + WashWarnIcon(); +}; + +#endif // WASHWARNICON_H \ No newline at end of file -- 2.1.4