From 2d2131d7807ac96f9145e23c0f0e64bce72471a5 Mon Sep 17 00:00:00 2001
From: "g.wygonik" <gwygonik@gmail.com>
Date: Sat, 28 Jan 2023 11:58:22 -0800
Subject: [PATCH] P5 v4 fix and UI tweak

Added fix for ControlP5 controls not working correctly in P5 v4

Updated toggle buttons to be non-ambiguous for state
---
 SquiggleDraw/SquiggleDraw.pde |  20 +++++++++++++++-----
 SquiggleDraw/data/tglOff.png  | Bin 0 -> 1425 bytes
 SquiggleDraw/data/tglOn.png   | Bin 0 -> 1430 bytes
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 SquiggleDraw/data/tglOff.png
 create mode 100644 SquiggleDraw/data/tglOn.png

diff --git a/SquiggleDraw/SquiggleDraw.pde b/SquiggleDraw/SquiggleDraw.pde
index 232f08f..b96a44a 100644
--- a/SquiggleDraw/SquiggleDraw.pde
+++ b/SquiggleDraw/SquiggleDraw.pde
@@ -33,6 +33,11 @@ PShape liner;
 PImage p1;
 PImage p2;
 
+// toggle button images to make UI less ambiguous
+// note that the actual images are reversed due to a bug in controlP5
+PImage toggleImage_ON;
+PImage toggleImage_OFF;
+
 int ystep = 160;
 int ymult = 6;
 int xstep = 3;
