diff --git a/bin/Backend/InterruptHandling/InterruptServiceHandler.class b/bin/Backend/InterruptHandling/InterruptServiceHandler.class deleted file mode 100644 index 0f8db34..0000000 Binary files a/bin/Backend/InterruptHandling/InterruptServiceHandler.class and /dev/null differ diff --git a/bin/Backend/InterruptHandling/InterruptServiceHandlingTable.class b/bin/Backend/InterruptHandling/InterruptServiceHandlingTable.class deleted file mode 100644 index 004adba..0000000 Binary files a/bin/Backend/InterruptHandling/InterruptServiceHandlingTable.class and /dev/null differ diff --git a/bin/Backend/Runtime/Main.class b/bin/Backend/Runtime/Main.class deleted file mode 100644 index 929b2b6..0000000 Binary files a/bin/Backend/Runtime/Main.class and /dev/null differ diff --git a/bin/Backend/Runtime/ProgramStepInformation.class b/bin/Backend/Runtime/ProgramStepInformation.class deleted file mode 100644 index 59cbe12..0000000 Binary files a/bin/Backend/Runtime/ProgramStepInformation.class and /dev/null differ diff --git a/bin/Backend/Runtime/TODO.class b/bin/Backend/Runtime/TODO.class deleted file mode 100644 index 9a052bc..0000000 Binary files a/bin/Backend/Runtime/TODO.class and /dev/null differ diff --git a/bin/Backend/Runtime/WATCHDOG.class b/bin/Backend/Runtime/WATCHDOG.class deleted file mode 100644 index b734d55..0000000 Binary files a/bin/Backend/Runtime/WATCHDOG.class and /dev/null differ diff --git a/bin/Backend/Statistics/ErrorHandling/BackendErrorCounter.class b/bin/Backend/Statistics/ErrorHandling/BackendErrorCounter.class deleted file mode 100644 index b6d8842..0000000 Binary files a/bin/Backend/Statistics/ErrorHandling/BackendErrorCounter.class and /dev/null differ diff --git a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class b/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class deleted file mode 100644 index 020859a..0000000 Binary files a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class and /dev/null differ diff --git a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class b/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class deleted file mode 100644 index d84d5e1..0000000 Binary files a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class and /dev/null differ diff --git a/bin/Backend/BackendCommandProcessing/InformationConnecter.class b/bin/Model/Backend/BackendCommandProcessing/InformationConnecter.class similarity index 88% rename from bin/Backend/BackendCommandProcessing/InformationConnecter.class rename to bin/Model/Backend/BackendCommandProcessing/InformationConnecter.class index 29c710c..eea89a2 100644 Binary files a/bin/Backend/BackendCommandProcessing/InformationConnecter.class and b/bin/Model/Backend/BackendCommandProcessing/InformationConnecter.class differ diff --git a/bin/Backend/EepromLoader/ReadEepromFile.class b/bin/Model/Backend/EepromLoader/ReadEepromFile.class similarity index 82% rename from bin/Backend/EepromLoader/ReadEepromFile.class rename to bin/Model/Backend/EepromLoader/ReadEepromFile.class index d6f5906..ce6d8e7 100644 Binary files a/bin/Backend/EepromLoader/ReadEepromFile.class and b/bin/Model/Backend/EepromLoader/ReadEepromFile.class differ diff --git a/bin/Model/Backend/InterruptHandling/InterruptServiceHandler.class b/bin/Model/Backend/InterruptHandling/InterruptServiceHandler.class new file mode 100644 index 0000000..72b7b11 Binary files /dev/null and b/bin/Model/Backend/InterruptHandling/InterruptServiceHandler.class differ diff --git a/bin/Model/Backend/InterruptHandling/InterruptServiceHandlingTable.class b/bin/Model/Backend/InterruptHandling/InterruptServiceHandlingTable.class new file mode 100644 index 0000000..3917047 Binary files /dev/null and b/bin/Model/Backend/InterruptHandling/InterruptServiceHandlingTable.class differ diff --git a/bin/Backend/Microcontroller/Bitmask.class b/bin/Model/Backend/Microcontroller/Bitmask.class similarity index 80% rename from bin/Backend/Microcontroller/Bitmask.class rename to bin/Model/Backend/Microcontroller/Bitmask.class index f8962ce..d231ce4 100644 Binary files a/bin/Backend/Microcontroller/Bitmask.class and b/bin/Model/Backend/Microcontroller/Bitmask.class differ diff --git a/bin/Backend/Microcontroller/EEPROM.class b/bin/Model/Backend/Microcontroller/EEPROM.class similarity index 81% rename from bin/Backend/Microcontroller/EEPROM.class rename to bin/Model/Backend/Microcontroller/EEPROM.class index f2dbbc3..1dcbda2 100644 Binary files a/bin/Backend/Microcontroller/EEPROM.class and b/bin/Model/Backend/Microcontroller/EEPROM.class differ diff --git a/bin/Backend/Microcontroller/PIC.class b/bin/Model/Backend/Microcontroller/PIC.class similarity index 91% rename from bin/Backend/Microcontroller/PIC.class rename to bin/Model/Backend/Microcontroller/PIC.class index e41de5d..f12c943 100644 Binary files a/bin/Backend/Microcontroller/PIC.class and b/bin/Model/Backend/Microcontroller/PIC.class differ diff --git a/bin/Backend/Microcontroller/RAM.class b/bin/Model/Backend/Microcontroller/RAM.class similarity index 98% rename from bin/Backend/Microcontroller/RAM.class rename to bin/Model/Backend/Microcontroller/RAM.class index 57b1752..311c978 100644 Binary files a/bin/Backend/Microcontroller/RAM.class and b/bin/Model/Backend/Microcontroller/RAM.class differ diff --git a/bin/Backend/Microcontroller/STACK.class b/bin/Model/Backend/Microcontroller/STACK.class similarity index 81% rename from bin/Backend/Microcontroller/STACK.class rename to bin/Model/Backend/Microcontroller/STACK.class index c30f16a..700ee44 100644 Binary files a/bin/Backend/Microcontroller/STACK.class and b/bin/Model/Backend/Microcontroller/STACK.class differ diff --git a/bin/Backend/Microcontroller/WATCHDOG.class b/bin/Model/Backend/Microcontroller/WATCHDOG.class similarity index 69% rename from bin/Backend/Microcontroller/WATCHDOG.class rename to bin/Model/Backend/Microcontroller/WATCHDOG.class index f903c95..1cb2be9 100644 Binary files a/bin/Backend/Microcontroller/WATCHDOG.class and b/bin/Model/Backend/Microcontroller/WATCHDOG.class differ diff --git a/bin/Backend/Runtime/Environment.class b/bin/Model/Backend/Runtime/Environment.class similarity index 59% rename from bin/Backend/Runtime/Environment.class rename to bin/Model/Backend/Runtime/Environment.class index 8b51cd9..8e1fd93 100644 Binary files a/bin/Backend/Runtime/Environment.class and b/bin/Model/Backend/Runtime/Environment.class differ diff --git a/bin/Model/Backend/Runtime/Main.class b/bin/Model/Backend/Runtime/Main.class new file mode 100644 index 0000000..b4e6ce5 Binary files /dev/null and b/bin/Model/Backend/Runtime/Main.class differ diff --git a/bin/Model/Backend/Runtime/ProgramStepInformation.class b/bin/Model/Backend/Runtime/ProgramStepInformation.class new file mode 100644 index 0000000..f9ca59c Binary files /dev/null and b/bin/Model/Backend/Runtime/ProgramStepInformation.class differ diff --git a/bin/Model/Backend/Runtime/TODO.class b/bin/Model/Backend/Runtime/TODO.class new file mode 100644 index 0000000..0721185 Binary files /dev/null and b/bin/Model/Backend/Runtime/TODO.class differ diff --git a/bin/Backend/Runtime/Testfile.class b/bin/Model/Backend/Runtime/Testfile.class similarity index 61% rename from bin/Backend/Runtime/Testfile.class rename to bin/Model/Backend/Runtime/Testfile.class index e2f3065..f757b25 100644 Binary files a/bin/Backend/Runtime/Testfile.class and b/bin/Model/Backend/Runtime/Testfile.class differ diff --git a/bin/Model/Backend/Runtime/WATCHDOG.class b/bin/Model/Backend/Runtime/WATCHDOG.class new file mode 100644 index 0000000..7bcb98a Binary files /dev/null and b/bin/Model/Backend/Runtime/WATCHDOG.class differ diff --git a/bin/Model/Backend/Statistics/ErrorHandling/BackendErrorCounter.class b/bin/Model/Backend/Statistics/ErrorHandling/BackendErrorCounter.class new file mode 100644 index 0000000..1889d08 Binary files /dev/null and b/bin/Model/Backend/Statistics/ErrorHandling/BackendErrorCounter.class differ diff --git a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class similarity index 56% rename from bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class rename to bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class index 2402591..db1d228 100644 Binary files a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class and b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class differ diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class new file mode 100644 index 0000000..39fcbfa Binary files /dev/null and b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class differ diff --git a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.class b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.class similarity index 51% rename from bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.class rename to bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.class index d1acb2d..0b92a19 100644 Binary files a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.class and b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.class differ diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class new file mode 100644 index 0000000..43ec6c5 Binary files /dev/null and b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class differ diff --git a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class similarity index 90% rename from bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class rename to bin/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class index 107a049..7e4b9d6 100644 Binary files a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class and b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class differ diff --git a/src/Backend/Runtime/ProgramStepInformation.java b/src/Backend/Runtime/ProgramStepInformation.java deleted file mode 100755 index e14e78d..0000000 --- a/src/Backend/Runtime/ProgramStepInformation.java +++ /dev/null @@ -1,7 +0,0 @@ -package Backend.Runtime; - -import Backend.Microcontroller.PIC; - -public class ProgramStepInformation { - private PIC oPIC; -} diff --git a/src/Backend/Runtime/WATCHDOG.java b/src/Backend/Runtime/WATCHDOG.java deleted file mode 100644 index e25f1f1..0000000 --- a/src/Backend/Runtime/WATCHDOG.java +++ /dev/null @@ -1,5 +0,0 @@ -package Backend.Runtime; - -public enum WATCHDOG { - -} diff --git a/src/Backend/BackendCommandProcessing/InformationConnecter.java b/src/Model/Backend/BackendCommandProcessing/InformationConnecter.java similarity index 97% rename from src/Backend/BackendCommandProcessing/InformationConnecter.java rename to src/Model/Backend/BackendCommandProcessing/InformationConnecter.java index d3da198..f306d14 100755 --- a/src/Backend/BackendCommandProcessing/InformationConnecter.java +++ b/src/Model/Backend/BackendCommandProcessing/InformationConnecter.java @@ -1,6 +1,6 @@ -package Backend.BackendCommandProcessing; +package Model.Backend.BackendCommandProcessing; -import Backend.Microcontroller.PIC; +import Model.Backend.Microcontroller.PIC; public class InformationConnecter { diff --git a/src/Backend/EepromLoader/ReadEepromFile.java b/src/Model/Backend/EepromLoader/ReadEepromFile.java similarity index 96% rename from src/Backend/EepromLoader/ReadEepromFile.java rename to src/Model/Backend/EepromLoader/ReadEepromFile.java index f94f52c..7edbf20 100755 --- a/src/Backend/EepromLoader/ReadEepromFile.java +++ b/src/Model/Backend/EepromLoader/ReadEepromFile.java @@ -1,4 +1,4 @@ -package Backend.EepromLoader; +package Model.Backend.EepromLoader; import java.io.BufferedReader; import java.io.File; @@ -6,7 +6,7 @@ import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; -import Backend.Microcontroller.PIC; +import Model.Backend.Microcontroller.PIC; public class ReadEepromFile { diff --git a/src/Backend/InterruptHandling/InterruptServiceHandler.java b/src/Model/Backend/InterruptHandling/InterruptServiceHandler.java similarity index 76% rename from src/Backend/InterruptHandling/InterruptServiceHandler.java rename to src/Model/Backend/InterruptHandling/InterruptServiceHandler.java index 852cab4..58caa99 100644 --- a/src/Backend/InterruptHandling/InterruptServiceHandler.java +++ b/src/Model/Backend/InterruptHandling/InterruptServiceHandler.java @@ -1,4 +1,4 @@ -package Backend.InterruptHandling; +package Model.Backend.InterruptHandling; public class InterruptServiceHandler extends Thread { diff --git a/src/Backend/InterruptHandling/InterruptServiceHandlingTable.java b/src/Model/Backend/InterruptHandling/InterruptServiceHandlingTable.java similarity index 93% rename from src/Backend/InterruptHandling/InterruptServiceHandlingTable.java rename to src/Model/Backend/InterruptHandling/InterruptServiceHandlingTable.java index a9b6ef7..0d87d5e 100644 --- a/src/Backend/InterruptHandling/InterruptServiceHandlingTable.java +++ b/src/Model/Backend/InterruptHandling/InterruptServiceHandlingTable.java @@ -1,4 +1,4 @@ -package Backend.InterruptHandling; +package Model.Backend.InterruptHandling; /** * Class contains methods which calls a method to an overhanded value. diff --git a/src/Backend/Microcontroller/Bitmask.java b/src/Model/Backend/Microcontroller/Bitmask.java similarity index 97% rename from src/Backend/Microcontroller/Bitmask.java rename to src/Model/Backend/Microcontroller/Bitmask.java index 0065fca..af77901 100755 --- a/src/Backend/Microcontroller/Bitmask.java +++ b/src/Model/Backend/Microcontroller/Bitmask.java @@ -1,4 +1,4 @@ -package Backend.Microcontroller; +package Model.Backend.Microcontroller; public class Bitmask { /** diff --git a/src/Backend/Microcontroller/EEPROM.java b/src/Model/Backend/Microcontroller/EEPROM.java similarity index 92% rename from src/Backend/Microcontroller/EEPROM.java rename to src/Model/Backend/Microcontroller/EEPROM.java index 1f88cf8..7f24725 100755 --- a/src/Backend/Microcontroller/EEPROM.java +++ b/src/Model/Backend/Microcontroller/EEPROM.java @@ -1,4 +1,4 @@ -package Backend.Microcontroller; +package Model.Backend.Microcontroller; /** * @author Aaron Moser * @date 23.06.2021 diff --git a/src/Backend/Microcontroller/PIC.java b/src/Model/Backend/Microcontroller/PIC.java similarity index 97% rename from src/Backend/Microcontroller/PIC.java rename to src/Model/Backend/Microcontroller/PIC.java index 698d528..1b6ca9a 100755 --- a/src/Backend/Microcontroller/PIC.java +++ b/src/Model/Backend/Microcontroller/PIC.java @@ -1,4 +1,4 @@ -package Backend.Microcontroller; +package Model.Backend.Microcontroller; /** * @author Aaron Moser diff --git a/src/Backend/Microcontroller/RAM.java b/src/Model/Backend/Microcontroller/RAM.java similarity index 95% rename from src/Backend/Microcontroller/RAM.java rename to src/Model/Backend/Microcontroller/RAM.java index 4d591c0..47a595c 100755 --- a/src/Backend/Microcontroller/RAM.java +++ b/src/Model/Backend/Microcontroller/RAM.java @@ -1,4 +1,4 @@ -package Backend.Microcontroller; +package Model.Backend.Microcontroller; /** * @author Aaron Moser diff --git a/src/Backend/Microcontroller/STACK.java b/src/Model/Backend/Microcontroller/STACK.java similarity index 93% rename from src/Backend/Microcontroller/STACK.java rename to src/Model/Backend/Microcontroller/STACK.java index cc0816c..d7bb61e 100755 --- a/src/Backend/Microcontroller/STACK.java +++ b/src/Model/Backend/Microcontroller/STACK.java @@ -1,4 +1,4 @@ -package Backend.Microcontroller; +package Model.Backend.Microcontroller; import java.util.EmptyStackException; diff --git a/src/Backend/Microcontroller/WATCHDOG.java b/src/Model/Backend/Microcontroller/WATCHDOG.java similarity index 94% rename from src/Backend/Microcontroller/WATCHDOG.java rename to src/Model/Backend/Microcontroller/WATCHDOG.java index 4fb9bea..f8d54df 100755 --- a/src/Backend/Microcontroller/WATCHDOG.java +++ b/src/Model/Backend/Microcontroller/WATCHDOG.java @@ -1,4 +1,4 @@ -package Backend.Microcontroller; +package Model.Backend.Microcontroller; /** * @author Aaron Moser diff --git a/src/Backend/Runtime/Environment.java b/src/Model/Backend/Runtime/Environment.java similarity index 90% rename from src/Backend/Runtime/Environment.java rename to src/Model/Backend/Runtime/Environment.java index 5c53d25..0926c5b 100755 --- a/src/Backend/Runtime/Environment.java +++ b/src/Model/Backend/Runtime/Environment.java @@ -4,13 +4,13 @@ * @lastchange 21.02.2022 */ -package Backend.Runtime; +package Model.Backend.Runtime; import java.util.ArrayList; -import Backend.Microcontroller.PIC; -import Backend.Microcontroller.WATCHDOG; -import Frontend.PIC_SIMULATOR_GUI_JAVA.GUIMainFrame; +import Model.Backend.Microcontroller.PIC; +import Model.Backend.Microcontroller.WATCHDOG; +import View.PIC_SIMULATOR_GUI_JAVA.GUIMainFrame; public class Environment { diff --git a/src/Backend/Runtime/Main.java b/src/Model/Backend/Runtime/Main.java similarity index 76% rename from src/Backend/Runtime/Main.java rename to src/Model/Backend/Runtime/Main.java index a022f94..a678977 100755 --- a/src/Backend/Runtime/Main.java +++ b/src/Model/Backend/Runtime/Main.java @@ -1,4 +1,4 @@ -package Backend.Runtime; +package Model.Backend.Runtime; public class Main { public static void main(String[] args) { diff --git a/src/Model/Backend/Runtime/ProgramStepInformation.java b/src/Model/Backend/Runtime/ProgramStepInformation.java new file mode 100755 index 0000000..66c600a --- /dev/null +++ b/src/Model/Backend/Runtime/ProgramStepInformation.java @@ -0,0 +1,7 @@ +package Model.Backend.Runtime; + +import Model.Backend.Microcontroller.PIC; + +public class ProgramStepInformation { + private PIC oPIC; +} diff --git a/src/Backend/Runtime/TODO.java b/src/Model/Backend/Runtime/TODO.java similarity index 95% rename from src/Backend/Runtime/TODO.java rename to src/Model/Backend/Runtime/TODO.java index dddb1cb..3331d1e 100755 --- a/src/Backend/Runtime/TODO.java +++ b/src/Model/Backend/Runtime/TODO.java @@ -1,4 +1,4 @@ -package Backend.Runtime; +package Model.Backend.Runtime; public class TODO { diff --git a/src/Backend/Runtime/Testfile.java b/src/Model/Backend/Runtime/Testfile.java similarity index 75% rename from src/Backend/Runtime/Testfile.java rename to src/Model/Backend/Runtime/Testfile.java index 1b5d6c7..4966804 100644 --- a/src/Backend/Runtime/Testfile.java +++ b/src/Model/Backend/Runtime/Testfile.java @@ -1,4 +1,4 @@ -package Backend.Runtime; +package Model.Backend.Runtime; import java.util.ArrayList; diff --git a/src/Model/Backend/Runtime/WATCHDOG.java b/src/Model/Backend/Runtime/WATCHDOG.java new file mode 100644 index 0000000..32a7283 --- /dev/null +++ b/src/Model/Backend/Runtime/WATCHDOG.java @@ -0,0 +1,5 @@ +package Model.Backend.Runtime; + +public enum WATCHDOG { + +} diff --git a/src/Backend/Statistics/ErrorHandling/BackendErrorCounter.java b/src/Model/Backend/Statistics/ErrorHandling/BackendErrorCounter.java similarity index 81% rename from src/Backend/Statistics/ErrorHandling/BackendErrorCounter.java rename to src/Model/Backend/Statistics/ErrorHandling/BackendErrorCounter.java index 06c4991..1037999 100755 --- a/src/Backend/Statistics/ErrorHandling/BackendErrorCounter.java +++ b/src/Model/Backend/Statistics/ErrorHandling/BackendErrorCounter.java @@ -1,4 +1,4 @@ -package Backend.Statistics.ErrorHandling; +package Model.Backend.Statistics.ErrorHandling; public class BackendErrorCounter { private int iErrorCounter = 0; diff --git a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java b/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java similarity index 93% rename from src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java rename to src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java index f74a056..ce6f4c3 100755 --- a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java +++ b/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java @@ -1,4 +1,4 @@ -package Frontend.PIC_SIMULATOR_GUI_JAVA; +package View.PIC_SIMULATOR_GUI_JAVA; import java.awt.Color; import java.awt.Dimension; @@ -14,8 +14,8 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.border.Border; -import Backend.EepromLoader.ReadEepromFile; -import Backend.Runtime.Environment; +import Model.Backend.EepromLoader.ReadEepromFile; +import Model.Backend.Runtime.Environment; public class GUIMainFrame extends JFrame { @@ -72,16 +72,16 @@ public class GUIMainFrame extends JFrame { env.getPIC().get_WRegister()}; GUIRegisters oGUIRegisters = new GUIRegisters(); oGUIRegisters.setRegisters(aiRegisters); - GUIRegistersDetailed oGuiRegistersDetailed = new GUIRegistersDetailed(); + GUIRegistersDetailed oGUIRegistersDetailed = new GUIRegistersDetailed(); oConstraintsRegisterInformation.anchor = GridBagConstraints.WEST; oConstraintsRegisterInformation.gridx = 0; oConstraintsRegisterInformation.gridy = 0; oPanelRegisterInformation.add(oGUIRegisters, oConstraintsRegisterInformation); oConstraintsRegisterInformation.gridy = 1; oConstraintsRegisterInformation.anchor = GridBagConstraints.WEST; - oPanelRegisterInformation.add(oGuiRegistersDetailed, oConstraintsRegisterInformation); + oPanelRegisterInformation.add(oGUIRegistersDetailed, oConstraintsRegisterInformation); - this.setJMenuBar(new GUIMenuBar(env, this, oGUITestFileTable, oGUIRegisters)); + this.setJMenuBar(new GUIMenuBar(env, this, oGUITestFileTable, oGUIRegisters, oGUIRegistersDetailed)); this.setVisible(true); //make frame visible ImageIcon guiLogo = new ImageIcon("./pictures/gui_logo.png"); // create an ImageIcon diff --git a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java b/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java similarity index 97% rename from src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java rename to src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java index b19299f..a6a18a9 100644 --- a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java +++ b/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java @@ -1,4 +1,4 @@ -package Frontend.PIC_SIMULATOR_GUI_JAVA; +package View.PIC_SIMULATOR_GUI_JAVA; import java.awt.Color; import java.awt.Dimension; @@ -16,15 +16,16 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JPanel; - -import Backend.EepromLoader.ReadEepromFile; -import Backend.Runtime.Environment; +import Model.Backend.EepromLoader.ReadEepromFile; +import Model.Backend.Runtime.Environment; public class GUIMenuBar extends JMenuBar implements ActionListener { Environment oEnv; GUIMainFrame oGUIMainFrame; GUITestFileTable oGUITestFileTable; GUIRegisters oGUIRegisters; + GUIRegistersDetailed oGUIRegistersDetailed; + ArrayList oCheckBoxes; ReadEepromFile oRef; boolean[] bBreakpointSet; @@ -96,7 +97,7 @@ public class GUIMenuBar extends JMenuBar implements ActionListener { * Constructor initializes menubar. * @param frame */ - public GUIMenuBar(Environment env, GUIMainFrame mainframe, GUITestFileTable guitft, GUIRegisters guiregs) { //TODO maybe single components, with methods, of frame to set theme + public GUIMenuBar(Environment env, GUIMainFrame mainframe, GUITestFileTable guitft, GUIRegisters guiregs, GUIRegistersDetailed guiregsdet) { //TODO maybe single components, with methods, of frame to set theme //Custom Separators since default is not able to change background. oSeparator0 = new JMenuItem(); @@ -117,6 +118,7 @@ public class GUIMenuBar extends JMenuBar implements ActionListener { oGUIMainFrame = mainframe; oGUITestFileTable = guitft; oGUIRegisters = guiregs; + oGUIRegistersDetailed = guiregsdet; //File oFileMenu = new JMenu(sGermanLang[0]); @@ -370,6 +372,7 @@ public class GUIMenuBar extends JMenuBar implements ActionListener { oGUITestFileTable.setTheme(1); oGUIRegisters.setTheme(1); oGUIMainFrame.setTheme(1); + oGUIRegistersDetailed.setTheme(1); } //Change to light theme if (e.getSource() == oLightTheme) { @@ -378,6 +381,7 @@ public class GUIMenuBar extends JMenuBar implements ActionListener { oGUITestFileTable.setTheme(0); oGUIRegisters.setTheme(0); oGUIMainFrame.setTheme(0); + oGUIRegistersDetailed.setTheme(0); } //Microcontroller diff --git a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.java b/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.java similarity index 99% rename from src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.java rename to src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.java index 818743a..e353f47 100644 --- a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.java +++ b/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegisters.java @@ -1,4 +1,4 @@ -package Frontend.PIC_SIMULATOR_GUI_JAVA; +package View.PIC_SIMULATOR_GUI_JAVA; import java.awt.GridBagLayout; import java.util.ArrayList; @@ -183,6 +183,10 @@ public class GUIRegisters extends JPanel { this.add(oRightComponentPanel, oConstraints); } + private void changeWidth() { + + } + /** * Adds panels to panel list and textfields to textfield list */ diff --git a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java b/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java similarity index 51% rename from src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java rename to src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java index 83894a3..04a1d67 100644 --- a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java +++ b/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java @@ -1,5 +1,6 @@ -package Frontend.PIC_SIMULATOR_GUI_JAVA; +package View.PIC_SIMULATOR_GUI_JAVA; +import javax.sound.sampled.AudioSystem; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; @@ -7,10 +8,29 @@ import javax.swing.JTable; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; +import java.util.ArrayList; import java.awt.Color; public class GUIRegistersDetailed extends JPanel { + /** + * Color oWhite = new Color(255, 253, 250); + * Color oDarkGray = new Color(76, 78, 82); + * Color oDarkGrayB = new Color(47, 47, 47); + * Color oLightBlue = new Color(173, 216, 230); + * Color oOrangeDM = new Color(255, 170, 0); + * Color oLightBlueDM = new Color(0, 213, 255); + * Color oOrangeDMB = new Color(255, 85, 0); + * First Color == TextColor + * Second Color == BackgroundColor + * Third Color == BorderColor + * Fourth Color == TextColor Marked + * Fifth Color == BackgroundColor Marked + * Sixth Color == BorderColor Marked + */ + Color[] aoDarkTheme = {new Color(255, 253, 250), new Color(76, 78, 82), new Color(47, 47, 47), new Color(0, 213, 255), new Color(255, 170, 0), new Color(255, 85, 0)}; + Color[] aoLightTheme = {new Color(76, 78, 82), new Color(255, 253, 250), new Color(173, 216, 230), new Color(0, 213, 255), new Color(255, 170, 0), new Color(255, 85, 0)}; + JTable oStatusTable; JTable oOptionTable = new JTable(); JTable oIntconTable = new JTable(); @@ -23,8 +43,14 @@ public class GUIRegistersDetailed extends JPanel { JLabel oOptionLabel = new JLabel("OPTION"); JLabel oIntconLabel = new JLabel("INTCON"); + ArrayList oLabels = new ArrayList(); + ArrayList oPanels = new ArrayList(); + ArrayList oTables = new ArrayList(); + public GUIRegistersDetailed() { buildGUIRegistersDetailed(); + addComponentsList(); + setTheme(0); } private void buildGUIRegistersDetailed() { @@ -100,4 +126,63 @@ public class GUIRegistersDetailed extends JPanel { this.setBorder(BorderFactory.createLineBorder(Color.BLACK)); } + + public void addComponentsList() { + oLabels.add(oIntconLabel); + oLabels.add(oOptionLabel); + oLabels.add(oStatusLabel); + + oPanels.add(oIntconPanel); + oPanels.add(oOptionPanel); + oPanels.add(oStatusPanel); + + oTables.add(oIntconTable); + oTables.add(oOptionTable); + oTables.add(oStatusTable); + } + + public void setTheme(int iThemeNr) { + switch (iThemeNr) { + case 0: { + for (JLabel oLabel : oLabels) { + oLabel.setForeground(aoLightTheme[0]); + oLabel.setBackground(aoLightTheme[1]); + } + for (JPanel oPanel : oPanels) { + oPanel.setForeground(aoLightTheme[0]); + oPanel.setBackground(aoLightTheme[1]); + oPanel.setBorder(BorderFactory.createLineBorder(aoLightTheme[2])); + } + for (JTable oTable : oTables) { + oTable.setForeground(aoLightTheme[0]); + oTable.setBackground(aoLightTheme[1]); + oTable.setBorder(BorderFactory.createLineBorder(aoLightTheme[2])); + oTable.setGridColor(aoLightTheme[2]); + } + this.setForeground(aoLightTheme[0]); + this.setBackground(aoLightTheme[1]); + this.setBorder(BorderFactory.createLineBorder(aoLightTheme[2])); + }break; + case 1: { + for (JLabel oLabel : oLabels) { + oLabel.setForeground(aoDarkTheme[0]); + oLabel.setBackground(aoDarkTheme[1]); + } + for (JPanel oPanel : oPanels) { + oPanel.setForeground(aoDarkTheme[0]); + oPanel.setBackground(aoDarkTheme[1]); + oPanel.setBorder(BorderFactory.createLineBorder(aoDarkTheme[2])); + } + for (JTable oTable : oTables) { + oTable.setForeground(aoDarkTheme[0]); + oTable.setBackground(aoDarkTheme[1]); + oTable.setBorder(BorderFactory.createLineBorder(aoDarkTheme[2])); + oTable.setGridColor(aoDarkTheme[2]); + } + this.setForeground(aoDarkTheme[0]); + this.setBackground(aoDarkTheme[1]); + this.setBorder(BorderFactory.createLineBorder(aoDarkTheme[2])); + }break; + } + } } \ No newline at end of file diff --git a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java b/src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java similarity index 99% rename from src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java rename to src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java index 02bfa0f..4298e55 100644 --- a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java +++ b/src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java @@ -1,4 +1,4 @@ -package Frontend.PIC_SIMULATOR_GUI_JAVA; +package View.PIC_SIMULATOR_GUI_JAVA; import java.awt.Dimension; import java.awt.GridBagConstraints;