From 999e1f315327b957e23b54cd11f609d04823083a Mon Sep 17 00:00:00 2001 From: ArturWeber <88106656+ArturWeber@users.noreply.github.com> Date: Sun, 30 Oct 2022 14:55:47 -0300 Subject: [PATCH 1/2] exercicio 4 completo pela metade --- lista06/ex04/src/Radio.cpp | 19 +++++++++++++++++++ lista06/ex04/src/Radio.hpp | 14 ++++++++++++++ lista06/ex04/src/Relogio.cpp | 20 ++++++++++++++++++++ lista06/ex04/src/Relogio.hpp | 14 ++++++++++++++ lista06/ex04/src/a.out | Bin 0 -> 34274 bytes lista06/ex04/src/main.cpp | 9 +++++++++ 6 files changed, 76 insertions(+) create mode 100644 lista06/ex04/src/Radio.cpp create mode 100644 lista06/ex04/src/Radio.hpp create mode 100644 lista06/ex04/src/Relogio.cpp create mode 100644 lista06/ex04/src/Relogio.hpp create mode 100755 lista06/ex04/src/a.out create mode 100644 lista06/ex04/src/main.cpp diff --git a/lista06/ex04/src/Radio.cpp b/lista06/ex04/src/Radio.cpp new file mode 100644 index 0000000..a3f2296 --- /dev/null +++ b/lista06/ex04/src/Radio.cpp @@ -0,0 +1,19 @@ +#include "Radio.hpp" + +Radio::Radio(bool isLigado, float estacao, bool amfm) -> void{ + this->_isLigado = isLigado; + this->_estacao = estacao; + this->_amfm = amfm; +} + +auto Radio::setarEstacao(float estacao) -> void { + this->_estacao = estacao; +} + +auto Radio::mudarAmFm(bool amfm) -> void { + this->_amfm = amfm; +} + +auto Radio::ligarDesligar(bool isLigado) -> void { + this->_isLigado = isLigado; +} \ No newline at end of file diff --git a/lista06/ex04/src/Radio.hpp b/lista06/ex04/src/Radio.hpp new file mode 100644 index 0000000..1cca2f3 --- /dev/null +++ b/lista06/ex04/src/Radio.hpp @@ -0,0 +1,14 @@ +#pragma once + +class Radio { +private: + bool _isLigado; + float _estacao; + bool _amfm; + +public: + Radio(bool isLigado, float estacao, bool amfm); + auto setarEstacao(float estacao) -> void; + auto mudarAmFm(bool amfm) -> void; + auto ligarDesligar(bool isLigado) -> void; +}; \ No newline at end of file diff --git a/lista06/ex04/src/Relogio.cpp b/lista06/ex04/src/Relogio.cpp new file mode 100644 index 0000000..07b2ad7 --- /dev/null +++ b/lista06/ex04/src/Relogio.cpp @@ -0,0 +1,20 @@ +#include "Relogio.hpp" +#include + +auto Relogio::exibirHoras() -> void { + std::cout << "Horario: " << this->_horas << ":" << this->_minutos << ":" << this->_segundos << "\n"; +} + +auto Relogio::definirHoras(int horaDef, int minutoDef, int segundoDef) -> void { + this->_horas = horaDef; + this->_minutos = minutoDef; + this->_segundos = segundoDef; +} + +auto Relogio::definirAlarme(int horaAlarme, int minutoAlarme, int segundoAlarme) -> void { + if (this->_horas == horaAlarme && this->_minutos == minutoAlarme && this->_segundos == segundoAlarme) { + std::cout << "ACORDA!!!\n"; + } else { + return; + } +} diff --git a/lista06/ex04/src/Relogio.hpp b/lista06/ex04/src/Relogio.hpp new file mode 100644 index 0000000..b4672ff --- /dev/null +++ b/lista06/ex04/src/Relogio.hpp @@ -0,0 +1,14 @@ +#pragma once + +class Relogio { +private: + int _horas; + int _minutos; + int _segundos; + +public: + Relogio(int hora, int minuto, int segundo): _horas{ hora }, _minutos{ minuto }, _segundos{ segundo } {}; + auto exibirHoras() -> void; + auto definirHoras(int horaDef, int minutoDef, int segundoDef) -> void; + auto definirAlarme(int horaAlarme, int minutoAlarme, int segundoAlarme) -> void; +}; diff --git a/lista06/ex04/src/a.out b/lista06/ex04/src/a.out new file mode 100755 index 0000000000000000000000000000000000000000..7f743ef73c7e805da862ded8c904981e0e4f4be3 GIT binary patch literal 34274 zcmeI5YiwLc6~|{EaYEw83o$VzX}ngd29nm!I;Kt1w5(&hiK!b~YYSNcI=;KUwy(1G zF1y$D`q5?+(pQi|T#OQlCP*j|ZWYRcK&n3!Y%1}VN(!U}`mobT&<`LX@gIPgav?kd;zg-K=`IuE@oWvb#H}d%QKal> z+}CojCDKmb<)S(-cimu7p4Sm5Wmijg*Yal7KfK&0w7mlEVxb5rZ8Kw&=16J2+`Z0Z zk~A3z*;;iRevx$)=P6~{9*(9LU8VVg_dEIa=m@gi`Bv$CV5me&Ysj)?qOUJ)+DKcP z?~6L0U&oW}&bMCsimh$G6qd2s5IY6 zoiC{um27uDr`OVx*7Y=sl+BG@jk2lzK&P|1VZEtPD=DcdClz{407c6Fglk!Enr|m! zm4ug%3tLw06Q|MHw@c$HdQoRf#^q`v)jckJQz>)ECOd8S#TBz3x8E>IYBG#eY~b#OyNqNqZr;^vq(-cv`Ve|J>DBwg|9$=s(qE0>4m@eS zrjI!Fr?pM{kK{HKYVSBE#52yKlbeMJFaajO1egF5U;<2l2`~XBzyz286JP>NfC(@G zCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO1egF5U;<2l2`~XBzyz286JP>NfC(@G zCh&hlAV2=&=kh)=IbR{JVp1nP*-;h6=W*gEg?KL3pN ztN7VnljQrlJJ!Dx`{aAXKIM*GwG=zyj-7Y%J_=uT(D#S@_)n*2eezP_E8-%Jb)ibk zTwW(;-l-5XG`@wZ@C=TDIr=*2eyvwPUnOQJ2l`G@j{Nvb&YY`|XAAOdMxJWKSLu0f z3D101h(k4A(WQJepUsZ%h)4Tq+|`b6K?pi^dD0_xFS5h2<|&*XtaQfyvKsp$YrJb= z1Kx-J)qe5i1>{`V5T2PYd@DllHDCv64TPB7jXd*(LJqkm$%i>Q?QfcKKCJV(|e^!Om1G8jYLrvyx9oOfKJWBH;DI9?QS~{AC4+UitC3n zd%1uYoW0eTlwRi2SG)A}F8z~^K7q5E`x7Z6WhHilg%a>lvRc=TP3@89#+sTM?Woj# z&saowGMhYs@@nO|6HlC>6e3?xl2cwh{C+&v2G97<`ux*S-+Ggdq>9^7+EB7OzL}gP zI^MqrIwC2rjqNfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO z1egF5U;<2l2`~XBzyz286JP>NfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO z1egF5U;<2l2{3^VjX)5YI#A*$^!04#E&wPH{rPdF(>Jz@qVzCs0|*yAPQN@Z5Xj?W z-5&amJnl{Kd>i(Q_%`=eWR>#ZfqNomJkf6@nnEp>Whqx@BA#y1s=d=nq-E4dn+>f) zmW`-KoS2e^X5G+fH^dUdHpO(>@pNma9SX$;jFhxfhGnN)V=XNa_;w(p6_bgyoidHV z)>xNp>HLiBcrb>JGL|uwxDzLo70Z=hRlB{f{eumQ*F* zz!S!z{X&WT^Ah`2WiRz#<8)Rq(4@XiPv5AgYeH^8p-VpKE{dX$zH48OQfv#VT~pj_ zp^}w!Z^Y1ztGcZDJyzJ=zPOKXTuZ4|kb?h*b~uL95Rx)&8#ewB*v+$=)Si0y^U??GaQwzQvZKzW67lRuWQ>WrInye;D7C{@>wi9t{hri z`%3t*j-JPa7q^Lc@e|@<6uKpa1WS0VBj{Dj=Xn0@GhA%-7`61ze`w_8JHB^mU;fOq zYmMML*Dl86@`f(PK-VN zr<_jARM+Va=gR%UKH_3CTy YymI)3=L+}y&KDg#cOe>V`r6dL0E{NfZU6uP literal 0 HcmV?d00001 diff --git a/lista06/ex04/src/main.cpp b/lista06/ex04/src/main.cpp new file mode 100644 index 0000000..244dcd2 --- /dev/null +++ b/lista06/ex04/src/main.cpp @@ -0,0 +1,9 @@ +#include "Relogio.hpp" +#include "Radio.hpp" + +auto main() -> int { + auto meuRelogio = Relogio(23, 59, 57); + meuRelogio.exibirHoras(); + meuRelogio.definirAlarme(23, 59, 57); + auto meuRadio = Radio(0, 0, 0); +} \ No newline at end of file From 5ddd59aac8383b2d9a0ce5a5244cf5275f279293 Mon Sep 17 00:00:00 2001 From: ArturWeber <88106656+ArturWeber@users.noreply.github.com> Date: Sun, 30 Oct 2022 18:17:58 -0300 Subject: [PATCH 2/2] funcionalidade terminada --- lista06/ex04/src/Radio.cpp | 4 ++-- lista06/ex04/src/Radio.hpp | 2 +- lista06/ex04/src/Radiorelogio.cpp | 6 ++++++ lista06/ex04/src/Radiorelogio.hpp | 9 +++++++++ lista06/ex04/src/Relogio.cpp | 8 +++----- lista06/ex04/src/Relogio.hpp | 5 ++++- lista06/ex04/src/a.out | Bin 34274 -> 34690 bytes lista06/ex04/src/main.cpp | 5 +---- 8 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 lista06/ex04/src/Radiorelogio.cpp create mode 100644 lista06/ex04/src/Radiorelogio.hpp diff --git a/lista06/ex04/src/Radio.cpp b/lista06/ex04/src/Radio.cpp index a3f2296..c618792 100644 --- a/lista06/ex04/src/Radio.cpp +++ b/lista06/ex04/src/Radio.cpp @@ -1,7 +1,7 @@ #include "Radio.hpp" -Radio::Radio(bool isLigado, float estacao, bool amfm) -> void{ - this->_isLigado = isLigado; +Radio::Radio(float estacao, bool amfm) { + this->_isLigado = 0; this->_estacao = estacao; this->_amfm = amfm; } diff --git a/lista06/ex04/src/Radio.hpp b/lista06/ex04/src/Radio.hpp index 1cca2f3..40c7eb3 100644 --- a/lista06/ex04/src/Radio.hpp +++ b/lista06/ex04/src/Radio.hpp @@ -7,7 +7,7 @@ class Radio { bool _amfm; public: - Radio(bool isLigado, float estacao, bool amfm); + Radio(float estacao, bool amfm); auto setarEstacao(float estacao) -> void; auto mudarAmFm(bool amfm) -> void; auto ligarDesligar(bool isLigado) -> void; diff --git a/lista06/ex04/src/Radiorelogio.cpp b/lista06/ex04/src/Radiorelogio.cpp new file mode 100644 index 0000000..e5d5728 --- /dev/null +++ b/lista06/ex04/src/Radiorelogio.cpp @@ -0,0 +1,6 @@ +#include "Radiorelogio.hpp" + +auto Radiorelogio::alarmeSintonizar(int hora, int minuto, int segundo , float estacao) -> void { + Relogio::definirAlarme(hora, minuto, segundo); + Radio::setarEstacao(estacao); +}; \ No newline at end of file diff --git a/lista06/ex04/src/Radiorelogio.hpp b/lista06/ex04/src/Radiorelogio.hpp new file mode 100644 index 0000000..dda7e92 --- /dev/null +++ b/lista06/ex04/src/Radiorelogio.hpp @@ -0,0 +1,9 @@ +#pragma once +#include "Radio.hpp" +#include "Relogio.hpp" + +class Radiorelogio : public Radio, public Relogio { +public: + Radiorelogio(float estacao, bool amfm, int hora, int minuto, int segundo) : Radio(estacao, amfm), Relogio(hora, minuto, segundo) {} + auto alarmeSintonizar(int hora, int minuto, int segundo , float estacao) -> void; +}; \ No newline at end of file diff --git a/lista06/ex04/src/Relogio.cpp b/lista06/ex04/src/Relogio.cpp index 07b2ad7..e231640 100644 --- a/lista06/ex04/src/Relogio.cpp +++ b/lista06/ex04/src/Relogio.cpp @@ -12,9 +12,7 @@ auto Relogio::definirHoras(int horaDef, int minutoDef, int segundoDef) -> void { } auto Relogio::definirAlarme(int horaAlarme, int minutoAlarme, int segundoAlarme) -> void { - if (this->_horas == horaAlarme && this->_minutos == minutoAlarme && this->_segundos == segundoAlarme) { - std::cout << "ACORDA!!!\n"; - } else { - return; - } + this->_horasAlarme = horaAlarme; + this->_minutosAlarme = minutoAlarme; + this->_segundosAlarme = segundoAlarme; } diff --git a/lista06/ex04/src/Relogio.hpp b/lista06/ex04/src/Relogio.hpp index b4672ff..c71b6e5 100644 --- a/lista06/ex04/src/Relogio.hpp +++ b/lista06/ex04/src/Relogio.hpp @@ -1,10 +1,13 @@ #pragma once class Relogio { -private: +protected: int _horas; int _minutos; int _segundos; + int _horasAlarme; + int _minutosAlarme; + int _segundosAlarme; public: Relogio(int hora, int minuto, int segundo): _horas{ hora }, _minutos{ minuto }, _segundos{ segundo } {}; diff --git a/lista06/ex04/src/a.out b/lista06/ex04/src/a.out index 7f743ef73c7e805da862ded8c904981e0e4f4be3..2321cde08951f906ae69b23e5fc8d7792eda8c22 100755 GIT binary patch delta 2206 zcmb7FZERCj7=G`)rQPB}yAR}JgEiZnIFM`|L(A6o&UL_#g=~YU0j0ZJ@8FVkm9B#c zNV^XNp~2O&L@|I1BnpckV@tqA79h;TAmAW@Xrf75e`qEW5+X9~obS2!G@BC%p5*kL z=Xsy=ocG+m_uSY)zT<7ado-=b3cvxtZUKL=^;p9(dz#6nv1J+wCL6JE_OvQS>lj^S zBOORrGkO7|t8L^4XP@&Lqq}*Hr&u8E`piL*ujBX*134~O7Kpez70kn4*8wmG$4DoD zi6?i2CzDeU8nNr?!dd+oND0@Z6H&L=bmYa;KVObna@!C8WXK(wHA>oa&-0~y5ov@OI=@!h=u?{I_d`bEX0zce*PED0mq4<>OuO0Jg9_1wf~5fh*f z*={aa5{?Lb-z~;PjN&-x#G$AF1(d)15bf8~wMkRj^V7Axn(qZtQ?`!Ol`Wi~0z=e1 znl27;CN?+XJcC@b%_UFSmT(71jV+UVi+F6?0_RRm2oR2(fN-uMSX+-h$_HyV;trJC zIXU_6%-8_s8X(L;uoiS+Oh+x?d}7zg$qRz()?@`-j~HMa`*73<)`&qI&jxM8`7o{- zrd-r0TDgE3tl4JaCN2v9@5PT;OE*Yt_Aviwww913nvGffhfzYLYVZV_5jj?ty(|;Y zFc<&9LJ0quEe^$U@!xq`9Fpm?K|Ycx4&TB#T`{ri63Mie^Gi#~CVLL)wwsf6@kzDy zlX6D}xoS@@=wgf$Yej83`hv_h>*(t<8z2t{Kla`@iP>}XM{s&BPF6Y!^jC0tJ5IJb zR`D0&WWbTX=zHe19wTbgyu_nP#|*kE@}^@+fGHC1CTI$iZaM1NZZwnlW9XVtXPVH? zL$g#{!Y>OE^TQf}6sEI3N_Y;1NslxnhwM4Yw^?pgB-N3@IS21M7L^D3cmYOU$2+3P zQY*O?uTO6BZdSZSE2JjL=aJVb&3@Mr;63z-w}Ajh zs98~EV?7YgLWh$WiR{2gPYcacZd2+N-x{w^YN^}~pKunp+^94s7|asxaK(%(R}Vo` zhkNKU;zyVLt<)a|xQe1mC4iBAyrBDPJCYmL!V{h?F1bx^X!XmkEwbd6eefYqZ%W`@ z5aK{nK5S9y%#rKKAFi(&&V3~HDU z;M|Dh2o@F&u$1AK8D7nBFT)KC?`C)>!&wX;U^v1ye4pXO7v~JaPL^N*Z(KEj{fzic z#X(rZ43aP_Bi@R%(FC(p3=m@R9K?99(U97nRk12n@v0fv^-mmtttv5Pa6%KP&zw3W zzC|F4u;&k5|nuS75_ht)h!&mM?W-p??+fR4h@)Y8g+_SXx-P z)392|6er%BBCU=Gf9*KT>G$3>^N@lc+x$WikD@kCTIOx_!@gHrFMb-D&+9j>us&GP z-YI_5EQQWrJp16x8;f7+{KG_IU84Di@BUn~snDG?c1?fg3wh(%rGm|-qXXXSr}ljG w%JIPu_K+9$2F>%VdBu?%Uyk;F7PilCY<4dnz3==uXDsyj^?P0J-+yua4fiBtxBvhE delta 1297 zcmZvbU2GIp6vxlKGc3}UZrQd}EG<(=7DUt75{2FFOm}IiXkw{r!vmoEAp;#@X|2UB zv}8ZBDOi)z?Ja2&p%11_Dj~SCFY;!^L}HARs;Eh;+m%G)1Br<-;bFR-J2Nef@g!&N z{D0?TZtk3$yiD`&)6sj5OcMYBfF6nuv`kYvuQ(*dq#hH3q_9S!IF4CZwD2*7B@qWL z{EUTz3Y#ZN<*0>wcz-mm1(vW?XT3B?Xnr00P-uK=5+nTEPojUC0I=iwQxYIb*h69S z1{=x^=r&%sZWaS2=~v5{SKL)r-uCdWquz6F`0ESzZv54Cl10URbV1JE5~qlB7F(5J z-P7oN<*m8ZpmW`k0vIFNgspr}cGR|$vT@g@lDI34p$wFHA5F1OTve500ONT9t|J{K zpSjXGfnH~9(N*QU_&xjD1T1@^rAHTH#P%h4)K229@R zz1<9Os*XZujx!P24wEH_#dyY?Fi^^np9G?5=wsaWm3X zO23Cnd;JS7klwLA?hm6c(YU`DYjVgUg~9}1*T!a$0mS|Kz~`)3_R&F^waeR! zd@YCkt-iXtx+3Z)EaEXtOeD=K@C{IXbzPk0u68vTLJ z9LjFn_xM_|%=Rm7^beg4E6!SR*{p2Eh+!h1wNmMtI3_5%5zSs~EAk&Yt)SyPS zu-1F9yEpXCfp@{ycw9Z9oml~zra|i-3;9lmdL!xq&R!BA7X<;P&*9)TKygchfsYE} zF$$SH?&8(0%}x!^K73Q=u$(+)m}&v+Q#=q0}zaav@Plj;(?(|C2Cp=*JC;&1!y84O_XEMW{BS^S`^6 z;Z#A%nwSKEz~hr`u>M?jBsEEFsSb%k3Epq#b6zYljD+gD&-TG9{db%n-+xiRcD1zU z=T7mWYxeN3n@57$ef!MZd%oWbEIH(rPMx3IUpaBGV|?bp@*APBBA-unC1)1(LUk-$ tnEN}!@ int { - auto meuRelogio = Relogio(23, 59, 57); - meuRelogio.exibirHoras(); - meuRelogio.definirAlarme(23, 59, 57); - auto meuRadio = Radio(0, 0, 0); + } \ No newline at end of file