From d0d6be7df046762629d88d86d9b4c9fb0ba3650f Mon Sep 17 00:00:00 2001 From: Erin Date: Wed, 24 Jan 2024 16:37:20 -0600 Subject: [PATCH 01/21] Create3Widget toggle options --- left.png | Bin 0 -> 1796 bytes rc/qml/Switch.qml | 61 ++++++++++++++++++++++++++++++++++++++++++++++ right.png | Bin 0 -> 1788 bytes 3 files changed, 61 insertions(+) create mode 100644 left.png create mode 100644 rc/qml/Switch.qml create mode 100644 right.png diff --git a/left.png b/left.png new file mode 100644 index 0000000000000000000000000000000000000000..9cfc7780cbae0ca2f43adbb6145ecf00debd3289 GIT binary patch literal 1796 zcmV+f2mAPmP)`2&Dt=jshx_dN#AVrR!YV zE6rRcb6B)pm8{#ctu~^6tjPkww2AF(v(R*%Q__l=S;C+cU12I#+N4`;T`B|b4zQUB z4u-OF2po&i`|c0!s6V*pdG0v4X?-P6@+9BS_kEx5`@YY8pZk74k`RJOkR-_gXu#@- z1m>RifgT}5Pei?i5T-An2&hq2bsP}4;uXlf1}F+=?2?%oB}r0ga`K{=hlVbu+U;3< zZ*38d<@d8>aV|@jEG8)_G0d-LZt3kiPk;Xaon76uo%)p5s(u52rfCCSulH9%h#Er? zgBj$|G|deNr?XJhHyjjR?})h7@p?x@eZxWFbQTIg1jgtPdR~NVfKotMtv3I@{Rd() zpt<1nH-0ayR-4~qN%R4wA{?WDDnJykFA?W@`(iYNx#P6UEsEEd1b@e-HETMP%7P}{ z4v(2xyxtLAv!+|szH}x9xxuW}V!BmNk|a%0l=BZh_>fvx_ouK{vXPNXcsjf2?CNH0 zYz%x`-aHh*;D6IQKUVM_Gv zcMfs%$YJ*G*&Q;bpx{1=pV+|Tg^!`C@iQJsxWvcDlbC2>;erLG`y4%XoI>X#0Ivxl z${=8rBuO^lY@cb{Ir>W`BraxTMG`2jql{IVDnC=rz;^N}C>#h{; zPD?Wt|ICkn%3E(%1K5QSJwc;tfX(N6`^d~l*A=L(Yhc3@KR}jc{CgN*X|GA7RjorKI(K9>b?%tz1_&EQ=djJ%K*FIcs=Tx;V?LOLH7~N z%t*&>&jN7BSy}faWMpRQ3cm8|m!q3ufR2v#n9i!JSFiG)&xdtmzWwkc*zH;Aaz{t| zvYgz-Ap>1*4<}E49PJ#Z=xC3fQ2@ik`bGgHBqYp}12-XqI=jw9FRSVFJ?>f6H{$Z; z%ckOFqkw^dff*;GM{DcxS=Bef=bJDUXK2(NCb?sjN$wbB5<{cXO#X?Cl(lQWKdbsi zSS+CzvTKnQMHwIbcjzDNYu-+0g?qAdW>w#axVW#Fij%Xmb3W_u?++P}nUPLO$;N2q zbrUOBt(rA$Gb~u38O96_4*pl}=xFch>+RJIEZep%T6s+&%QEZM6&vnY%qDShafTau zZ@pQ~g$sk7GSJr2azytJ;;NM^c=D;Iqnf1O@26zrlTpj%1>UV3RKDJiK@NNHMp4nT)&wsHcW?RBAX;MyhmSNl<5Bvc|QT`=_=#c@uUhm%ex>`D!gg%@{*m7vpE$iDptVm6aBEs27A^RU~jrs7}SwF^a2f|W1V9arrDD);R_KBCx4+xN zbI<+^V4D!43b?-PXa4;8?xZAbNmFyP6v@G*%k5!wbn*c7RwxIWj^OEwq9~_*K3~C9 zgSh@k-Jz=LxZR%hr6|t0k<%`>u-mhQq9|j4O&Anu6cMP0I_+}DFzvY|Xi}j3=cZbz zkhM`3OQO$ewfT>`XU@4mNW3>_3A|`+*(8Oi8t#i#J|?4Jgwz zttqfF#Jn6joJ&!ZF-_B&n5<9Lok0=JC_N-eT0J9yIYJ2W{!IG+52i}>${ZMJNB{r; m4rN$LW=%~1DgXcg2mk;800000(o>TF0000EO literal 0 HcmV?d00001 diff --git a/rc/qml/Switch.qml b/rc/qml/Switch.qml new file mode 100644 index 00000000..6ae2d5c5 --- /dev/null +++ b/rc/qml/Switch.qml @@ -0,0 +1,61 @@ +import QtQuick 2.0 + +Item { + id: toggleswitch + width: background.width; height: background.height + + property bool on: false + + function toggle() { + if (toggleswitch.state == "on") + toggleswitch.state = "off"; + else + toggleswitch.state = "on"; + } + + function releaseSwitch() { + if (knob.x == 1) { + if (toggleswitch.state == "off") return; + } + if (knob.x == 78) { + if (toggleswitch.state == "on") return; + } + toggle(); + } + + Image { + id: background + source: "background.png" + MouseArea { anchors.fill: parent; onClicked: toggle() } + } + + Image { + id: knob + x: 1; y: 2 + source: "knob.png" + + MouseArea { + anchors.fill: parent + drag.target: knob; drag.axis: Drag.XAxis; drag.minimumX: 1; drag.maximumX: 78 + onClicked: toggle() + onReleased: releaseSwitch() + } + } + + states: [ + State { + name: "on" + PropertyChanges { target: knob; x: 78 } + PropertyChanges { target: toggleswitch; on: true } + }, + State { + name: "off" + PropertyChanges { target: knob; x: 1 } + PropertyChanges { target: toggleswitch; on: false } + } + ] + + transitions: Transition { + NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad; duration: 200 } + } +} diff --git a/right.png b/right.png new file mode 100644 index 0000000000000000000000000000000000000000..1b34342eb5673f7230c28c46b80e1880543d8540 GIT binary patch literal 1788 zcmVjYkeh8@+9BS_x*gH_kF+jz59MYiii*iilXEKI*=EU zz|8YL&?O>W5%m@k%NI}xRM~8{5kS65gY2wK5)$IW{CH-T?w)h>_V&@<;iCCppYlq@P5^XW?=uYJS0YjsQY6F( z%GGtf4Uqi&)pFoqjTnYUzU~-?M-CjUk^KDC0!ZK;bH&Vy>o!0MAgQTo{yls5#pH!% zf>&RAT~bri{C0c14=9mvi~=eEDJotkXS;i1^a?Y_sn#|rDqa`-9-Gvx$xJE_nsg&f zGpiVe$JDIJR<&=ONkJxt*_ul(#`}hC#E5DLWq_yod=X?8bxjF%e zi;IhBRrYwiEM2;k&p#jPGYlg~L=4~>qpE->8=F4jp1bd|Ed1Z0A-vvUd_JG`w~7+| z1A`o^t;KodFfA=7uNzmkegkWZiYQpM!jkT>E{%=ha&_YKjfRzEwD9?S{BFk%-hKCI*nL%1Mb~v+-?f|KwS}g! zt!<~deMt@kMwJR+v)PI_mT$6TQcFu~Oig-m`wJ171mO4k85$bm(V~ah|F>$>*d;mH zJoWTXNK8z63_w*BrEp|qWX|{Q`@U(%@$qq7uFjZEHGs;>N*WsKqoP&zOew8xr%hvi z@W6u%4i2O!iju1Wxd5wHj2!sg_^o2O0t z$dN;I_nb40iHnPyr3P+H1BZt%MlZ7nXgu-HY1MDjm| zsGHn0$}%^NvWO+4X3w5I-FcX@e7UuM{gHC#cb0{WQ8i5)abM^&4YJ$q(aI?zva)lg zRX;n+{O1vXx@ghj&w6`%O@rd&V{6oR@4jbRbX8TQZ2g9i8+&fI`;ywya2B^-y9>=KPz_Mu@OM+ul;k9IJt0adhEG;z2Ah8QY*e&VRV6t&g&n_r$u#cc zPd*LaR;wb?tm}H8^T^?l4_I_tI&L@(1N;9%(}y3McAPb97T>z#c2ZK3rZ(v)RtCd+bMZcK>OYr3ZREUivOvz%V=!Cp{I~J6!C1d57ug z%S3ioyvkE0Pgpv>Dk!+04?g(E$mrPJ`VZXX#jKBEi!aP18>Ke7-yW-yqi>spr~k zwh@OT{Tor7F_BZPZQ^jGi>7H8fiwwGq)|wq9_mzUTMW~lS%M}7%74C8D|Ox4D7!u0 zmztX9udRD8X35VK2M*RqYHFH4P_{T}L0PD3yIw#xmT$Ttr{dY}9@$vFNdTEQZ(hgs zOcFDrTF0000*8 literal 0 HcmV?d00001 From 4184ad35904601fa57f7eab75cac2e5afb87190a Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 10:02:21 -0600 Subject: [PATCH 02/21] Create3 UI toggle changes --- rc/left.png | Bin 0 -> 1796 bytes rc/qml.qrc | 12 +- rc/qml/left.png | Bin 0 -> 1796 bytes rc/qml/right.png | Bin 0 -> 1788 bytes ui/Create3Widget.ui | 389 +++++++++++++++++++++++++++----------------- 5 files changed, 243 insertions(+), 158 deletions(-) create mode 100644 rc/left.png create mode 100644 rc/qml/left.png create mode 100644 rc/qml/right.png diff --git a/rc/left.png b/rc/left.png new file mode 100644 index 0000000000000000000000000000000000000000..9cfc7780cbae0ca2f43adbb6145ecf00debd3289 GIT binary patch literal 1796 zcmV+f2mAPmP)`2&Dt=jshx_dN#AVrR!YV zE6rRcb6B)pm8{#ctu~^6tjPkww2AF(v(R*%Q__l=S;C+cU12I#+N4`;T`B|b4zQUB z4u-OF2po&i`|c0!s6V*pdG0v4X?-P6@+9BS_kEx5`@YY8pZk74k`RJOkR-_gXu#@- z1m>RifgT}5Pei?i5T-An2&hq2bsP}4;uXlf1}F+=?2?%oB}r0ga`K{=hlVbu+U;3< zZ*38d<@d8>aV|@jEG8)_G0d-LZt3kiPk;Xaon76uo%)p5s(u52rfCCSulH9%h#Er? zgBj$|G|deNr?XJhHyjjR?})h7@p?x@eZxWFbQTIg1jgtPdR~NVfKotMtv3I@{Rd() zpt<1nH-0ayR-4~qN%R4wA{?WDDnJykFA?W@`(iYNx#P6UEsEEd1b@e-HETMP%7P}{ z4v(2xyxtLAv!+|szH}x9xxuW}V!BmNk|a%0l=BZh_>fvx_ouK{vXPNXcsjf2?CNH0 zYz%x`-aHh*;D6IQKUVM_Gv zcMfs%$YJ*G*&Q;bpx{1=pV+|Tg^!`C@iQJsxWvcDlbC2>;erLG`y4%XoI>X#0Ivxl z${=8rBuO^lY@cb{Ir>W`BraxTMG`2jql{IVDnC=rz;^N}C>#h{; zPD?Wt|ICkn%3E(%1K5QSJwc;tfX(N6`^d~l*A=L(Yhc3@KR}jc{CgN*X|GA7RjorKI(K9>b?%tz1_&EQ=djJ%K*FIcs=Tx;V?LOLH7~N z%t*&>&jN7BSy}faWMpRQ3cm8|m!q3ufR2v#n9i!JSFiG)&xdtmzWwkc*zH;Aaz{t| zvYgz-Ap>1*4<}E49PJ#Z=xC3fQ2@ik`bGgHBqYp}12-XqI=jw9FRSVFJ?>f6H{$Z; z%ckOFqkw^dff*;GM{DcxS=Bef=bJDUXK2(NCb?sjN$wbB5<{cXO#X?Cl(lQWKdbsi zSS+CzvTKnQMHwIbcjzDNYu-+0g?qAdW>w#axVW#Fij%Xmb3W_u?++P}nUPLO$;N2q zbrUOBt(rA$Gb~u38O96_4*pl}=xFch>+RJIEZep%T6s+&%QEZM6&vnY%qDShafTau zZ@pQ~g$sk7GSJr2azytJ;;NM^c=D;Iqnf1O@26zrlTpj%1>UV3RKDJiK@NNHMp4nT)&wsHcW?RBAX;MyhmSNl<5Bvc|QT`=_=#c@uUhm%ex>`D!gg%@{*m7vpE$iDptVm6aBEs27A^RU~jrs7}SwF^a2f|W1V9arrDD);R_KBCx4+xN zbI<+^V4D!43b?-PXa4;8?xZAbNmFyP6v@G*%k5!wbn*c7RwxIWj^OEwq9~_*K3~C9 zgSh@k-Jz=LxZR%hr6|t0k<%`>u-mhQq9|j4O&Anu6cMP0I_+}DFzvY|Xi}j3=cZbz zkhM`3OQO$ewfT>`XU@4mNW3>_3A|`+*(8Oi8t#i#J|?4Jgwz zttqfF#Jn6joJ&!ZF-_B&n5<9Lok0=JC_N-eT0J9yIYJ2W{!IG+52i}>${ZMJNB{r; m4rN$LW=%~1DgXcg2mk;800000(o>TF0000EO literal 0 HcmV?d00001 diff --git a/rc/qml.qrc b/rc/qml.qrc index c7836019..23217176 100644 --- a/rc/qml.qrc +++ b/rc/qml.qrc @@ -1,7 +1,9 @@ - - qml/loading.qml - qml/lock.qml - qml/50-screenlock.png - + + qml/loading.qml + qml/lock.qml + qml/50-screenlock.png + qml/left.png + qml/right.png + diff --git a/rc/qml/left.png b/rc/qml/left.png new file mode 100644 index 0000000000000000000000000000000000000000..9cfc7780cbae0ca2f43adbb6145ecf00debd3289 GIT binary patch literal 1796 zcmV+f2mAPmP)`2&Dt=jshx_dN#AVrR!YV zE6rRcb6B)pm8{#ctu~^6tjPkww2AF(v(R*%Q__l=S;C+cU12I#+N4`;T`B|b4zQUB z4u-OF2po&i`|c0!s6V*pdG0v4X?-P6@+9BS_kEx5`@YY8pZk74k`RJOkR-_gXu#@- z1m>RifgT}5Pei?i5T-An2&hq2bsP}4;uXlf1}F+=?2?%oB}r0ga`K{=hlVbu+U;3< zZ*38d<@d8>aV|@jEG8)_G0d-LZt3kiPk;Xaon76uo%)p5s(u52rfCCSulH9%h#Er? zgBj$|G|deNr?XJhHyjjR?})h7@p?x@eZxWFbQTIg1jgtPdR~NVfKotMtv3I@{Rd() zpt<1nH-0ayR-4~qN%R4wA{?WDDnJykFA?W@`(iYNx#P6UEsEEd1b@e-HETMP%7P}{ z4v(2xyxtLAv!+|szH}x9xxuW}V!BmNk|a%0l=BZh_>fvx_ouK{vXPNXcsjf2?CNH0 zYz%x`-aHh*;D6IQKUVM_Gv zcMfs%$YJ*G*&Q;bpx{1=pV+|Tg^!`C@iQJsxWvcDlbC2>;erLG`y4%XoI>X#0Ivxl z${=8rBuO^lY@cb{Ir>W`BraxTMG`2jql{IVDnC=rz;^N}C>#h{; zPD?Wt|ICkn%3E(%1K5QSJwc;tfX(N6`^d~l*A=L(Yhc3@KR}jc{CgN*X|GA7RjorKI(K9>b?%tz1_&EQ=djJ%K*FIcs=Tx;V?LOLH7~N z%t*&>&jN7BSy}faWMpRQ3cm8|m!q3ufR2v#n9i!JSFiG)&xdtmzWwkc*zH;Aaz{t| zvYgz-Ap>1*4<}E49PJ#Z=xC3fQ2@ik`bGgHBqYp}12-XqI=jw9FRSVFJ?>f6H{$Z; z%ckOFqkw^dff*;GM{DcxS=Bef=bJDUXK2(NCb?sjN$wbB5<{cXO#X?Cl(lQWKdbsi zSS+CzvTKnQMHwIbcjzDNYu-+0g?qAdW>w#axVW#Fij%Xmb3W_u?++P}nUPLO$;N2q zbrUOBt(rA$Gb~u38O96_4*pl}=xFch>+RJIEZep%T6s+&%QEZM6&vnY%qDShafTau zZ@pQ~g$sk7GSJr2azytJ;;NM^c=D;Iqnf1O@26zrlTpj%1>UV3RKDJiK@NNHMp4nT)&wsHcW?RBAX;MyhmSNl<5Bvc|QT`=_=#c@uUhm%ex>`D!gg%@{*m7vpE$iDptVm6aBEs27A^RU~jrs7}SwF^a2f|W1V9arrDD);R_KBCx4+xN zbI<+^V4D!43b?-PXa4;8?xZAbNmFyP6v@G*%k5!wbn*c7RwxIWj^OEwq9~_*K3~C9 zgSh@k-Jz=LxZR%hr6|t0k<%`>u-mhQq9|j4O&Anu6cMP0I_+}DFzvY|Xi}j3=cZbz zkhM`3OQO$ewfT>`XU@4mNW3>_3A|`+*(8Oi8t#i#J|?4Jgwz zttqfF#Jn6joJ&!ZF-_B&n5<9Lok0=JC_N-eT0J9yIYJ2W{!IG+52i}>${ZMJNB{r; m4rN$LW=%~1DgXcg2mk;800000(o>TF0000EO literal 0 HcmV?d00001 diff --git a/rc/qml/right.png b/rc/qml/right.png new file mode 100644 index 0000000000000000000000000000000000000000..1b34342eb5673f7230c28c46b80e1880543d8540 GIT binary patch literal 1788 zcmVjYkeh8@+9BS_x*gH_kF+jz59MYiii*iilXEKI*=EU zz|8YL&?O>W5%m@k%NI}xRM~8{5kS65gY2wK5)$IW{CH-T?w)h>_V&@<;iCCppYlq@P5^XW?=uYJS0YjsQY6F( z%GGtf4Uqi&)pFoqjTnYUzU~-?M-CjUk^KDC0!ZK;bH&Vy>o!0MAgQTo{yls5#pH!% zf>&RAT~bri{C0c14=9mvi~=eEDJotkXS;i1^a?Y_sn#|rDqa`-9-Gvx$xJE_nsg&f zGpiVe$JDIJR<&=ONkJxt*_ul(#`}hC#E5DLWq_yod=X?8bxjF%e zi;IhBRrYwiEM2;k&p#jPGYlg~L=4~>qpE->8=F4jp1bd|Ed1Z0A-vvUd_JG`w~7+| z1A`o^t;KodFfA=7uNzmkegkWZiYQpM!jkT>E{%=ha&_YKjfRzEwD9?S{BFk%-hKCI*nL%1Mb~v+-?f|KwS}g! zt!<~deMt@kMwJR+v)PI_mT$6TQcFu~Oig-m`wJ171mO4k85$bm(V~ah|F>$>*d;mH zJoWTXNK8z63_w*BrEp|qWX|{Q`@U(%@$qq7uFjZEHGs;>N*WsKqoP&zOew8xr%hvi z@W6u%4i2O!iju1Wxd5wHj2!sg_^o2O0t z$dN;I_nb40iHnPyr3P+H1BZt%MlZ7nXgu-HY1MDjm| zsGHn0$}%^NvWO+4X3w5I-FcX@e7UuM{gHC#cb0{WQ8i5)abM^&4YJ$q(aI?zva)lg zRX;n+{O1vXx@ghj&w6`%O@rd&V{6oR@4jbRbX8TQZ2g9i8+&fI`;ywya2B^-y9>=KPz_Mu@OM+ul;k9IJt0adhEG;z2Ah8QY*e&VRV6t&g&n_r$u#cc zPd*LaR;wb?tm}H8^T^?l4_I_tI&L@(1N;9%(}y3McAPb97T>z#c2ZK3rZ(v)RtCd+bMZcK>OYr3ZREUivOvz%V=!Cp{I~J6!C1d57ug z%S3ioyvkE0Pgpv>Dk!+04?g(E$mrPJ`VZXX#jKBEi!aP18>Ke7-yW-yqi>spr~k zwh@OT{Tor7F_BZPZQ^jGi>7H8fiwwGq)|wq9_mzUTMW~lS%M}7%74C8D|Ox4D7!u0 zmztX9udRD8X35VK2M*RqYHFH4P_{T}L0PD3yIw#xmT$Ttr{dY}9@$vFNdTEQZ(hgs zOcFDrTF0000*8 literal 0 HcmV?d00001 diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index 2f07440c..4c78e516 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -23,160 +23,243 @@ - - - - 22 - + + + 10 - - Create 3 Info - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - 0 - 80 - - - - - 33 - - - - Create Connect - - - - - - - - - - - 22 - - - - Create3 Connected State: - - - - - - - - 22 - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 160 - 16777215 - - - - - 22 - - - - Create3 IP: - - - - - - - - 25 - 0 - - - - - 22 - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 0 - 80 - - - - - 21 - - - - Create 3 Sensor List - - - - - - - - 0 - 80 - - - - - 21 - - - - Create 3 Example Programs - - - - - - - + + + + + 1 + 0 + + + + + 0 + 80 + + + + + 400 + 16777215 + + + + + 33 + + + + Create Connect + + + + + + + + + + 25 + 0 + + + + + 60 + 16777215 + + + + + 22 + + + + Wifi + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 100 + 16777215 + + + + QCheckBox::indicator{ + margin-left:10%; + margin-right:10% +} + +QCheckBox::indicator:checked{ + image:url("://qml/right.png"); +} + +QCheckBox::indicator:unchecked{ + image:url("://qml/left.png"); +} + + + + + + false + + + + + + + + 25 + 0 + + + + + 120 + 16777215 + + + + + 22 + + + + Ethernet + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + 22 + + + + Create3 Connected State: + + + + + + + + 22 + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 160 + 16777215 + + + + + 22 + + + + Create3 IP: + + + + + + + + 25 + 0 + + + + + 22 + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 0 + 80 + + + + + 21 + + + + Create 3 Sensor List + + + + + + + + 0 + 80 + + + + + 21 + + + + Create 3 Example Programs + + + + From 6d66478ce48a98ac805a4c0a1bc81f8bec63e296 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 12:31:07 -0600 Subject: [PATCH 03/21] changing spacing on Create3Widget --- ui/Create3Widget.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index 4c78e516..79e42c5e 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -97,7 +97,7 @@ QCheckBox::indicator{ margin-left:10%; - margin-right:10% + margin-right:12% } QCheckBox::indicator:checked{ From 8499c533fcf175c98ef7b41b777eb81514693c62 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 12:44:13 -0600 Subject: [PATCH 04/21] More ui adjusting --- ui/Create3Widget.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index 79e42c5e..c1e2a677 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -59,6 +59,9 @@ + + 7 + From 2849b71306b584fc5328231eb86d7d92adbfa11d Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 12:47:51 -0600 Subject: [PATCH 05/21] UI changes --- ui/Create3Widget.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index c1e2a677..388f4d2a 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -43,7 +43,7 @@ - 400 + 370 16777215 From e6b84de41b8371ada448b866a58c22f84138e7b4 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 12:56:39 -0600 Subject: [PATCH 06/21] UI Spacing --- ui/Create3Widget.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index 388f4d2a..03d3e7a7 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -100,7 +100,7 @@ QCheckBox::indicator{ margin-left:10%; - margin-right:12% + margin-right:8% } QCheckBox::indicator:checked{ @@ -123,7 +123,7 @@ QCheckBox::indicator:unchecked{ - 25 + 35 0 From a8fc68ff8ae4aa62a203885d34d75b7c2e5b7b05 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 13:00:40 -0600 Subject: [PATCH 07/21] UI spacing changes --- ui/Create3Widget.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index 03d3e7a7..fba536f4 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -129,7 +129,7 @@ QCheckBox::indicator:unchecked{ - 120 + 140 16777215 From b0adc795c9bd3e92b712b9807adcc6f24dd49564 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 14:02:45 -0600 Subject: [PATCH 08/21] Adding toggle switch functionality --- include/botui/Create3Widget.h | 1 + src/Create3Widget.cpp | 106 ++++++++++++---------------------- ui/Create3Widget.ui | 2 +- 3 files changed, 39 insertions(+), 70 deletions(-) diff --git a/include/botui/Create3Widget.h b/include/botui/Create3Widget.h index d7c0e8af..67bb9ac9 100644 --- a/include/botui/Create3Widget.h +++ b/include/botui/Create3Widget.h @@ -27,6 +27,7 @@ private slots: void sensorList(); void exampleList(); QString getIP(); + void indexChanged(); private: diff --git a/src/Create3Widget.cpp b/src/Create3Widget.cpp index b61fb8df..df19bc64 100644 --- a/src/Create3Widget.cpp +++ b/src/Create3Widget.cpp @@ -30,6 +30,8 @@ class Create3SensorItemDelegate : public QItemDelegate const QPixmap _down; }; +QByteArray output; + Create3Widget::Create3Widget(Device *device, QWidget *parent) : StandardWidget(device, parent), ui(new Ui::Create3Widget), _model(new Create3SensorModel(this)) @@ -41,8 +43,26 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent) // connect(ui->ResetServerButton, SIGNAL(clicked()), SLOT(resetServer())); connect(ui->Create3SensorListButton, SIGNAL(clicked()), SLOT(sensorList())); connect(ui->Create3ExampleProgramButton, SIGNAL(clicked()), SLOT(exampleList())); - ui->create3IP->setText(getIP()); + + QStringList arguments; + arguments << "/home/erin/Desktop/qt6Upgrade/wombat-os/configFiles/create3_server_ip.txt"; + + QProcess *myProcess = new QProcess(parent); + myProcess->start("cat", arguments); + myProcess->waitForFinished(); + output = myProcess->readAllStandardOutput(); + + qDebug() << output; + + QString ipOutput = QString(output); + + if(ipOutput == "192.168.125.1"){ + ui->toggleSwitch->setChecked(false); + } + else if (ipOutput == "192.168.186.3") { + ui->toggleSwitch->setChecked(true); + } } Create3Widget::~Create3Widget() @@ -50,10 +70,25 @@ Create3Widget::~Create3Widget() delete ui; } +void Create3Widget::indexChanged() +{ + + bool isChecked = ui->toggleSwitch->isChecked(); + + if (isChecked) + { + qDebug() << "toggle: Ethernet"; + } + else + { + qDebug() << "toggle: WiFi"; + } +} + QString Create3Widget::getIP() { - // The command to execute + // The command to execute const char *command = "arp -a | grep 'iRobot' | awk -F '[()]' '{print $2}'"; // Open a pipe to the command @@ -81,78 +116,11 @@ QString Create3Widget::getIP() std::cout << "Output:\n" << result << std::endl; - QString output = QString::fromStdString(result); return output; } -// void Create3Widget::resetServer() -// { -// QProcess stopCreate3Service; -// QString stopCommand = "systemctl"; -// QStringList stopArgs = { -// "stop", -// "create3_server.service" -// }; - -// stopCreate3Service.start(stopCommand, stopArgs); -// if(stopCreate3Service.waitForFinished()) -// { -// QByteArray data = stopCreate3Service.readAllStandardOutput(); -// qDebug() << "Create3 Server successfully stopped\n" << data; -// } -// else -// { -// QByteArray data = stopCreate3Service.readAllStandardError(); -// qDebug() << "Create3 Server failed to stop or crashed\n" << data; -// } - -// // Need a command to run between start and stop for some reason for things to work -// QProcess statusCreate3Service; -// QString statusCommand = "systemctl"; -// QStringList statusArgs = { -// "status", -// "create3_server.service", -// "--no-pager" -// }; - -// statusCreate3Service.start(statusCommand, statusArgs); -// if(statusCreate3Service.waitForFinished()) -// { -// QByteArray data = statusCreate3Service.readAllStandardOutput(); -// qDebug() << "Create3 Server status\n" << data; -// } -// else -// { -// QByteArray data = statusCreate3Service.readAllStandardError(); -// qDebug() << "Create3 Server failed to get status\n" << data; -// } - - - -// QProcess startCreate3Service; -// QString startCommand = "systemctl"; -// QStringList startArgs = { -// "start", -// "create3_server.service" -// }; - -// startCreate3Service.start(startCommand, startArgs); -// if(startCreate3Service.waitForFinished()) -// { -// QByteArray data = startCreate3Service.readAllStandardOutput(); -// qDebug() << "Create3 Server successfully started\n" << data; -// } -// else -// { -// QByteArray data = startCreate3Service.readAllStandardError(); -// qDebug() << "Create3 Server failed to start or crashed\n" << data; -// } - -// RootController::ref().dismissWidget(); -// } - void Create3Widget::sensorList() { RootController::ref().presentWidget(new Create3SensorListWidget(device())); diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index fba536f4..a331009b 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -129,7 +129,7 @@ QCheckBox::indicator:unchecked{ - 140 + 134 16777215 From 058bb7b26548d04bc01f16c4884198ddba18b2a3 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 14:43:36 -0600 Subject: [PATCH 09/21] Adding toggle switch functionality --- include/botui/Create3Widget.h | 2 +- src/Create3Widget.cpp | 62 +++++++++++++++++++++++++++++------ 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/include/botui/Create3Widget.h b/include/botui/Create3Widget.h index 67bb9ac9..3705148a 100644 --- a/include/botui/Create3Widget.h +++ b/include/botui/Create3Widget.h @@ -27,7 +27,7 @@ private slots: void sensorList(); void exampleList(); QString getIP(); - void indexChanged(); + void toggleChanged(); private: diff --git a/src/Create3Widget.cpp b/src/Create3Widget.cpp index df19bc64..4ef4c7d4 100644 --- a/src/Create3Widget.cpp +++ b/src/Create3Widget.cpp @@ -43,10 +43,11 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent) // connect(ui->ResetServerButton, SIGNAL(clicked()), SLOT(resetServer())); connect(ui->Create3SensorListButton, SIGNAL(clicked()), SLOT(sensorList())); connect(ui->Create3ExampleProgramButton, SIGNAL(clicked()), SLOT(exampleList())); + connect(ui->toggleSwitch, SIGNAL(toggled(bool)), SLOT(toggleChanged())); ui->create3IP->setText(getIP()); QStringList arguments; - arguments << "/home/erin/Desktop/qt6Upgrade/wombat-os/configFiles/create3_server_ip.txt"; + arguments << "/home/kipr/wombat-os/configFiles/create3_server_ip.txt"; QProcess *myProcess = new QProcess(parent); myProcess->start("cat", arguments); @@ -56,11 +57,13 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent) qDebug() << output; QString ipOutput = QString(output); - - if(ipOutput == "192.168.125.1"){ + + if (ipOutput == "192.168.125.1") + { ui->toggleSwitch->setChecked(false); } - else if (ipOutput == "192.168.186.3") { + else if (ipOutput == "192.168.186.3") + { ui->toggleSwitch->setChecked(true); } } @@ -70,18 +73,57 @@ Create3Widget::~Create3Widget() delete ui; } -void Create3Widget::indexChanged() +void Create3Widget::toggleChanged() { + QProcess checkCreate3IPState; + QString startCommand = "cat"; + QStringList startArgs = {"/home/kipr/wombat-os/configFiles/create3_server_ip.txt"}; - bool isChecked = ui->toggleSwitch->isChecked(); + checkCreate3IPState.start(startCommand, startArgs); + checkCreate3IPState.waitForFinished(); + QByteArray output = checkCreate3IPState.readAllStandardOutput(); + + QString ipOutput = QString(output); - if (isChecked) + qDebug() << "IP OUTPUT: " << ipOutput; // Get current IP output + + + if (ipOutput == "192.168.125.1") { - qDebug() << "toggle: Ethernet"; + + if (QMessageBox::question(this, "Change Interface?", + QString("You are about to change your Create 3 connection from Wifi to Ethernet. \nThe Wombat will reboot once you make this change. \n Do you want to continue? \n (Be sure to change the Fast DDS discovery server IP address to 192.168.186.3)"), + QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) + { + return; + } + else + { + ui->toggleSwitch->setChecked(true); + QProcess process; + process.startDetached("/bin/sh", QStringList() << "/home/kipr/wombat-os/configFiles/create3_interface_swap.sh" + << "eth"); + } + + } - else + else if (ipOutput == "192.168.186.3") { - qDebug() << "toggle: WiFi"; + if (QMessageBox::question(this, "Change Interface?", + QString("You are about to change your Create 3 connection from Ethernet to Wifi. \n The Wombat will reboot once you make this change. \nDo you want to continue? \n (Be sure to change the Fast DDS discovery server IP address to 192.168.186.3)"), + QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) + { + return; + } + else + { + ui->toggleSwitch->setChecked(false); + QProcess process; + process.startDetached("/bin/sh", QStringList() << "/home/kipr/wombat-os/configFiles/create3_interface_swap.sh" + << "wifi"); + } + + } } From 16957900f3510ba9f58d69fb4c5a46871fd8ff56 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 15:04:15 -0600 Subject: [PATCH 10/21] Removing redundant toggle UI change --- src/Create3Widget.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Create3Widget.cpp b/src/Create3Widget.cpp index 4ef4c7d4..180fd65e 100644 --- a/src/Create3Widget.cpp +++ b/src/Create3Widget.cpp @@ -99,7 +99,6 @@ void Create3Widget::toggleChanged() } else { - ui->toggleSwitch->setChecked(true); QProcess process; process.startDetached("/bin/sh", QStringList() << "/home/kipr/wombat-os/configFiles/create3_interface_swap.sh" << "eth"); @@ -110,14 +109,13 @@ void Create3Widget::toggleChanged() else if (ipOutput == "192.168.186.3") { if (QMessageBox::question(this, "Change Interface?", - QString("You are about to change your Create 3 connection from Ethernet to Wifi. \n The Wombat will reboot once you make this change. \nDo you want to continue? \n (Be sure to change the Fast DDS discovery server IP address to 192.168.186.3)"), + QString("You are about to change your Create 3 connection from Ethernet to Wifi. \n The Wombat will reboot once you make this change. \nDo you want to continue? \n (Be sure to change the Fast DDS discovery server IP address to 192.168.125.1)"), QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) { return; } else { - ui->toggleSwitch->setChecked(false); QProcess process; process.startDetached("/bin/sh", QStringList() << "/home/kipr/wombat-os/configFiles/create3_interface_swap.sh" << "wifi"); From c441fdf6fc910480c93e971229b3e244b719e77e Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 15:10:24 -0600 Subject: [PATCH 11/21] Changing toggleSwitch signal --- src/Create3Widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Create3Widget.cpp b/src/Create3Widget.cpp index 180fd65e..39e9b620 100644 --- a/src/Create3Widget.cpp +++ b/src/Create3Widget.cpp @@ -43,7 +43,7 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent) // connect(ui->ResetServerButton, SIGNAL(clicked()), SLOT(resetServer())); connect(ui->Create3SensorListButton, SIGNAL(clicked()), SLOT(sensorList())); connect(ui->Create3ExampleProgramButton, SIGNAL(clicked()), SLOT(exampleList())); - connect(ui->toggleSwitch, SIGNAL(toggled(bool)), SLOT(toggleChanged())); + connect(ui->toggleSwitch, SIGNAL(clicked()), SLOT(toggleChanged())); ui->create3IP->setText(getIP()); QStringList arguments; From e523eccb35f833517ec4e4f56736d9f303064e98 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 15:16:50 -0600 Subject: [PATCH 12/21] Change toggleSwitch signal --- src/Create3Widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Create3Widget.cpp b/src/Create3Widget.cpp index 39e9b620..58b25f59 100644 --- a/src/Create3Widget.cpp +++ b/src/Create3Widget.cpp @@ -43,7 +43,7 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent) // connect(ui->ResetServerButton, SIGNAL(clicked()), SLOT(resetServer())); connect(ui->Create3SensorListButton, SIGNAL(clicked()), SLOT(sensorList())); connect(ui->Create3ExampleProgramButton, SIGNAL(clicked()), SLOT(exampleList())); - connect(ui->toggleSwitch, SIGNAL(clicked()), SLOT(toggleChanged())); + connect(ui->toggleSwitch, SIGNAL(stateChanged(int)), SLOT(toggleChanged())); ui->create3IP->setText(getIP()); QStringList arguments; From a28af0402a60766699980dc9c46fbd9df5eff5bf Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 15:24:24 -0600 Subject: [PATCH 13/21] Adding this to connect toggleSwitch --- src/Create3Widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Create3Widget.cpp b/src/Create3Widget.cpp index 58b25f59..db0cef75 100644 --- a/src/Create3Widget.cpp +++ b/src/Create3Widget.cpp @@ -43,7 +43,7 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent) // connect(ui->ResetServerButton, SIGNAL(clicked()), SLOT(resetServer())); connect(ui->Create3SensorListButton, SIGNAL(clicked()), SLOT(sensorList())); connect(ui->Create3ExampleProgramButton, SIGNAL(clicked()), SLOT(exampleList())); - connect(ui->toggleSwitch, SIGNAL(stateChanged(int)), SLOT(toggleChanged())); + connect(ui->toggleSwitch, SIGNAL(stateChanged(int)), this, SLOT(toggleChanged())); ui->create3IP->setText(getIP()); QStringList arguments; From b35fc914c3d53cf861022333d1675a46fc515305 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 15:36:18 -0600 Subject: [PATCH 14/21] Changing ipOutput to contains instead of direct match --- src/Create3Widget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Create3Widget.cpp b/src/Create3Widget.cpp index db0cef75..ab35584a 100644 --- a/src/Create3Widget.cpp +++ b/src/Create3Widget.cpp @@ -88,7 +88,7 @@ void Create3Widget::toggleChanged() qDebug() << "IP OUTPUT: " << ipOutput; // Get current IP output - if (ipOutput == "192.168.125.1") + if (ipOutput.contains("192.168.125.1")) { if (QMessageBox::question(this, "Change Interface?", @@ -106,7 +106,7 @@ void Create3Widget::toggleChanged() } - else if (ipOutput == "192.168.186.3") + else if (ipOutput.contains("192.168.186.3")) { if (QMessageBox::question(this, "Change Interface?", QString("You are about to change your Create 3 connection from Ethernet to Wifi. \n The Wombat will reboot once you make this change. \nDo you want to continue? \n (Be sure to change the Fast DDS discovery server IP address to 192.168.125.1)"), From ed55ee902f60da8b4f59a557e4269565da8b4377 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jan 2024 15:59:54 -0600 Subject: [PATCH 15/21] Changing connect signal/slot position --- src/Create3Widget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Create3Widget.cpp b/src/Create3Widget.cpp index ab35584a..42c1663a 100644 --- a/src/Create3Widget.cpp +++ b/src/Create3Widget.cpp @@ -43,7 +43,7 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent) // connect(ui->ResetServerButton, SIGNAL(clicked()), SLOT(resetServer())); connect(ui->Create3SensorListButton, SIGNAL(clicked()), SLOT(sensorList())); connect(ui->Create3ExampleProgramButton, SIGNAL(clicked()), SLOT(exampleList())); - connect(ui->toggleSwitch, SIGNAL(stateChanged(int)), this, SLOT(toggleChanged())); + ui->create3IP->setText(getIP()); QStringList arguments; @@ -66,6 +66,10 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent) { ui->toggleSwitch->setChecked(true); } + + + + connect(ui->toggleSwitch, SIGNAL(stateChanged(int)), this, SLOT(toggleChanged())); } Create3Widget::~Create3Widget() From 61f033e3c56fe0768164c1b2912d9458b64b6ec9 Mon Sep 17 00:00:00 2001 From: Erin Date: Fri, 26 Jan 2024 15:19:05 -0600 Subject: [PATCH 16/21] Adjustments --- ui/Create3Widget.ui | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index a331009b..13c35e0b 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -25,7 +25,10 @@ - 10 + 20 + + + 0 From e8adeb14811f375fb7f628b0598de0e52c6dfb2d Mon Sep 17 00:00:00 2001 From: Erin Date: Fri, 26 Jan 2024 15:24:00 -0600 Subject: [PATCH 17/21] alignment --- ui/Create3Widget.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index 13c35e0b..3d50f463 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -30,7 +30,7 @@ 0 - + From f2ad88d20490880c833a828b6f4d190a52dc471d Mon Sep 17 00:00:00 2001 From: Erin Date: Fri, 26 Jan 2024 15:35:38 -0600 Subject: [PATCH 18/21] layout adjustments --- ui/Create3Widget.ui | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index 3d50f463..cbad3b7d 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -25,28 +25,31 @@ - 20 + 0 0 - + + + true + - 1 + 0 0 - 0 + 1 80 - 370 + 16777215 16777215 From 0c49a4e41202fac43065b3c267163dc5e4ec1fc0 Mon Sep 17 00:00:00 2001 From: Erin Date: Fri, 26 Jan 2024 15:40:45 -0600 Subject: [PATCH 19/21] spacing changes --- ui/Create3Widget.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index cbad3b7d..3a02cdff 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -91,7 +91,7 @@ Wifi - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter @@ -106,7 +106,7 @@ QCheckBox::indicator{ margin-left:10%; - margin-right:8% + margin-right:10% } QCheckBox::indicator:checked{ @@ -148,7 +148,7 @@ QCheckBox::indicator:unchecked{ Ethernet - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignCenter From 3c0e633bb720b2d9ebc6de80581e6fe4470b0630 Mon Sep 17 00:00:00 2001 From: Erin Date: Fri, 26 Jan 2024 15:43:56 -0600 Subject: [PATCH 20/21] Spacing issues --- ui/Create3Widget.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index 3a02cdff..d22b9ccd 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -105,7 +105,7 @@ QCheckBox::indicator{ - margin-left:10%; + margin-left:13%; margin-right:10% } From 80d65124cbbaa5b4f7ee9711ef6f25af38d6397d Mon Sep 17 00:00:00 2001 From: Erin Date: Fri, 26 Jan 2024 15:47:12 -0600 Subject: [PATCH 21/21] Tweaking UI --- ui/Create3Widget.ui | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ui/Create3Widget.ui b/ui/Create3Widget.ui index d22b9ccd..8a00ac8f 100644 --- a/ui/Create3Widget.ui +++ b/ui/Create3Widget.ui @@ -68,6 +68,12 @@ 7 + + 0 + + + 35 +