From ef56e2506b4102f2190877eb1064ea5a48ee72c3 Mon Sep 17 00:00:00 2001 From: Meruemon Date: Mon, 21 Mar 2022 17:53:14 +0100 Subject: [PATCH] mvc architecture started, started implementation of PORT A and B --- bin/Control/Control.class | Bin 0 -> 2715 bytes bin/Control/IActions.class | Bin 0 -> 779 bytes bin/Model/Backend/MyModel.class | Bin 0 -> 517 bytes bin/Model/Backend/Runtime/Environment.class | Bin 2641 -> 2595 bytes bin/View/GUIMainFrame.class | Bin 0 -> 4088 bytes .../GUIMenuBar.class | Bin 12621 -> 12299 bytes bin/View/GUIPorts.class | Bin 0 -> 3717 bytes .../GUIRegister.class | Bin 4767 -> 4721 bytes .../GUIRegistersDetailed.class | Bin 6067 -> 6021 bytes .../GUITestFileTable.class | Bin 5982 -> 5936 bytes bin/View/IMyView.class | Bin 0 -> 100 bytes bin/View/MyView.class | Bin 0 -> 590 bytes .../PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class | Bin 4362 -> 0 bytes src/Control/Control.java | 118 ++++++++++++++++ src/Control/IActions.java | 58 ++++++++ src/Model/Backend/MyModel.java | 15 ++ src/Model/Backend/Runtime/Environment.java | 2 +- .../GUIMainFrame.java | 3 +- .../GUIMenuBar.java | 2 +- src/View/GUIPorts.java | 132 ++++++++++++++++++ .../GUIRegister.java | 2 +- .../GUIRegistersDetailed.java | 3 +- .../GUITestFileTable.java | 2 +- src/View/IMyView.java | 5 + src/View/MyView.java | 19 +++ 25 files changed, 354 insertions(+), 7 deletions(-) create mode 100644 bin/Control/Control.class create mode 100644 bin/Control/IActions.class create mode 100644 bin/Model/Backend/MyModel.class create mode 100644 bin/View/GUIMainFrame.class rename bin/View/{PIC_SIMULATOR_GUI_JAVA => }/GUIMenuBar.class (88%) create mode 100644 bin/View/GUIPorts.class rename bin/View/{PIC_SIMULATOR_GUI_JAVA => }/GUIRegister.class (93%) rename bin/View/{PIC_SIMULATOR_GUI_JAVA => }/GUIRegistersDetailed.class (76%) rename bin/View/{PIC_SIMULATOR_GUI_JAVA => }/GUITestFileTable.class (90%) create mode 100644 bin/View/IMyView.class create mode 100644 bin/View/MyView.class delete mode 100644 bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class create mode 100644 src/Control/Control.java create mode 100644 src/Control/IActions.java create mode 100644 src/Model/Backend/MyModel.java rename src/View/{PIC_SIMULATOR_GUI_JAVA => }/GUIMainFrame.java (97%) rename src/View/{PIC_SIMULATOR_GUI_JAVA => }/GUIMenuBar.java (99%) create mode 100644 src/View/GUIPorts.java rename src/View/{PIC_SIMULATOR_GUI_JAVA => }/GUIRegister.java (99%) rename src/View/{PIC_SIMULATOR_GUI_JAVA => }/GUIRegistersDetailed.java (99%) rename src/View/{PIC_SIMULATOR_GUI_JAVA => }/GUITestFileTable.java (99%) create mode 100644 src/View/IMyView.java create mode 100644 src/View/MyView.java diff --git a/bin/Control/Control.class b/bin/Control/Control.class new file mode 100644 index 0000000000000000000000000000000000000000..dc8fbca52457691d58b7f00daef697d305de5a16 GIT binary patch literal 2715 zcma)7Yf}?R6uq55A=6X4uILivP+F z)>iq!AK;HtPxnlqlu0!o=;^+F&*^(lpEO^;eg5+OJKd*;DT*tA8F^P78mU0^ii zG^KdQXuP7n*iawDlZ(=p-V&p0*#X#}0J$ckLWz=(iV^X?zV6neA^PpsW>feHMuL*It(VfHxg}3R{E`lUsZQE=q$0T%TITN z_p~NDvgZjGrDQi$MM>G@mJfEe!DtLA)snQ4U^5!gt4gu)5NW|Yn5@-n!EW8-o{!U2 z=GKlWUspRmY^TY;4wUqM;r(9M>yWrTwhoJV$}qjTfqhA*tewhPTVMYORfG zUK{{c_5qnbMZ=Z7fTJH;IS8p*YrKnEvoBu;O>!x9B#r<|?0MWpkxs`|X=4y%XMdI6 z;eJmXEYXT;D9jyg1!jA?+E5be@`sV|#OLk@bRf%?=n5OnWGsib*CZ~=DVM9YtxZO! zvlVSi-;-9p=(>Ebg3Bl<2}bI&V?#_AH!&ZXwisZwrR$z6?M`7yLx-GI?r}y_k>re~ zf40ruPTxAYC_v;f@LrGain{Fj7WW)i-MccRYVp_LxOgwU{UD>!y5qYop_G8~p*wFV z9cTu2kK=EMVnoXS7)iMw;~B)qD2;I(tLMmw<2y0?KOLK$`$Uto^PlL%M}%TDh4DBg zFdoA=0fG!>lQfOUg#bpU=rmR!0P!$L)$BJM6vO;?`XfAM0dZ9dJ0MQ#4QW8(M1_wo(p0WUYdx2z-kFLZMF?<+QZ`pjn#JKAks{EgzZex|ytWWU?D(vh^dA z<>_Xq*}$LUBTaVr=Xi_$1eDQjya2(&F{dPtlD(=a)cc|m0@)eeF#{Wszy&k#StRf; zGw@X;@NfDj>~Ww>uQl+nOv+G7rn_c?w+B$%3m?7$EyA1kA!3Y{^i#dA=b_Q#`f(24 qP&t5VnI52)B4GX7Sf&+SU&*XZH&UBbGw{DiVA%}xBY|tW>-8U%1YUUn literal 0 HcmV?d00001 diff --git a/bin/Control/IActions.class b/bin/Control/IActions.class new file mode 100644 index 0000000000000000000000000000000000000000..366e3b766a21c2ca38db0dcb7edab3ca5d2cbd6b GIT binary patch literal 779 zcmZvaTW`}a6vvOp)~;R4N`b9hH|{|~l=s1;?j|aAYDl6D*pmrXSTmFaG}ib9o6L;8hbA81!~kVYSMK<56m*Dohg=Q9b47e3t8s@T=DM*G8c*3-w&hdA%j6M@#8J6%!ebb`OgUsb;}*xie*;dgtTDr=GwIP zRjvOuvDLE3wzhp~-|%x0%d;})R%th9?9q3p|1WmM4{7HjgLbS+oeF1?LAQPfZ=J^m z1DpxCZ-CEY2^!#@N0YcrY!TbU6=H|jCEg^iLeKZPMeGxA6Ys!XA76uY&jIls@jmeZ hJoNEL)b}xLpx;e&y8utn=TpjiMttsw883Xs%YWEJu=)T1 literal 0 HcmV?d00001 diff --git a/bin/Model/Backend/MyModel.class b/bin/Model/Backend/MyModel.class new file mode 100644 index 0000000000000000000000000000000000000000..07c747fcbf751e8934c80859980e31b859a9e91a GIT binary patch literal 517 zcma)2+e!m55Ix!5cH4D(v0Ce^h|*SYKfud_g@Vwkp!7XWLrq;bvTgm=Q$;)8@t=7ck6&dm4E=htF^6Kwl%7@9*pk#Tg!#hpwh(eT+~A09(}#-Df;^JE%b zj%QM244%F^?=kESR;rXpwa`hH>Nu8ZM5H5z;;~9pcFM5d{s+G^BKaPf3E*NagpZKH zZFfdxFjPYnP-LhLR3b0t_hXsf@Np~|8UrnOJmRS`IREsrTlL7$T5Y==j;y&4N|3>+ z%P+eI_PGSuG!YO3azx GumJ#kF&8QT diff --git a/bin/View/GUIMainFrame.class b/bin/View/GUIMainFrame.class new file mode 100644 index 0000000000000000000000000000000000000000..0e0ca46948a98daf0273fb8856faed8e99410103 GIT binary patch literal 4088 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 K-;;q4ul^UK6D;}w literal 0 HcmV?d00001 diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class b/bin/View/GUIMenuBar.class similarity index 88% rename from bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class rename to bin/View/GUIMenuBar.class index c4349c6e9fd90f76304082cd63208c22ea6d4399..b09d8692f5a06beb808a464c09beac2e83a02c32 100644 GIT binary patch delta 216 zcmX?`)SV!5>ff$?|Nk@CGRd$rFflUlhh?UgPtlZOk!uuW@L~A M%YmKZCBUo*0MB|u8vp>ff$?|Nk@CGRd$rFflTyg=MCe>j!u`#|L}*hWa>$_y@(ihkC|)Ifgk- z6ls^$^1-KIp^B^?UInL>Wi|0C_@XXrgipa{MMisO#+#E9S+pFmyHX$MT;IgZJh!66 z+*E6PW=)>UB4Ll)kf7A`%;J*NBK&43GKy`!!!m)9JJ7WeTg9ZT|@Q~nQ%mQi2W@IqHsf8)bak3(#=w=RnW<>x*(5HI< diff --git a/bin/View/GUIPorts.class b/bin/View/GUIPorts.class new file mode 100644 index 0000000000000000000000000000000000000000..62dbe8d9f03b524d1b05e27f2fb4dd56fb478f6d GIT binary patch literal 3717 zcmZu!Yjj*y75>g7P10~;ABLhLS_Gs?N|Po{LrK$;Nl9s#wxLPW7F+2}GNjWcbID}V zB$c)lsI~GC6ciA|Dn(F1ik(!5Jn91#5EZR})(1}!mP`HPTCU{+zrD}Bog3gs=6l?8 z&ffRlv-i1q>g`7!d*>ZA;jLoC49dDv$&u>iYge@Une0$83Jqp%^|pJX)k7nxbYFE_ zyO&P(8=T}Tkx|VC<%#!>X`D1DZZIt}r9G7%n(TCDQj?wdd&b1wm?HoEqb9uWWIv<2 z>kL@r%LJz92%RZD7p0*{UFffAUSM#_qI+*XE#-P~mT(hD> z<_C-e1IDodkLwjJPNh@XB?bj^D!LfD#qUj)q5!oP^H4n%1`8~vph(z4i(<#lwJ34yJd3H0 zEw(6iY>CB5C@RMJ@7^%_T1p`AL*Co$=29%hGKqA7!O3&<(O36-+*=*l47XTgMVG`~ zZedYYf)(MsxVRTtd_dfl%vxTqc&ja@p-kAt7SrWw2k(q8TCBAeGu*{>7Bf*+j17!B zX}5;2y9A%&JZ^|mtj98${Ar61qPzr~)vpt)+u~%gdey2G>oSX3Vr@}tzF1o=P7#ZR z!Ub!@N?UwLtjl>nZr_NTvG}mK+0fM>+bupK?r7+0oE;XYihD)qYN%Zn9~Jk?(A8*H zS)3;BHIhKQK|+1j;$vccPOXJvecs~ZVqK?Jy;wI`%ogiLwHAo=MT^tLx>+qv@XHpT z5bIX8G`rg^&JgPkwKTP_S)3`>*VWRzzF~2eSa%26y43Em_@ub^hOTD!ZHu$T{ch-L zf)7~C5%^H+$d)GKn!uNqWD z63O3eq$RBG-kR*;?RUv5cusy^F|d9l9fQ;I&n9>Tk<0Air5*lorYG5&l9y8!zPWjF zi`>|J?f|zRq~Y-w((V-5>=fDR6xrw$+2$14o)p=T6xoCn*@6_=cNE!m6xm7?**_H7 zG!)q>6xkjW*$@=j0u)*FiY#+Q7Pca*S&=2I$huWzu`04c6coXA+MGzJSQQoRPOQ-@ol((6v3|qMOO9Y;4x5~~RE6h6kBX!d zeJWB;Y*R7dgs)=Ii6IrkPK>A+bK)~9b~>?J#U3ZFR#D$cgW($T@LD#lucasCd+g z$5kAy9LJ9j=_YuRzxS~B0*kl>^d#olHH}?n_brX1&mH+E; z{DzV0^J)Ue=s%yRnm!|k7pe+!I4(bb;ix+PwN{Pe<*LHG(HR=YgAomC=)5WUVXGvr z%nOGt$`1>cujc}7;c603jIPj-d15r?=LO4)+a6tBj3ybzN(gT9waAU|Y8|h>?(TxB zUR1tF{==~d477uK>!x=abynR2W*v-xp57nhiGvC*_*lj+2zW+T5|yU}g> z&|~`f**c1(*@?@{e)O3e_|1AdQsypfHFsm1d5|BhISiPi@XeF_QhgeO=6PhyaSWL^ z_>KAx44eOAyLlTUu>y?7reQ2rjvcYtxFS}CU9lSMj@9GJ*b?lCwcx5)0#|F%&2ok1 UijEom8-K$aEIWh0YZ1Qre{|qxP5=M^ literal 0 HcmV?d00001 diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.class b/bin/View/GUIRegister.class similarity index 93% rename from bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.class rename to bin/View/GUIRegister.class index 511e29838abd5f30345fa59f6ca55fa8a531b5fa..f8a65c9bdc821b099c8eda8fca76482c5ffeb8df 100644 GIT binary patch delta 41 vcmbQQ`cXyX)W2Q({{LsNWq8NVz{JQP5SE!*zES%-3!9J+h`HIGHGvlZYt|1& delta 87 zcmeyUGGA5u)W2Q({{LsNWq8NVz{JR)9+sI}t{>p(93SlI8|vd2;vW?69_ktIJtRQ7oBO^VuLpl*kCBGQmdq!6x}bxe2Gj#87FbvDqY0Ws;~i^VwoD*=lmAG1UQU zYVjH$+s!+6Xau!7ojP?4X4A$3PFoab zDC8VvoX5)re6%|av5_XwVP~DB5@actETK-;(Zx0{)5sO}ah2mXpXHk6c%6Q_8Mf{z zHyO9x8*cG|9wzAJJGU*drI;((yRU0%*1KX@-wp;IM&~O?xmK~bFE={3HGuW-! z?9qIh)y-ZlVV~BrU+X!bZ3a7O(QXduWe#f}tvbjN9pR|j9Mh+?=}X#mk`8@GP(N~< zDxinCpr7zljom-LRgz8+#Yy7mWGSb~6w^z9D>QMH7Ot6)USqy)dhBD^%yDk;f}2bl?kxjMGsq0L_|9$9>5xP+EHR8o zqS;fqBTnv$n|o5ueW^3|PDZ7jF*(J!oL_`3eLRpMLyq!DCU`8bcp_6g3r)w4`~yok Bm52ZU diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class b/bin/View/GUITestFileTable.class similarity index 90% rename from bin/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class rename to bin/View/GUITestFileTable.class index 7e4b9d6e17bc6b2a7f1a0bdc98c1d12cb9fa4f3e..a84f1bc00e378b07284c851856d81bf895f4b8aa 100644 GIT binary patch delta 41 vcmcbow?R+j)W2Q({{LsNW#ndOU}9tt4a-a|->7ZC!Y1wmVs5Trc_st^PQ?y; delta 87 zcmdm>cTZ3I)W2Q({{LsNW#ndOU}9v@3Cm0^*AMV?jt}oY)EsaC diff --git a/bin/View/IMyView.class b/bin/View/IMyView.class new file mode 100644 index 0000000000000000000000000000000000000000..7e11211c972947799fab5220d9c1a4e376c51d62 GIT binary patch literal 100 zcmX^0Z`Z#6{~2r<*x4DF7#VoNGE>X-J$)-dG&=(eBZELzVp*boPGVlVzJF3yYH|r9 n16OckKq!f9Jiki4n7k1&&$3hK814fmUUlZiDl=n^yWe^HVP>KaV z9BHbHn&3i&TsmUFQ2!^6ofK76Q5_M44N`Y_&!HJ=al{`7spDze+!YQ(rKvXZYzI?G zJGs^@$x_GCmEkEva(A!GV4QmcVIql|g)%B?KvN~eeW_ZQlScR` zX&t$!o#-7XyLsQinuMS*gF@EnWRXl2+(4a>VUuhETi?ewi!1;D literal 0 HcmV?d00001 diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class deleted file mode 100644 index e1aab4cbfa2b71453a71ea0eebf3e8c039c786d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4362 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 oData) { + + } + + public void saveSimulatorState() { + + } + + public void loadSimulatorState() { + + } + + public void exitSimulator() { + + } +} diff --git a/src/Control/IActions.java b/src/Control/IActions.java new file mode 100644 index 0000000..8fdbbc3 --- /dev/null +++ b/src/Control/IActions.java @@ -0,0 +1,58 @@ +package Control; + +import java.util.ArrayList; + +public interface IActions { + + public void getWRegister(int iValue); + + public void getPCintern(int iValue); + + public void getPCLATH(int iValue); + + public void getPCL(int iValue); + + public void getFSR(int iValue); + + public void getStatus(int iValue); + + public void getOption(int iValue); + + public void getPrescaler(int iValue); + + public void getTMR0(int iValue); + + + + public void setPortAPinXToY(int iPort, boolean bEnabled); + + public void setPortBPinXToY(int iPort, boolean bEnabled); + + public void setPortATrisXToY(int iPort, boolean bEnabled); + + public void setPortBTrisXToY(int iPort, boolean bEnabled); + + public void getRam(int[][] aiiRam); + + + public void startProgram(); + + public void stepProgram(); + + public void pauseProgram(); + + public void resetProgram(); + + public void controlWDT(boolean bEnabled); + + public void setQuarz(int iElement); + + + public void loadFileToEEPROM(ArrayList oData); + + public void saveSimulatorState(); + + public void loadSimulatorState(); + + public void exitSimulator(); +} diff --git a/src/Model/Backend/MyModel.java b/src/Model/Backend/MyModel.java new file mode 100644 index 0000000..ff9ef86 --- /dev/null +++ b/src/Model/Backend/MyModel.java @@ -0,0 +1,15 @@ +package Model.Backend; + +import Model.Backend.Microcontroller.PIC; + +public class MyModel { + PIC oPIC; + + public MyModel(PIC pic) { + oPIC = pic; + } + + public PIC getPIC() { + return this.oPIC; + } +} diff --git a/src/Model/Backend/Runtime/Environment.java b/src/Model/Backend/Runtime/Environment.java index 0926c5b..f5a9000 100755 --- a/src/Model/Backend/Runtime/Environment.java +++ b/src/Model/Backend/Runtime/Environment.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import Model.Backend.Microcontroller.PIC; import Model.Backend.Microcontroller.WATCHDOG; -import View.PIC_SIMULATOR_GUI_JAVA.GUIMainFrame; +import View.GUIMainFrame; public class Environment { diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java b/src/View/GUIMainFrame.java similarity index 97% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java rename to src/View/GUIMainFrame.java index 957614a..e6ed750 100755 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java +++ b/src/View/GUIMainFrame.java @@ -1,4 +1,4 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; import java.awt.Color; import java.awt.Insets; @@ -117,6 +117,7 @@ public class GUIMainFrame extends JFrame { oMainPanel.add(oPanelRegisterInformation, c); oPanels.add(oPanelRegisterInformation); oPanels.add(oMainPanel); + oMainPanel.add(new GUIPorts()); this.add(oMainPanel); updateWindow(); } diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java b/src/View/GUIMenuBar.java similarity index 99% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java rename to src/View/GUIMenuBar.java index 129aed3..d7ca917 100644 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java +++ b/src/View/GUIMenuBar.java @@ -1,4 +1,4 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; import java.awt.Color; import java.awt.Dimension; diff --git a/src/View/GUIPorts.java b/src/View/GUIPorts.java new file mode 100644 index 0000000..c117406 --- /dev/null +++ b/src/View/GUIPorts.java @@ -0,0 +1,132 @@ +package View; + +import java.awt.GridBagLayout; +import java.awt.GridBagConstraints; + +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JPanel; + +public class GUIPorts extends JPanel { + + JPanel oPanelPortA = new JPanel(); + JPanel oPanelPortB = new JPanel(); + + JPanel oPanelPortAPins = new JPanel(); + JPanel oPanelPortATris = new JPanel(); + JPanel oPanelPortBPins = new JPanel(); + JPanel oPanelPortBTris = new JPanel(); + + JLabel oPortA = new JLabel("Port A"); + JLabel oPortB = new JLabel("Port B"); + JLabel oTrisA = new JLabel("Tris"); + JLabel oTrisB = new JLabel("Tris"); + JLabel oPinA = new JLabel("Pin"); + JLabel oPinB = new JLabel("Pin"); + + JCheckBox oRA4 = new JCheckBox("RA4"); + JCheckBox oRA3 = new JCheckBox("RA3"); + JCheckBox oRA2 = new JCheckBox("RA2"); + JCheckBox oRA1 = new JCheckBox("RA1"); + JCheckBox oRA0 = new JCheckBox("RA0"); + + JCheckBox oTRISA4 = new JCheckBox("TRISA4"); + JCheckBox oTRISA3 = new JCheckBox("TRISA3"); + JCheckBox oTRISA2 = new JCheckBox("TRISA2"); + JCheckBox oTRISA1 = new JCheckBox("TRISA1"); + JCheckBox oTRISA0 = new JCheckBox("TRISA0"); + + JCheckBox oRB7 = new JCheckBox("RB7"); + JCheckBox oRB6 = new JCheckBox("RB6"); + JCheckBox oRB5 = new JCheckBox("RB5"); + JCheckBox oRB4 = new JCheckBox("RB4"); + JCheckBox oRB3 = new JCheckBox("RB3"); + JCheckBox oRB2 = new JCheckBox("RB2"); + JCheckBox oRB1 = new JCheckBox("RB1"); + JCheckBox oRB0 = new JCheckBox("RB0"); + + JCheckBox oTRISB7 = new JCheckBox("TRISB7"); + JCheckBox oTRISB6 = new JCheckBox("TRISB6"); + JCheckBox oTRISB5 = new JCheckBox("TRISB5"); + JCheckBox oTRISB4 = new JCheckBox("TRISB4"); + JCheckBox oTRISB3 = new JCheckBox("TRISB3"); + JCheckBox oTRISB2 = new JCheckBox("TRISB2"); + JCheckBox oTRISB1 = new JCheckBox("TRISB1"); + JCheckBox oTRISB0 = new JCheckBox("TRISB0"); + + public GUIPorts() { + buildGUIPorts(); + } + + private void buildGUIPorts() { + oPanelPortAPins.add(oRA4); + oPanelPortAPins.add(oRA3); + oPanelPortAPins.add(oRA2); + oPanelPortAPins.add(oRA1); + oPanelPortAPins.add(oRA0); + + oPanelPortATris.add(oTRISA4); + oPanelPortATris.add(oTRISA3); + oPanelPortATris.add(oTRISA2); + oPanelPortATris.add(oTRISA1); + oPanelPortATris.add(oTRISA0); + + oPanelPortBPins.add(oRB7); + oPanelPortBPins.add(oRB6); + oPanelPortBPins.add(oRB5); + oPanelPortBPins.add(oRB4); + oPanelPortBPins.add(oRB3); + oPanelPortBPins.add(oRB2); + oPanelPortBPins.add(oRB1); + oPanelPortBPins.add(oRB0); + + oPanelPortBTris.add(oTRISB7); + oPanelPortBTris.add(oTRISB6); + oPanelPortBTris.add(oTRISB5); + oPanelPortBTris.add(oTRISB4); + oPanelPortBTris.add(oTRISB3); + oPanelPortBTris.add(oTRISB2); + oPanelPortBTris.add(oTRISB1); + oPanelPortBTris.add(oTRISB0); + + oPanelPortA.setLayout(new GridBagLayout()); + oPanelPortB.setLayout(new GridBagLayout()); + + GridBagConstraints oConstraints = new GridBagConstraints(); + oConstraints.anchor = GridBagConstraints.WEST; + + oConstraints.gridx = 0; + oConstraints.gridy = 0; + oPanelPortA.add(oPortA, oConstraints); + oConstraints.gridy = 1; + oPanelPortA.add(oPinA, oConstraints); + oConstraints.gridx = 1; + oPanelPortA.add(oPanelPortAPins, oConstraints); + oConstraints.gridx = 0; + oConstraints.gridy = 2; + oPanelPortA.add(oTrisA); + oConstraints.gridx = 1; + oPanelPortA.add(oPanelPortATris, oConstraints); + + oConstraints.gridx = 0; + oConstraints.gridy = 0; + oPanelPortB.add(oPortB, oConstraints); + oConstraints.gridy = 1; + oPanelPortB.add(oPinB, oConstraints); + oConstraints.gridx = 1; + oPanelPortB.add(oPanelPortBPins, oConstraints); + oConstraints.gridx = 0; + oConstraints.gridy = 2; + oPanelPortB.add(oTrisB); + oConstraints.gridx = 1; + oPanelPortB.add(oPanelPortBTris, oConstraints); + + this.setLayout(new GridBagLayout()); + + oConstraints.gridx = 0; + oConstraints.gridy = 0; + this.add(oPanelPortA, oConstraints); + oConstraints.gridy = 1; + this.add(oPanelPortB, oConstraints); + } +} \ No newline at end of file diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.java b/src/View/GUIRegister.java similarity index 99% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.java rename to src/View/GUIRegister.java index e322489..7b7484d 100644 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.java +++ b/src/View/GUIRegister.java @@ -1,4 +1,4 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; import java.util.ArrayList; diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java b/src/View/GUIRegistersDetailed.java similarity index 99% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java rename to src/View/GUIRegistersDetailed.java index ee2986a..b312a43 100644 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java +++ b/src/View/GUIRegistersDetailed.java @@ -1,6 +1,5 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; -import javax.sound.sampled.AudioSystem; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java b/src/View/GUITestFileTable.java similarity index 99% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java rename to src/View/GUITestFileTable.java index 4298e55..4e897bf 100644 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java +++ b/src/View/GUITestFileTable.java @@ -1,4 +1,4 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; import java.awt.Dimension; import java.awt.GridBagConstraints; diff --git a/src/View/IMyView.java b/src/View/IMyView.java new file mode 100644 index 0000000..3aaef6e --- /dev/null +++ b/src/View/IMyView.java @@ -0,0 +1,5 @@ +package View; + +public interface IMyView { + +} diff --git a/src/View/MyView.java b/src/View/MyView.java new file mode 100644 index 0000000..33e91a0 --- /dev/null +++ b/src/View/MyView.java @@ -0,0 +1,19 @@ +package View; + +import javax.swing.JPanel; + +public class MyView { + + GUIMainFrame oGUIMainFrame; + GUIMenuBar oGUIMenuBar; + GUIPorts oGUIPorts; + GUIRegister oGUIRegister; + GUIRegistersDetailed oGUIRegistersDetailed; + GUITestFileTable oGUITestFileTable; + + JPanel oGUIMainPanel; + + public MyView() { + + } +}