@@ -66,7 +71,11 @@ boolean connectEnds = false;
 String imageName = "Rachel-Carson.jpg";
 
 void setup() {
-  size(100, 100);
+  size(300, 1000);
+  
+  toggleImage_ON = loadImage("tglOn.png");
+  toggleImage_OFF = loadImage("tglOff.png");
+  
   //surface.setResizable(true);
   loadMainImage(imageName);
   createSecondaryImage();
@@ -75,11 +84,12 @@ void setup() {
   gui.addSlider("sldLines").setSize(130, 30).setCaptionLabel("Number of Lines").setPosition(10, 20).setRange(10, 200).setValue(120).setColorCaptionLabel(color(0));
   gui.getController("sldLines").getCaptionLabel().align(ControlP5.LEFT, ControlP5.TOP_OUTSIDE);
 
-  gui.addToggle("tglInvert").setCaptionLabel("Invert Colors").setPosition(10, 80).setValue(false).setMode(ControlP5.SWITCH).setColorCaptionLabel(color(0));
-  gui.getController("tglInvert").getCaptionLabel().align(ControlP5.LEFT, ControlP5.TOP_OUTSIDE);
+  gui.addTextlabel("lblInvert").setText("INVERT COLORS").setPosition(7,68).setColor(color(0)).setFont(gui.BitFontStandard58);
+  gui.addToggle("tglInvert").setPosition(10, 80).setValue(false).setImages(toggleImage_ON, toggleImage_OFF);
+
+  gui.addTextlabel("lblConnect").setText("CONNECT ENDS").setPosition(77,68).setColor(color(0)).setFont(gui.BitFontStandard58);
+  gui.addToggle("tglConnect").setPosition(80, 80).setValue(false).setImages(toggleImage_ON, toggleImage_OFF);
 
-  gui.addToggle("tglConnect").setCaptionLabel("Connect Ends").setPosition(80, 80).setValue(false).setMode(ControlP5.SWITCH).setColorCaptionLabel(color(0));
-  gui.getController("tglConnect").getCaptionLabel().align(ControlP5.LEFT, ControlP5.TOP_OUTSIDE);
 
   gui.addSlider("sldAmplitude").setSize(130, 30).setCaptionLabel("Squiggle Strength").setPosition(10, 140).setRange(0, 20).setValue(13).setColorCaptionLabel(color(0));
   gui.getController("sldAmplitude").getCaptionLabel().align(ControlP5.LEFT, ControlP5.TOP_OUTSIDE);
diff --git a/SquiggleDraw/data/tglOff.png b/SquiggleDraw/data/tglOff.png
new file mode 100644
index 0000000000000000000000000000000000000000..169e3b1ed4e9f8c4ef8d2ffa4bf3fc2422ff4ebd
GIT binary patch
literal 1425
zcmbVM&u`R56m}7<ASkCIgn+}y=^;q9J@&4%yQ7$p?xx+9a2kbG2}nrHj%RmG)*fR|
z*iF<Ew@5`?dO)bRssb(u7117gC<l6IPd#($u^=Rbls|ws`@@0~N*hbI$DVJ#_rCXQ
zdu92H>8WE=nx;)R>a|sP&%%B9z&>~;pZxtCUI&x<`ApLeeXQ;ev|HaD)wKOPVRKEc
z`DX|dkx2v5;^rVq0Ig~B3xkBRbuLkhcf#1yU;Of`j>5px&$&MKlPd3q^{tej-CAz4
zt#wuj^o3Jsen5aA;*z34)QdAR@bn=sfwlT=>1YU%>z=--45BrE1yx1LQN_dt!x*Dd
z#SCbXmblB?pCSi4j%C}H;}~{<xR~G)8ecjXOoKLAt$jW=2Vb7vl`<ig)$jMse!&!J
z$FeJxiiI7;0SF`8j3pfyaW*qysPT-YVIo5jBgIHtVncd5I6G1iB{^-JjUxpyvj#M=
zY!fS0LtwyiT(Xh&hQ<SC@g9$OEHl8`IX3AEDYCA32X(&vh5?AK@8>pl^(BgO6PaAP
z3Npq4*%h5NHxq8H@=R=`j4xdUH)oWZgj7>brAV7X^d`AlnYfIcqG_X9pRzDkB2K<`
zgx9F#o(_2{7}z$Paub({>kzkWzyjkD)E7b6-h2yc+bYGy;u}z?n}ACCUU0xjTci;M
z$zeo0+)Cn(j`Bc~s_2On41;%tp%=bS8gV9R%y^^b>7d#S!+^M@ImX-qH_Et0jbh0S
z3`*N&V~(|G+iA~nTy`htYl3a4+)mC1|MUEpX$b8_dwb?lO{a>2)WZzYwK?vIv;4|<
z)eF(E4hUtczCE3(#PUEN{|@&Yfe~%L%YpP?(mjG@qAmM0<%=DN)_*7{3*5I<FOHO0
z{}eggd#!ILa2N(^nGYiP$VVBEVSc4BsE(hw@eGDswNYDa*0)*k=k?an1CNU6CkNyE
zr=LFgVduev%CX;DQ{SNJM_-pOEqa$<-udnOBR4M0Uw--5&o_U3vVHB3Z?8Olcv`!A
X=c9`se)aIS8k&uz<=VZ^E?s*C)TG1|

literal 0
HcmV?d00001

diff --git a/SquiggleDraw/data/tglOn.png b/SquiggleDraw/data/tglOn.png
new file mode 100644
index 0000000000000000000000000000000000000000..60e5469ac6fe8ca678cc681c85c7a3985bd51d30
GIT binary patch
literal 1430
zcmbVM&u`OK95;wbl&U+738kE#42Mpd?Pn)x;-|XMB`pcUT~#8jAP&6vy(FfwpRr$>
zw5JJi;V|tsB(&QuJxmi^xFBGc?lx(f_CIWgNz<eXaf7e(!)k&3pphJZZGYb9`~7@>
z-CJ9|G;`|gDMe9c>b2@R+~?r>_~dc;kIw(`C)}o@+O<ScrcbBWG3CLxIYl|K?>9E&
zhI@s0BG4%lO|B1u2+)eMaA6QpZ<9;Z<ZVB6)W4oQSCP*g^^2m5-KfGler+e_S9ew$
z-p;0HGxfqES{M)@2)LwZ5Ol+Y3><aHOTbQF8!8$?<ffx8r4G@CyM`(v=E&Bu=3$Ic
z$<`Sy&=N25)~CqAmSvcxVOg4)Cq+zf35|a$IE-0~tXEgY?%>H$J5ol(F#7$z-p}hI
zZX2d;+Xl8$4nSzhb|~pU3zKsbhAL0I*pH+yLX<MnrszpWg<wZ2f+(X6lX0dXXU2d=
zhN<IJ)ey+M3>Wp{?$9~&4Bq7d4`l*aGs8w5Aw|*=|3IC6KI8zh>$;hbcg7L~nTtd&
zZ-I<)Lf(l^8ru;!)_Ed&vB#IUAk1^Anut_lPNj$&LUbp!TAPH7tb%T$IhT5Vn2Px1
zz!6@hk~=EYEw5oyv&s!zCdE9#wgv{qBd9Bw-`ai)YMP{Il6?6P6#9lyN&gefJkk<z
zKtZw}&^9-su&tsjk)$HJA_m70U49sa>ymnyNE&*)UUgJZt@}PBMcXXV(tJU)i<D~x
zUSL|e(8OB7WM!V`cA1suC+Dle>!r1woM-QO{`1&}@uJ-$^Q1$UHU+8q36yJlJQG*>
z?XlJM(XbB)_0s-!R4*+oXX^O1f8-2|X!{)wr2kUx5iAic*{3mIYD2dEM?)D9zLC!2
zNQv>L$l<pGb31{<GDyvA5y3;Y%6JI-D~3f?sZD(VORiS0E;VZRJod|1&D_Z!3+S<h
z@xzO|ukL^I>(7^0o_6l;MT_+>Kl=T{jkT|@FWmZjckjD1V7$~;ep}uDes(sO%U!xL
aeL@*Ln|k!(r|ELKIqS=-)gL~)dFM6!>%KPt

literal 0
HcmV?d00001