From 4bcdd1327d9afe41eedc54437678d133d617020d Mon Sep 17 00:00:00 2001 From: Victor Giers Date: Tue, 7 May 2019 07:24:32 +0200 Subject: [PATCH] improved menu --- .../application.linux-arm64/lib/ontology.jar | Bin 9462 -> 9616 bytes build/application.linux-arm64/source/gui.pde | 39 +++++++------- .../source/ontology.java | 51 +++++++++--------- .../source/ontology.pde | 12 ++--- .../lib/ontology.jar | Bin 9462 -> 9616 bytes .../application.linux-armv6hf/source/gui.pde | 39 +++++++------- .../source/ontology.java | 51 +++++++++--------- .../source/ontology.pde | 12 ++--- build/application.linux32/lib/ontology.jar | Bin 9462 -> 9616 bytes build/application.linux32/source/gui.pde | 39 +++++++------- .../application.linux32/source/ontology.java | 51 +++++++++--------- build/application.linux32/source/ontology.pde | 12 ++--- build/application.linux64/lib/ontology.jar | Bin 9462 -> 9616 bytes build/application.linux64/source/gui.pde | 39 +++++++------- .../application.linux64/source/ontology.java | 51 +++++++++--------- build/application.linux64/source/ontology.pde | 12 ++--- build/application.windows32/lib/ontology.jar | Bin 9462 -> 9616 bytes build/application.windows32/ontology.exe | Bin 88576 -> 88576 bytes build/application.windows32/source/gui.pde | 39 +++++++------- .../source/ontology.java | 51 +++++++++--------- .../application.windows32/source/ontology.pde | 12 ++--- build/application.windows64/lib/ontology.jar | Bin 9462 -> 9616 bytes build/application.windows64/ontology.exe | Bin 88576 -> 88576 bytes build/application.windows64/source/gui.pde | 39 +++++++------- .../source/ontology.java | 51 +++++++++--------- .../application.windows64/source/ontology.pde | 12 ++--- 26 files changed, 312 insertions(+), 300 deletions(-) diff --git a/build/application.linux-arm64/lib/ontology.jar b/build/application.linux-arm64/lib/ontology.jar index f218851d9263345cd084700b57d6fbfd4c970295..75ca767ccf628198c982b24764ed98e87163c8a2 100644 GIT binary patch delta 9243 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 delta 9096 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 z zXt~!O#%f*!wbwNVd9UoPG?(sWB!IAF7>b-FP^7rn{28L7Y#X2@TUx=9p)1zYYesl6 zU<-ftB?p+){|+`PT7&^3_pY3b;4Qu&T0)@JeldZT%qsQ(Z5Y6TdG6c47rrY-z1f|v(&@?n_I#3&h3EbZ4 zO!x9#pE3u7py5sN>JKR$%=<3=Rzg*{l=%X+2bExTf+@Wi%ij!=+d&e!m}(A)az zVcQm^CjBbWsG3mZ*5goEsrdMOobV<)xAf+4sMorjarekXhschKel)LOWiQ0^tGBYJ zB?IN3O8v#c)3c&=iC^iv8zH!}PG?DutV*vx{FI#y3Jl$cfH}&qFxg~}Vn53*cgttZ zHj-ZCrHo=8p|Hrz_rA$v!SAg2i$Z!=SI1lgmks-~R%xVv>-3{Otr48z;=eXBw?Yg?8A^e%)-{Rp2#(vkLi@Q|F|53 z7e5h7W8D>nUG^ichu*o7U6xHB7qhG?>N^KYCzSb*sbXR^<=1Y)I$2?>yUiUCgGD(B z@*Ay`Zy4;Hnz3!6wdHSF$lng*qm9GSN_m;lT!Y|CD-RI4jjtGAP%3!JHq%6ss)1iE zCslGE=6ZeO>pf#no7G$ek)@PPVN2^$7rcU-I$B8X84~7ZKo-fqM^BbGt%Szjq1Z4!3vxp2w|#P{ z(bMa)BQ%ew=^13V=Vae02kyhtEOU+?$>TJRDVw+t_RO4%~Xfl>!)e+jQNRaDG!4kE zY2m5E&kw??J1-ov=!J7C`z?O4w#m&>kqFmm76CMwtA^mAkEZ1=ejuLsEab$WwEFlH zs2IE|S9=r5LZwXiW6`!^;jB%;5q-WByHNeNbh$N3ZsGJ_(u;xzx#GrV+C?41aSl2iOQA!C(WH4N6l~WZ|}bjD=O4~tqBea%F)5i(azD*o7K$j xhpX%VyI{G}e x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.linux-arm64/source/ontology.java b/build/application.linux-arm64/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.linux-arm64/source/ontology.java +++ b/build/application.linux-arm64/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.linux-arm64/source/ontology.pde b/build/application.linux-arm64/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.linux-arm64/source/ontology.pde +++ b/build/application.linux-arm64/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.linux-armv6hf/lib/ontology.jar b/build/application.linux-armv6hf/lib/ontology.jar index f218851d9263345cd084700b57d6fbfd4c970295..75ca767ccf628198c982b24764ed98e87163c8a2 100644 GIT binary patch delta 9243 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 delta 9096 zcmZ8{Wl$VS)FqZcaCdii*FezV?h;^dcORVK?(R0h-QAtw78u+Ig4@3LRqgKEz17uS z-Bm3=`kZt7-cFFemqS*OhlRt2LO?)(A|y&gj)M88&Y%O@yAo<*2e2~R1y zu82L_G^8fcut@X0a-9)55;zigC@&X#MKB?$iTn9=-Q91+gD4^zFll`<2gm6<(o=6i zq-1vC<30-nJ;98(>}JOG9xN+Dt5Wvyb%hhaI2Rx4zu2`?6|7;){IP4lXy<8MtfyC) zzME<$!a+Rn@xFP;*0O|PN->}{a_Q9(PxjKXr;_xSF1Uo5I;iBq!C6pKFUUzctC?b! z!xgO^M8z$_lz&heV>a?n&K$v+u9-Tw4+PD~QzruVwp=kehP+$J3*kHQsA&_(X@6t6 zR{Qqa_y|cal_6SAI84_ugvq((Q!pES4G;5wL(T(V!Zsz*&b()PWCD+Akk+ZnYI}SZBrwKD1Z+GyMb2?27Z#+ zC+Ls<3sgFI4B>oLvVX&JeT;4s9+u}Hpwz|H$fFTtV?dQ}ljWndNiQ`_xnToqjO_{S zky~}=o~h1|midm&yX<~POZV}z4+TzP-QZGm`iI56;Ewnq?d#)Xkm* z{KHZHXZBrW;QiwhNlRsxM-{koq!xFib42@_k^&%b7XEvT>a@>aiam`7C}SYwVbHG8 zQ~>%VX-Rm7@*k+B0-DbF-&4+K+TN&An3j@=ND_NRvf#3eP@1yq#<4%z94sXn7-xH- zZH!8BB^XaCgwZ|BO(Y~tGN2TtWdxET$499jiDvjD_bKNrt4%X?iFsiEb>p%n==aYm z^6&_Iv--MEA3(n3%<+9*#RbpgCWaDwK}Di0 zQTitAXG9ckMG6}GD7CUoYt9RE+8G52q-Ya{$FCR%g|S~lu!{;PWy^x}{LZ7Iju|Ve zU%pC-W8*lj873mWe9Uy;S`ltu)V3exT;<&6UcF_M?*#10LCGIbkTC~|VJOp?MqUD8 zMZMq_pOYeMWEpW{J^4Ink`hOL*}goRCN>rD=OM_b1>a2aSvvl@CvX<` zRUr4$dvEssiERav#-6H=gX1c#qAb9Sg2fi|CLzKd(BF-x<~=r5k4=5RykVs*^FnG| zXe<7@pMRlK2IU`?n;sU7XzFheR)-YH`v;mN>qgBiL=?#uhxR(QluL@#?1%8r60!B@ zpH}jeZs01Bj}xz3tOUzEYn7;d_#{nF68bs?3FFIF5TZ`;+z^D%p6sBc_!ogAcE6w5 z)BomE9$+FIZqSFXM0^U%o&Y(pHtmKOTSnWZkQX#c6P4Dvw+xNI!TD(j(#BzwIk2^I zU>pbvZH$;7-3aiO@i%JnmI*Z8+9`Ni9BpI-1(Mk^xB^_9jk|=tKKc+5)y>ljlC0ZM zbJf1P%`@|pl<2TEsfO9)Hm?FR!k{W?fQc+`-JMk9_Jv!FBNNk+H7X#gl$g`?Pd*DG zs#)L3Eg5W5D`h)+l@slooxiY_>Z!kti%=|qr>4u-ygM6PtFSlbb_W5$Cs!ULBOd1k z_SZr3RF%g|tSEOvcy1NQ9#t@`+Fu)Cy=r5bROF*oONG>wpPT_&Zic{0Xp!a(X}sSz zW|1mh{zB8H6JAMY*Jkkr7V7By{udN{<`% zFHl#Q0B^MQGA*RX(H@IqtuGeV`2Q;G0db!&YBR)z#)@{uyKGIrU6zQJ+BGvD(~FC! z@h;R^PZidD2`-$e-np-JkTn}hv!t*Y2?1q%?L;E7UgWZb=aW6!W7 z*c9MPK0YB3&BY6NhQwCJb#Gaj(b~gg(inWs%U?XQwMKjAa2+uqZJ=XLGjKLgYO# z_6IBnvETMc$SL~vwj_|T;hVT|9b{OzLjA;lbtD~v&~B#in_p{Z3Rv|^&~JFe?0bFg zu`*r)vnt{g#yfCbN5MH}-OB(+>*VVO5@j*jD8p^@uG0lB)h%t#T;N@aiIV^Jou1wZ z-$t#v0TJ?y9{d_#CMPdD1$T{nm4U53%HMq10HIXysCtfd%mY}c#JBiMcQZ?Op~I!f z^lDvwE1Q3Thc9J2+mcM{Uoe4@6~OdQUb1M`3)s*G%mAG2Pz*%8h~NzfS8+jmvGz|Bgo_HaI)(VoaYI)nrwpQtki&`A_%XU-7;VRuqit zgp>86kA4LLz@J{T2u&!RT_&2IAqPd}#!ZkUh$heXjvg{Lq^gz&$)v<}w<4{=WC9o0F zqL*L3a?DXTx@0o>c_3%XNI@NL_`8<3nyI#NK!%+Au z>M%v!PV=^wuR$#9dpY-I4*7dia@`xq6FDRpQ9FEIvN#E3lZ=?TpZq3FwdCYEE|VX_m@*HVLpEz|*) z*w1D>7u!D=MfrCJg5CpM`uu$#1KW(ErG603VV)R!u@s6{I%Gd?)i zB|>S5V$Oj#?AjFs4X!42m%Ic?W$;evf?lO~ey}dnCKtkPuHp&Q@r;9T3;#;8wgL}C zZj2VB*vX7*>kL~ADwR&CrcydJmL2pvB%>i3AD1c79#uXMUZ1t-eCnfQh?uoq3x5|wQHRbvXpkd;MzItlqgHn_kIaql_yY>U@(NA%IfFG z#QMFAr$v(p{dq$ATc31pmdd?q`!F4u*~F6&y!}(#=66kwhF=%%&$JT-x{<)w5|-9V zWEke3xu)S3ns(@QYHyvj>Jsa?)(pgQw$RyXJftmvxuM9E6Jn9>LMsCnGlRyzg9}13 zb_AHq+S@gfT}(p}+OeK~!pK*cGnb7ATrTNytTx29$*0Ug3Dyx?QocoEYdG^2hI2_Q zT6RsKG%w*K1G2?Q;WKxI$SI(e-~e%12c^eu^3!M;>T~>CHo;nVW@2|X0bSb}r>A+f z#R#Hj??RZe%S!Ur9kyrAY24zbbBEB3(`e?UNQ;pL$az%P0?5b!P@cFVuIW*%(%mD+ z6b|PK#*t#n|GI^6_=&0PF8AvjLU8|00|qyo2$c>o^F#a}kjXVijyn)WkxB=bnXo^q zfG0ThSwP#9u&aJA4+Dgn1}|Mlix27|4{@imLiLfUJHZe&-=z##Nw5ZNek+?CyLRIg zh(^wfgl6ue(i!1ACl-$9;Y2wD2(Fud7HXq7Z{Q`L^2NJtxj>JbwmP6+O)@*BO|J~2 zu9&{%UuVHzcbF*P$^iEJ$}Y1erHWhO(`+zN6(0wL;*~*MNbYYMlDxv_^Cp_IvNDFZ z1TSX~JV|?RF{lf@IdMD8hhnyW)uH)Dx6fynjuV#X>QLWWl$t|+JVu4@{^}DV7>d?H zD~_8p(Ofi>B^|-G%o7KCG<+n;;^3`pzRdJmD9B*Qd^?_j=1Y&49SUpxIyVfGvgdmo52kqT1mW$QO zUU!k8p$OHQ+e2gr%@Bd1C;JHJVx|bp2@`x$Om`V4iO>18Zecv3v|D+jy{Y>*T=BbO zm6I<5Z<~s*!oVTC9`2aNyDUqD*sv8+k-PO`v)W1l!4A?ArJ&D*dzh!~krr(!)c~ED zyH7e{u{yExPNW_SPMvLW#RP9{=qn~zH8MyJ)M@%wC^A-`(B@D{%Q)hSP&;1zW%<=Y4W+oQ#*4Zx9n&2~MI;08q4}BzJlc=jWKroS7X+%Pe~H ze0|k?f!DMn$-O;ueQS+==RBnAn~+&IbKPTN^0iznU_}QwJOOCDus?)CLdg+Zz_^B7F|d=N9VJo$|L9fSzacZNs1mL$+KC2=@XJzlLg)8U z5H61*!pu0aUi#-_a-T1ncS(CHYlv9Eywm@or7V~q`cC)NaI|;h$ukt_bA$1Dh%8|M z$m)o=$dN}ftQ?X`DER&h#?yi#b=LA)-n}*?k3H5DpTq`l(25Dcic}G6Fy?&?>LuF* zc;LtcOz&qJ%pe2#HQ(GJzq{fu^-p}%yhaCUp^qEuV!HAR#1wUH8Q7?u{NhK-m!xwj z{^!YSy*YmU%AmLKW5OnZvjd5&e@oaI?XnNu^5MppOf;g{>*tM6hMEs{e!08Y&rt{s zRd;1vsKLp}d2Wv8w8V+-WH(+Xt7+FD@CjEL6|T!D&qv78CifJO)fA#MG}Qo<&kGCm zKDC^>6k}5{kPEXDz!l?j*UpevHab*AIMB3N)#igh zqb_WF+!!IuISl3pE8F02*xsoqCg1XWp_R9FSzY@*II6ls0ICwDeZM!MTghVrDm#N| z)zx3aiMwUVd?R(QTc?897Q2my5W5C49vRIxY-6lz7yCaHECU9wyQT_7=`Nw|uVaZn zHNb_0_eDFO=9kRPTc|NPus@+rs694+0Y)R=8B)&8+8yxD* zKjUHc-Vd%&Ps1g_+PHR8@fOSgdUkMPX;yP&s^!r%B6o|!OT}%kt?v=|SlS+0a0}|| z%dv1Y@i~(jA7+KDXh=NqO`&8C>bOe>p?JB@ym+Awa`0Un9hU9$qSRZq1A?%b{vyx< zR?=!B*nf1Pzrt!m9r3D;t{fsT(%YJ|(g>kpW!T}$iOd}OW^>L1_9)XM8~zN$q}XoBV4}w2Jo)>*(PL~HU#saV?E^Sd zHS-1gu3WuVI=tkOjYd-IG2e+*1A3qg_WI>zrP_X z*K=9L-cNp$Qd_((q4T>Eil<*6e!AVp86Iqk%p%BRIFyjaC1p%w80HdI-hP>3dh!*U zI{To+6-Zzkq>67~c}Jw3Kq!;{?0SGt2*8#<_yS4*w|(u2LcIh=?AxwV8O!ARg|NOT zZuUWN2T&(lWBgco05>K|q9F|kr|Hm}jM1fu3ys!NR3rUteHsGM>}Y`2fv|c^rymR& z@d*m*oZnsHp2Lr)Gyj?-XpO6GCUb`0a zr}@WK20Yer(t@;{iK_NO;jhgOUsw%N67RbvwCc=4{UTV-J+0G}xs3eLE^d%*N3Xa% z-UF+=K0i!0dIi7iB$0s$p1$Oz<`dq5IKrO{ltgCRPZ@v%XaFHg+~EgzZ5$G0D0zif z|8OZVDr4zbg(+rN%n&n`u7X4AEf47;YzY@p$MNL)*;jmTfTh4~QodBdxf@Jo3Z{=# zI}jm#e=kW@@=nBy1)gD(keQtP0PAQBnO5pv%_p)NER8<)jHmaiSC;WM&{ zWMO{AehL^(|TwaE2qAD%nH0dDO@cYqGFc^su0o-iq@U zs-0&^Vc7TnoNUa#`4;5>foYtmt(Oc4VcM5EPu*EqGa6aC5!$5g9nHN#6lDVT!QRLa zr;F{{-Y^;^t(2%4rR&~Ei#Cp(2cMe4_yHVuqkxe}OkIwsEhKbO~LlU93f z+P^&-&7T(Ch8L!_fwG3mP`Sc8Z>xo?(R9^*$%m&JYoY8pi1=3Dl)Y$^l{r;ykwGC8 zQcIVNX8KC+XEFbMD|;by&T3%(LjiM1HZrVhPB!G68# zVWGE7%sDC!DQXFb+9~#vENdX^EjkTl#T73j`weGBs#YV?fo%L1tA^EwAXL>g1%6)3 zni33oNoa(_3MOGZl7W?4!}_ZRT#GNXO#@FVHH=xnTX9-KERq>0I=#oXn%vZF!&0-@Tw=H0*4wwzJ`^n# zAeNt0?O28+tDze~QdSLw^%Hu*ytWJ;PPLPIVWhS^KEG}gnwGKmXEbWkk#e{DS%9?` zThwG0Gn&EGiRf@j{oYY{uiM!JD# zeNFZcu9U;j6D1SvBTu^gvC+-+5tlUuRyN7X<}ZuCaHr~72Pn@>N9tLuTGpNFn{hTk z^4CT)zMy-UTp3piUdGl*67%v5Mc`}hxg@h)kzg+RnTGOy*F=_kQdGXep;)T=y~~4V z^@53%s(n~96;=KW9_@NS-@2BHR9c5}+VNEuYZNr5nT^Kmm&z07ENahIM^w?UhOmCs zc1sOWA>h2Yi`sZie+mN!*Tl!Qh&U2H|va@zcED5JvW0_EGVcN>i>x${@)OyJ^?*Y zea(eP6J11`@Rxy^E_tvS9llvG?oSwsKSOdq@!((p(C`AN(L97G_e049OIFzDbY3?R zDurI-NSbM~s^}h72pjOKIQ*X6aR%s>9WSi@oyrdvlLQrvovgDNPr-D7Uoo5?d zNQOI}xp3S;Q#^0sMlJ4^-G24n)7*Z*pr1>a=$aF_fb1I#z&CP>GsQ*RvE}giH2+zb zF2_MaQMC4H>BoVr!qyh1eFwV`Ub~>i2^=fuc=kv82Pbx?hJzeyLe(J=%>thruB8sW^W zt;n}gLDgQGG_$$O8+v*C3K@IWU5EXy9lzQSXgwpa7*^AWJ5O}d@W!%Oa#nDhUlt-s z1`We=1v0bij3IQo>oMAt^1zE< zh}jw1>>&XZK^SgAioXH5)%l#AcH%e{BSP;5nvPjUqD;dDNr$>)%PSAa;p6@gtosED z-0(4)8x;haA{=5<1{G_}Gn9(vy#&9=qO&U^`Axg@tl?>di}yeIQN*}LqnkF#539uo z^$bBwt?}r5=u@?eX{)#CHawr4g!A&q04%-HExWpD?nI=*$N~@FSeSR$NPZ! z7s-WlVnW6LWCM0T{eMXIBB29bxMBg&KkSo}xV`n{p>g^db($4Z88zX4Q({vkrWLUS z1!ou}%e!*#?``4e@AS3)=?pB|dqFDZLKOrfe~Fv9UV|7zs*Q;)hPFCwlY3Sn*}3iK zqA%wc?*W}J!Yex;?+2WLMmcDOL34JvB#kC<%AV&OjXntC5@#3}8OuQRxhSy6H#3>P zG2g7*kjo3O)<4_$4#oknN3ZC(@pWNn5GG?x#XapL#&X<*W6K^h59wxS7ejG$<%!6+ z>FoVi=b0^Qt+54OPlJ*G7H%7dfg%Kp3%>WX0=3r8ZU@7sE75Td7)1_onVR&~x8KuW z;lGG~nPJcA`r)}L^%EI5l>p|C^}fyM!aP35TnVt)fE&;YvvoGaT6cCu;KLZ;s-*{g z%LpOCse>Q7!wsV!DB7x;qtp{}&^`vW$4*!%hocwym|A(UikwS z9O2*fcqiR)HnhTChRYs@F&Yc>^*9D0lnz~?*lC%)$FF0Ak_h?L#=%~9G1MVLS+X#EIvVk(~V!4nuJkzhcgiTQ`GC$hOFEp*N zev!m8AtObUQQ`s1cXF5o8+w%~_Di>F=Y9e(mZfn}5u1Mg5;79ipHikL#&!L@;F{)e zRB9qTq|Wf3sWkpL1}e|O-^g$i9vs9$b9muR$5L17$c|)B=n4*^LYA!R*%=cQ-m4bG zt5g>bhKZseHUyz>$kVWP21jD@)s^VBMCuRYe0X(C*8u~wQv?ivAJSqzm z zXt~!O#%f*!wbwNVd9UoPG?(sWB!IAF7>b-FP^7rn{28L7Y#X2@TUx=9p)1zYYesl6 zU<-ftB?p+){|+`PT7&^3_pY3b;4Qu&T0)@JeldZT%qsQ(Z5Y6TdG6c47rrY-z1f|v(&@?n_I#3&h3EbZ4 zO!x9#pE3u7py5sN>JKR$%=<3=Rzg*{l=%X+2bExTf+@Wi%ij!=+d&e!m}(A)az zVcQm^CjBbWsG3mZ*5goEsrdMOobV<)xAf+4sMorjarekXhschKel)LOWiQ0^tGBYJ zB?IN3O8v#c)3c&=iC^iv8zH!}PG?DutV*vx{FI#y3Jl$cfH}&qFxg~}Vn53*cgttZ zHj-ZCrHo=8p|Hrz_rA$v!SAg2i$Z!=SI1lgmks-~R%xVv>-3{Otr48z;=eXBw?Yg?8A^e%)-{Rp2#(vkLi@Q|F|53 z7e5h7W8D>nUG^ichu*o7U6xHB7qhG?>N^KYCzSb*sbXR^<=1Y)I$2?>yUiUCgGD(B z@*Ay`Zy4;Hnz3!6wdHSF$lng*qm9GSN_m;lT!Y|CD-RI4jjtGAP%3!JHq%6ss)1iE zCslGE=6ZeO>pf#no7G$ek)@PPVN2^$7rcU-I$B8X84~7ZKo-fqM^BbGt%Szjq1Z4!3vxp2w|#P{ z(bMa)BQ%ew=^13V=Vae02kyhtEOU+?$>TJRDVw+t_RO4%~Xfl>!)e+jQNRaDG!4kE zY2m5E&kw??J1-ov=!J7C`z?O4w#m&>kqFmm76CMwtA^mAkEZ1=ejuLsEab$WwEFlH zs2IE|S9=r5LZwXiW6`!^;jB%;5q-WByHNeNbh$N3ZsGJ_(u;xzx#GrV+C?41aSl2iOQA!C(WH4N6l~WZ|}bjD=O4~tqBea%F)5i(azD*o7K$j xhpX%VyI{G}e x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.linux-armv6hf/source/ontology.java b/build/application.linux-armv6hf/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.linux-armv6hf/source/ontology.java +++ b/build/application.linux-armv6hf/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.linux-armv6hf/source/ontology.pde b/build/application.linux-armv6hf/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.linux-armv6hf/source/ontology.pde +++ b/build/application.linux-armv6hf/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.linux32/lib/ontology.jar b/build/application.linux32/lib/ontology.jar index f218851d9263345cd084700b57d6fbfd4c970295..75ca767ccf628198c982b24764ed98e87163c8a2 100644 GIT binary patch delta 9243 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 delta 9096 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 z zXt~!O#%f*!wbwNVd9UoPG?(sWB!IAF7>b-FP^7rn{28L7Y#X2@TUx=9p)1zYYesl6 zU<-ftB?p+){|+`PT7&^3_pY3b;4Qu&T0)@JeldZT%qsQ(Z5Y6TdG6c47rrY-z1f|v(&@?n_I#3&h3EbZ4 zO!x9#pE3u7py5sN>JKR$%=<3=Rzg*{l=%X+2bExTf+@Wi%ij!=+d&e!m}(A)az zVcQm^CjBbWsG3mZ*5goEsrdMOobV<)xAf+4sMorjarekXhschKel)LOWiQ0^tGBYJ zB?IN3O8v#c)3c&=iC^iv8zH!}PG?DutV*vx{FI#y3Jl$cfH}&qFxg~}Vn53*cgttZ zHj-ZCrHo=8p|Hrz_rA$v!SAg2i$Z!=SI1lgmks-~R%xVv>-3{Otr48z;=eXBw?Yg?8A^e%)-{Rp2#(vkLi@Q|F|53 z7e5h7W8D>nUG^ichu*o7U6xHB7qhG?>N^KYCzSb*sbXR^<=1Y)I$2?>yUiUCgGD(B z@*Ay`Zy4;Hnz3!6wdHSF$lng*qm9GSN_m;lT!Y|CD-RI4jjtGAP%3!JHq%6ss)1iE zCslGE=6ZeO>pf#no7G$ek)@PPVN2^$7rcU-I$B8X84~7ZKo-fqM^BbGt%Szjq1Z4!3vxp2w|#P{ z(bMa)BQ%ew=^13V=Vae02kyhtEOU+?$>TJRDVw+t_RO4%~Xfl>!)e+jQNRaDG!4kE zY2m5E&kw??J1-ov=!J7C`z?O4w#m&>kqFmm76CMwtA^mAkEZ1=ejuLsEab$WwEFlH zs2IE|S9=r5LZwXiW6`!^;jB%;5q-WByHNeNbh$N3ZsGJ_(u;xzx#GrV+C?41aSl2iOQA!C(WH4N6l~WZ|}bjD=O4~tqBea%F)5i(azD*o7K$j xhpX%VyI{G}e x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.linux32/source/ontology.java b/build/application.linux32/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.linux32/source/ontology.java +++ b/build/application.linux32/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.linux32/source/ontology.pde b/build/application.linux32/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.linux32/source/ontology.pde +++ b/build/application.linux32/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.linux64/lib/ontology.jar b/build/application.linux64/lib/ontology.jar index f218851d9263345cd084700b57d6fbfd4c970295..75ca767ccf628198c982b24764ed98e87163c8a2 100644 GIT binary patch delta 9243 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 delta 9096 zcmZ8{Wl$VS)FqZcaCdii*FezV?h;^dcORVK?(R0h-QAtw78u+Ig4@3LRqgKEz17uS z-Bm3=`kZt7-cFFemqS*OhlRt2LO?)(A|y&gj)M88&Y%O@yAo<*2e2~R1y zu82L_G^8fcut@X0a-9)55;zigC@&X#MKB?$iTn9=-Q91+gD4^zFll`<2gm6<(o=6i zq-1vC<30-nJ;98(>}JOG9xN+Dt5Wvyb%hhaI2Rx4zu2`?6|7;){IP4lXy<8MtfyC) zzME<$!a+Rn@xFP;*0O|PN->}{a_Q9(PxjKXr;_xSF1Uo5I;iBq!C6pKFUUzctC?b! z!xgO^M8z$_lz&heV>a?n&K$v+u9-Tw4+PD~QzruVwp=kehP+$J3*kHQsA&_(X@6t6 zR{Qqa_y|cal_6SAI84_ugvq((Q!pES4G;5wL(T(V!Zsz*&b()PWCD+Akk+ZnYI}SZBrwKD1Z+GyMb2?27Z#+ zC+Ls<3sgFI4B>oLvVX&JeT;4s9+u}Hpwz|H$fFTtV?dQ}ljWndNiQ`_xnToqjO_{S zky~}=o~h1|midm&yX<~POZV}z4+TzP-QZGm`iI56;Ewnq?d#)Xkm* z{KHZHXZBrW;QiwhNlRsxM-{koq!xFib42@_k^&%b7XEvT>a@>aiam`7C}SYwVbHG8 zQ~>%VX-Rm7@*k+B0-DbF-&4+K+TN&An3j@=ND_NRvf#3eP@1yq#<4%z94sXn7-xH- zZH!8BB^XaCgwZ|BO(Y~tGN2TtWdxET$499jiDvjD_bKNrt4%X?iFsiEb>p%n==aYm z^6&_Iv--MEA3(n3%<+9*#RbpgCWaDwK}Di0 zQTitAXG9ckMG6}GD7CUoYt9RE+8G52q-Ya{$FCR%g|S~lu!{;PWy^x}{LZ7Iju|Ve zU%pC-W8*lj873mWe9Uy;S`ltu)V3exT;<&6UcF_M?*#10LCGIbkTC~|VJOp?MqUD8 zMZMq_pOYeMWEpW{J^4Ink`hOL*}goRCN>rD=OM_b1>a2aSvvl@CvX<` zRUr4$dvEssiERav#-6H=gX1c#qAb9Sg2fi|CLzKd(BF-x<~=r5k4=5RykVs*^FnG| zXe<7@pMRlK2IU`?n;sU7XzFheR)-YH`v;mN>qgBiL=?#uhxR(QluL@#?1%8r60!B@ zpH}jeZs01Bj}xz3tOUzEYn7;d_#{nF68bs?3FFIF5TZ`;+z^D%p6sBc_!ogAcE6w5 z)BomE9$+FIZqSFXM0^U%o&Y(pHtmKOTSnWZkQX#c6P4Dvw+xNI!TD(j(#BzwIk2^I zU>pbvZH$;7-3aiO@i%JnmI*Z8+9`Ni9BpI-1(Mk^xB^_9jk|=tKKc+5)y>ljlC0ZM zbJf1P%`@|pl<2TEsfO9)Hm?FR!k{W?fQc+`-JMk9_Jv!FBNNk+H7X#gl$g`?Pd*DG zs#)L3Eg5W5D`h)+l@slooxiY_>Z!kti%=|qr>4u-ygM6PtFSlbb_W5$Cs!ULBOd1k z_SZr3RF%g|tSEOvcy1NQ9#t@`+Fu)Cy=r5bROF*oONG>wpPT_&Zic{0Xp!a(X}sSz zW|1mh{zB8H6JAMY*Jkkr7V7By{udN{<`% zFHl#Q0B^MQGA*RX(H@IqtuGeV`2Q;G0db!&YBR)z#)@{uyKGIrU6zQJ+BGvD(~FC! z@h;R^PZidD2`-$e-np-JkTn}hv!t*Y2?1q%?L;E7UgWZb=aW6!W7 z*c9MPK0YB3&BY6NhQwCJb#Gaj(b~gg(inWs%U?XQwMKjAa2+uqZJ=XLGjKLgYO# z_6IBnvETMc$SL~vwj_|T;hVT|9b{OzLjA;lbtD~v&~B#in_p{Z3Rv|^&~JFe?0bFg zu`*r)vnt{g#yfCbN5MH}-OB(+>*VVO5@j*jD8p^@uG0lB)h%t#T;N@aiIV^Jou1wZ z-$t#v0TJ?y9{d_#CMPdD1$T{nm4U53%HMq10HIXysCtfd%mY}c#JBiMcQZ?Op~I!f z^lDvwE1Q3Thc9J2+mcM{Uoe4@6~OdQUb1M`3)s*G%mAG2Pz*%8h~NzfS8+jmvGz|Bgo_HaI)(VoaYI)nrwpQtki&`A_%XU-7;VRuqit zgp>86kA4LLz@J{T2u&!RT_&2IAqPd}#!ZkUh$heXjvg{Lq^gz&$)v<}w<4{=WC9o0F zqL*L3a?DXTx@0o>c_3%XNI@NL_`8<3nyI#NK!%+Au z>M%v!PV=^wuR$#9dpY-I4*7dia@`xq6FDRpQ9FEIvN#E3lZ=?TpZq3FwdCYEE|VX_m@*HVLpEz|*) z*w1D>7u!D=MfrCJg5CpM`uu$#1KW(ErG603VV)R!u@s6{I%Gd?)i zB|>S5V$Oj#?AjFs4X!42m%Ic?W$;evf?lO~ey}dnCKtkPuHp&Q@r;9T3;#;8wgL}C zZj2VB*vX7*>kL~ADwR&CrcydJmL2pvB%>i3AD1c79#uXMUZ1t-eCnfQh?uoq3x5|wQHRbvXpkd;MzItlqgHn_kIaql_yY>U@(NA%IfFG z#QMFAr$v(p{dq$ATc31pmdd?q`!F4u*~F6&y!}(#=66kwhF=%%&$JT-x{<)w5|-9V zWEke3xu)S3ns(@QYHyvj>Jsa?)(pgQw$RyXJftmvxuM9E6Jn9>LMsCnGlRyzg9}13 zb_AHq+S@gfT}(p}+OeK~!pK*cGnb7ATrTNytTx29$*0Ug3Dyx?QocoEYdG^2hI2_Q zT6RsKG%w*K1G2?Q;WKxI$SI(e-~e%12c^eu^3!M;>T~>CHo;nVW@2|X0bSb}r>A+f z#R#Hj??RZe%S!Ur9kyrAY24zbbBEB3(`e?UNQ;pL$az%P0?5b!P@cFVuIW*%(%mD+ z6b|PK#*t#n|GI^6_=&0PF8AvjLU8|00|qyo2$c>o^F#a}kjXVijyn)WkxB=bnXo^q zfG0ThSwP#9u&aJA4+Dgn1}|Mlix27|4{@imLiLfUJHZe&-=z##Nw5ZNek+?CyLRIg zh(^wfgl6ue(i!1ACl-$9;Y2wD2(Fud7HXq7Z{Q`L^2NJtxj>JbwmP6+O)@*BO|J~2 zu9&{%UuVHzcbF*P$^iEJ$}Y1erHWhO(`+zN6(0wL;*~*MNbYYMlDxv_^Cp_IvNDFZ z1TSX~JV|?RF{lf@IdMD8hhnyW)uH)Dx6fynjuV#X>QLWWl$t|+JVu4@{^}DV7>d?H zD~_8p(Ofi>B^|-G%o7KCG<+n;;^3`pzRdJmD9B*Qd^?_j=1Y&49SUpxIyVfGvgdmo52kqT1mW$QO zUU!k8p$OHQ+e2gr%@Bd1C;JHJVx|bp2@`x$Om`V4iO>18Zecv3v|D+jy{Y>*T=BbO zm6I<5Z<~s*!oVTC9`2aNyDUqD*sv8+k-PO`v)W1l!4A?ArJ&D*dzh!~krr(!)c~ED zyH7e{u{yExPNW_SPMvLW#RP9{=qn~zH8MyJ)M@%wC^A-`(B@D{%Q)hSP&;1zW%<=Y4W+oQ#*4Zx9n&2~MI;08q4}BzJlc=jWKroS7X+%Pe~H ze0|k?f!DMn$-O;ueQS+==RBnAn~+&IbKPTN^0iznU_}QwJOOCDus?)CLdg+Zz_^B7F|d=N9VJo$|L9fSzacZNs1mL$+KC2=@XJzlLg)8U z5H61*!pu0aUi#-_a-T1ncS(CHYlv9Eywm@or7V~q`cC)NaI|;h$ukt_bA$1Dh%8|M z$m)o=$dN}ftQ?X`DER&h#?yi#b=LA)-n}*?k3H5DpTq`l(25Dcic}G6Fy?&?>LuF* zc;LtcOz&qJ%pe2#HQ(GJzq{fu^-p}%yhaCUp^qEuV!HAR#1wUH8Q7?u{NhK-m!xwj z{^!YSy*YmU%AmLKW5OnZvjd5&e@oaI?XnNu^5MppOf;g{>*tM6hMEs{e!08Y&rt{s zRd;1vsKLp}d2Wv8w8V+-WH(+Xt7+FD@CjEL6|T!D&qv78CifJO)fA#MG}Qo<&kGCm zKDC^>6k}5{kPEXDz!l?j*UpevHab*AIMB3N)#igh zqb_WF+!!IuISl3pE8F02*xsoqCg1XWp_R9FSzY@*II6ls0ICwDeZM!MTghVrDm#N| z)zx3aiMwUVd?R(QTc?897Q2my5W5C49vRIxY-6lz7yCaHECU9wyQT_7=`Nw|uVaZn zHNb_0_eDFO=9kRPTc|NPus@+rs694+0Y)R=8B)&8+8yxD* zKjUHc-Vd%&Ps1g_+PHR8@fOSgdUkMPX;yP&s^!r%B6o|!OT}%kt?v=|SlS+0a0}|| z%dv1Y@i~(jA7+KDXh=NqO`&8C>bOe>p?JB@ym+Awa`0Un9hU9$qSRZq1A?%b{vyx< zR?=!B*nf1Pzrt!m9r3D;t{fsT(%YJ|(g>kpW!T}$iOd}OW^>L1_9)XM8~zN$q}XoBV4}w2Jo)>*(PL~HU#saV?E^Sd zHS-1gu3WuVI=tkOjYd-IG2e+*1A3qg_WI>zrP_X z*K=9L-cNp$Qd_((q4T>Eil<*6e!AVp86Iqk%p%BRIFyjaC1p%w80HdI-hP>3dh!*U zI{To+6-Zzkq>67~c}Jw3Kq!;{?0SGt2*8#<_yS4*w|(u2LcIh=?AxwV8O!ARg|NOT zZuUWN2T&(lWBgco05>K|q9F|kr|Hm}jM1fu3ys!NR3rUteHsGM>}Y`2fv|c^rymR& z@d*m*oZnsHp2Lr)Gyj?-XpO6GCUb`0a zr}@WK20Yer(t@;{iK_NO;jhgOUsw%N67RbvwCc=4{UTV-J+0G}xs3eLE^d%*N3Xa% z-UF+=K0i!0dIi7iB$0s$p1$Oz<`dq5IKrO{ltgCRPZ@v%XaFHg+~EgzZ5$G0D0zif z|8OZVDr4zbg(+rN%n&n`u7X4AEf47;YzY@p$MNL)*;jmTfTh4~QodBdxf@Jo3Z{=# zI}jm#e=kW@@=nBy1)gD(keQtP0PAQBnO5pv%_p)NER8<)jHmaiSC;WM&{ zWMO{AehL^(|TwaE2qAD%nH0dDO@cYqGFc^su0o-iq@U zs-0&^Vc7TnoNUa#`4;5>foYtmt(Oc4VcM5EPu*EqGa6aC5!$5g9nHN#6lDVT!QRLa zr;F{{-Y^;^t(2%4rR&~Ei#Cp(2cMe4_yHVuqkxe}OkIwsEhKbO~LlU93f z+P^&-&7T(Ch8L!_fwG3mP`Sc8Z>xo?(R9^*$%m&JYoY8pi1=3Dl)Y$^l{r;ykwGC8 zQcIVNX8KC+XEFbMD|;by&T3%(LjiM1HZrVhPB!G68# zVWGE7%sDC!DQXFb+9~#vENdX^EjkTl#T73j`weGBs#YV?fo%L1tA^EwAXL>g1%6)3 zni33oNoa(_3MOGZl7W?4!}_ZRT#GNXO#@FVHH=xnTX9-KERq>0I=#oXn%vZF!&0-@Tw=H0*4wwzJ`^n# zAeNt0?O28+tDze~QdSLw^%Hu*ytWJ;PPLPIVWhS^KEG}gnwGKmXEbWkk#e{DS%9?` zThwG0Gn&EGiRf@j{oYY{uiM!JD# zeNFZcu9U;j6D1SvBTu^gvC+-+5tlUuRyN7X<}ZuCaHr~72Pn@>N9tLuTGpNFn{hTk z^4CT)zMy-UTp3piUdGl*67%v5Mc`}hxg@h)kzg+RnTGOy*F=_kQdGXep;)T=y~~4V z^@53%s(n~96;=KW9_@NS-@2BHR9c5}+VNEuYZNr5nT^Kmm&z07ENahIM^w?UhOmCs zc1sOWA>h2Yi`sZie+mN!*Tl!Qh&U2H|va@zcED5JvW0_EGVcN>i>x${@)OyJ^?*Y zea(eP6J11`@Rxy^E_tvS9llvG?oSwsKSOdq@!((p(C`AN(L97G_e049OIFzDbY3?R zDurI-NSbM~s^}h72pjOKIQ*X6aR%s>9WSi@oyrdvlLQrvovgDNPr-D7Uoo5?d zNQOI}xp3S;Q#^0sMlJ4^-G24n)7*Z*pr1>a=$aF_fb1I#z&CP>GsQ*RvE}giH2+zb zF2_MaQMC4H>BoVr!qyh1eFwV`Ub~>i2^=fuc=kv82Pbx?hJzeyLe(J=%>thruB8sW^W zt;n}gLDgQGG_$$O8+v*C3K@IWU5EXy9lzQSXgwpa7*^AWJ5O}d@W!%Oa#nDhUlt-s z1`We=1v0bij3IQo>oMAt^1zE< zh}jw1>>&XZK^SgAioXH5)%l#AcH%e{BSP;5nvPjUqD;dDNr$>)%PSAa;p6@gtosED z-0(4)8x;haA{=5<1{G_}Gn9(vy#&9=qO&U^`Axg@tl?>di}yeIQN*}LqnkF#539uo z^$bBwt?}r5=u@?eX{)#CHawr4g!A&q04%-HExWpD?nI=*$N~@FSeSR$NPZ! z7s-WlVnW6LWCM0T{eMXIBB29bxMBg&KkSo}xV`n{p>g^db($4Z88zX4Q({vkrWLUS z1!ou}%e!*#?``4e@AS3)=?pB|dqFDZLKOrfe~Fv9UV|7zs*Q;)hPFCwlY3Sn*}3iK zqA%wc?*W}J!Yex;?+2WLMmcDOL34JvB#kC<%AV&OjXntC5@#3}8OuQRxhSy6H#3>P zG2g7*kjo3O)<4_$4#oknN3ZC(@pWNn5GG?x#XapL#&X<*W6K^h59wxS7ejG$<%!6+ z>FoVi=b0^Qt+54OPlJ*G7H%7dfg%Kp3%>WX0=3r8ZU@7sE75Td7)1_onVR&~x8KuW z;lGG~nPJcA`r)}L^%EI5l>p|C^}fyM!aP35TnVt)fE&;YvvoGaT6cCu;KLZ;s-*{g z%LpOCse>Q7!wsV!DB7x;qtp{}&^`vW$4*!%hocwym|A(UikwS z9O2*fcqiR)HnhTChRYs@F&Yc>^*9D0lnz~?*lC%)$FF0Ak_h?L#=%~9G1MVLS+X#EIvVk(~V!4nuJkzhcgiTQ`GC$hOFEp*N zev!m8AtObUQQ`s1cXF5o8+w%~_Di>F=Y9e(mZfn}5u1Mg5;79ipHikL#&!L@;F{)e zRB9qTq|Wf3sWkpL1}e|O-^g$i9vs9$b9muR$5L17$c|)B=n4*^LYA!R*%=cQ-m4bG zt5g>bhKZseHUyz>$kVWP21jD@)s^VBMCuRYe0X(C*8u~wQv?ivAJSqzm z zXt~!O#%f*!wbwNVd9UoPG?(sWB!IAF7>b-FP^7rn{28L7Y#X2@TUx=9p)1zYYesl6 zU<-ftB?p+){|+`PT7&^3_pY3b;4Qu&T0)@JeldZT%qsQ(Z5Y6TdG6c47rrY-z1f|v(&@?n_I#3&h3EbZ4 zO!x9#pE3u7py5sN>JKR$%=<3=Rzg*{l=%X+2bExTf+@Wi%ij!=+d&e!m}(A)az zVcQm^CjBbWsG3mZ*5goEsrdMOobV<)xAf+4sMorjarekXhschKel)LOWiQ0^tGBYJ zB?IN3O8v#c)3c&=iC^iv8zH!}PG?DutV*vx{FI#y3Jl$cfH}&qFxg~}Vn53*cgttZ zHj-ZCrHo=8p|Hrz_rA$v!SAg2i$Z!=SI1lgmks-~R%xVv>-3{Otr48z;=eXBw?Yg?8A^e%)-{Rp2#(vkLi@Q|F|53 z7e5h7W8D>nUG^ichu*o7U6xHB7qhG?>N^KYCzSb*sbXR^<=1Y)I$2?>yUiUCgGD(B z@*Ay`Zy4;Hnz3!6wdHSF$lng*qm9GSN_m;lT!Y|CD-RI4jjtGAP%3!JHq%6ss)1iE zCslGE=6ZeO>pf#no7G$ek)@PPVN2^$7rcU-I$B8X84~7ZKo-fqM^BbGt%Szjq1Z4!3vxp2w|#P{ z(bMa)BQ%ew=^13V=Vae02kyhtEOU+?$>TJRDVw+t_RO4%~Xfl>!)e+jQNRaDG!4kE zY2m5E&kw??J1-ov=!J7C`z?O4w#m&>kqFmm76CMwtA^mAkEZ1=ejuLsEab$WwEFlH zs2IE|S9=r5LZwXiW6`!^;jB%;5q-WByHNeNbh$N3ZsGJ_(u;xzx#GrV+C?41aSl2iOQA!C(WH4N6l~WZ|}bjD=O4~tqBea%F)5i(azD*o7K$j xhpX%VyI{G}e x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.linux64/source/ontology.java b/build/application.linux64/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.linux64/source/ontology.java +++ b/build/application.linux64/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.linux64/source/ontology.pde b/build/application.linux64/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.linux64/source/ontology.pde +++ b/build/application.linux64/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.windows32/lib/ontology.jar b/build/application.windows32/lib/ontology.jar index f218851d9263345cd084700b57d6fbfd4c970295..3a44ce1e0c99f2004a25b5d1f810bb262534b393 100644 GIT binary patch delta 9243 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 delta 9096 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 z zXt~!O#%f*!wbwNVd9UoPG?(sWB!IAF7>b-FP^7rn{28L7Y#X2@TUx=9p)1zYYesl6 zU<-ftB?p+){|+`PT7&^3_pY3b;4Qu&T0)@JeldZT%qsQ(Z5Y6TdG6c47rrY-z1f|v(&@?n_I#3&h3EbZ4 zO!x9#pE3u7py5sN>JKR$%=<3=Rzg*{l=%X+2bExTf+@Wi%ij!=+d&e!m}(A)az zVcQm^CjBbWsG3mZ*5goEsrdMOobV<)xAf+4sMorjarekXhschKel)LOWiQ0^tGBYJ zB?IN3O8v#c)3c&=iC^iv8zH!}PG?DutV*vx{FI#y3Jl$cfH}&qFxg~}Vn53*cgttZ zHj-ZCrHo=8p|Hrz_rA$v!SAg2i$Z!=SI1lgmks-~R%xVv>-3{Otr48z;=eXBw?Yg?8A^e%)-{Rp2#(vkLi@Q|F|53 z7e5h7W8D>nUG^ichu*o7U6xHB7qhG?>N^KYCzSb*sbXR^<=1Y)I$2?>yUiUCgGD(B z@*Ay`Zy4;Hnz3!6wdHSF$lng*qm9GSN_m;lT!Y|CD-RI4jjtGAP%3!JHq%6ss)1iE zCslGE=6ZeO>pf#no7G$ek)@PPVN2^$7rcU-I$B8X84~7ZKo-fqM^BbGt%Szjq1Z4!3vxp2w|#P{ z(bMa)BQ%ew=^13V=Vae02kyhtEOU+?$>TJRDVw+t_RO4%~Xfl>!)e+jQNRaDG!4kE zY2m5E&kw??J1-ov=!J7C`z?O4w#m&>kqFmm76CMwtA^mAkEZ1=ejuLsEab$WwEFlH zs2IE|S9=r5LZwXiW6`!^;jB%;5q-WByHNeNbh$N3ZsGJ_(u;xzx#GrV+C?41aSl2iOQA!C(WH4N6l~WZ|}bjD=O4~tqBea%F)5i(azD*o7K$j xhpX%VyI{G}e{*|00xW<3@i)`GngPe zkh=ORQ4IMVNb>8k$lpMczh9LLw#UC3)0`hj>gut`OE4qcu^x-O1(N)IEbb(mSyM37!Yj3=zRSDuvX0K8O)B07W(m;L;0~jzeFt9K%%wU4> zK a+FyYrZ;wTO29kV!jVQ<;o7-zD?*agU9aob8 diff --git a/build/application.windows32/source/gui.pde b/build/application.windows32/source/gui.pde index 4b9de3a..ed683a3 100644 --- a/build/application.windows32/source/gui.pde +++ b/build/application.windows32/source/gui.pde @@ -1,8 +1,14 @@ int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -13,6 +19,7 @@ void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -62,14 +69,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.windows32/source/ontology.java b/build/application.windows32/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.windows32/source/ontology.java +++ b/build/application.windows32/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.windows32/source/ontology.pde b/build/application.windows32/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.windows32/source/ontology.pde +++ b/build/application.windows32/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); diff --git a/build/application.windows64/lib/ontology.jar b/build/application.windows64/lib/ontology.jar index f218851d9263345cd084700b57d6fbfd4c970295..75ca767ccf628198c982b24764ed98e87163c8a2 100644 GIT binary patch delta 9243 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 delta 9096 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 z zXt~!O#%f*!wbwNVd9UoPG?(sWB!IAF7>b-FP^7rn{28L7Y#X2@TUx=9p)1zYYesl6 zU<-ftB?p+){|+`PT7&^3_pY3b;4Qu&T0)@JeldZT%qsQ(Z5Y6TdG6c47rrY-z1f|v(&@?n_I#3&h3EbZ4 zO!x9#pE3u7py5sN>JKR$%=<3=Rzg*{l=%X+2bExTf+@Wi%ij!=+d&e!m}(A)az zVcQm^CjBbWsG3mZ*5goEsrdMOobV<)xAf+4sMorjarekXhschKel)LOWiQ0^tGBYJ zB?IN3O8v#c)3c&=iC^iv8zH!}PG?DutV*vx{FI#y3Jl$cfH}&qFxg~}Vn53*cgttZ zHj-ZCrHo=8p|Hrz_rA$v!SAg2i$Z!=SI1lgmks-~R%xVv>-3{Otr48z;=eXBw?Yg?8A^e%)-{Rp2#(vkLi@Q|F|53 z7e5h7W8D>nUG^ichu*o7U6xHB7qhG?>N^KYCzSb*sbXR^<=1Y)I$2?>yUiUCgGD(B z@*Ay`Zy4;Hnz3!6wdHSF$lng*qm9GSN_m;lT!Y|CD-RI4jjtGAP%3!JHq%6ss)1iE zCslGE=6ZeO>pf#no7G$ek)@PPVN2^$7rcU-I$B8X84~7ZKo-fqM^BbGt%Szjq1Z4!3vxp2w|#P{ z(bMa)BQ%ew=^13V=Vae02kyhtEOU+?$>TJRDVw+t_RO4%~Xfl>!)e+jQNRaDG!4kE zY2m5E&kw??J1-ov=!J7C`z?O4w#m&>kqFmm76CMwtA^mAkEZ1=ejuLsEab$WwEFlH zs2IE|S9=r5LZwXiW6`!^;jB%;5q-WByHNeNbh$N3ZsGJ_(u;xzx#GrV+C?41aSl2iOQA!C(WH4N6l~WZ|}bjD=O4~tqBea%F)5i(azD*o7K$j xhpX%VyI{G}ewO anD$p7$=hR*pMfNwUn2_g$L98$%DVubEJu9+ delta 344 zcmZqJ!rHKfbwUSo>b(mSyM38YgfeZstyu};PG+xC1=IRfrqV!u3 x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -78,23 +87,17 @@ class Button { label = label_; w = int(textWidth(label))+18; h = 32; + active = true; } void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} diff --git a/build/application.windows64/source/ontology.java b/build/application.windows64/source/ontology.java index cf773f7..5d55eed 100644 --- a/build/application.windows64/source/ontology.java +++ b/build/application.windows64/source/ontology.java @@ -73,13 +73,11 @@ public void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER); @@ -117,9 +115,15 @@ public void deleteAll() { } int buttonCount = 8; int i_buttonId; +boolean menuOpen = true; +int[] menuButtons = {2, 3, 4, 5, 6}; - - +public void menu() { + menuOpen = !menuOpen; + for (int i = 0; i < menuButtons.length; i++) { + buttons[menuButtons[i]].active = menuOpen; + } +} public void initButtons() { buttons[0] = new Button(72, 10, "Add Node"); @@ -130,6 +134,7 @@ public void initButtons() { buttons[5] = new Button(10, 170, "Export Image"); buttons[6] = new Button(10, 210, "Empty Workspace"); buttons[7] = new Button(10, 10, "Menu"); + menu(); /* buttons[0] = new Button(10, 10, "Node Hinzufügen"); buttons[1] = new Button(155, 10, "Löschen"); buttons[2] = new Button(10, 50, "Farben umkehren"); @@ -179,14 +184,16 @@ Button buttons[] = new Button[buttonCount]; class Button { int id, x, y, w, h; String label; + boolean active; public boolean hover() { - return (mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false; + return (active) ? ((mouseX > x && mouseX < x+w && mouseY > y && mouseY < y+h) ? true : false) : false; } public void click() { buttonFunctions(id); } + Button(int x_, int y_, String label_) { id = i_buttonId; i_buttonId++; @@ -195,26 +202,20 @@ class Button { label = label_; w = PApplet.parseInt(textWidth(label))+18; h = 32; + active = true; } public void display() { - stroke(0); - strokeWeight(1); - fill(255, 127); - rect(x, y, w, h, 4); - fill(0); - text(label, x+9, y+h/2+5); + if (active) { + stroke(0); + strokeWeight(1); + fill(255, 127); + rect(x, y, w, h, 4); + fill(0); + text(label, x+9, y+h/2+5); + } } } - -boolean menuOpen; - -public void menu() { - if (menuOpen) { - } else { - } - menuOpen = !menuOpen; -} int linkCount; boolean dragLink; //state of dragging a link diff --git a/build/application.windows64/source/ontology.pde b/build/application.windows64/source/ontology.pde index 41227fc..f9f76d1 100644 --- a/build/application.windows64/source/ontology.pde +++ b/build/application.windows64/source/ontology.pde @@ -57,13 +57,11 @@ void draw() { textAlign(CORNER); buttons[0].display(); if (i_selectedNode != -1) buttons[1].display(); - if (menuOpen) { - buttons[2].display(); - buttons[3].display(); - buttons[4].display(); - buttons[5].display(); - buttons[6].display(); - } + buttons[2].display(); + buttons[3].display(); + buttons[4].display(); + buttons[5].display(); + buttons[6].display(); buttons[7].display(); rectMode(CENTER); textAlign(CENTER);