Updated overall layout code

src/UI/Elements/BatteryPane.java

@@ -9,11 +9,39 @@
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
+import java.awt.*;
 
 public class BatteryPane extends JPanel {
    public BatteryPane() {
       TitledBorder title = BorderFactory.createTitledBorder("Battery Monitor");
       setBorder(title);
+
+      add(new BatteryCanvas());
+   }
+
+   private class BatteryCanvas extends JComponent {
+      Image batteryImage;
+
+      public BatteryCanvas(){
+         setOpaque(true);
+         setBackground(Color.black);
+         setPreferredSize(new Dimension(140,0));
+      }
+
+      public void paintComponent(Graphics g)
+      {
+         super.paintComponent(g);
+         g.setColor(Color.blue);
+         for (int x = 0; x < getWidth(); x++){
+            for (int y = 0; y < getHeight(); y++){
+               if ((x+y) % 11 == 0){
+                  g.drawRect(x,y,1,1);
+               }
+            }
+         }
+
+
+      }
    }
 
 }

src/UI/Elements/BoatSchematic.java

@@ -7,10 +7,17 @@
 
 package UI.Elements;
 
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
 import java.awt.*;
 
 public class BoatSchematic extends Canvas {
    public BoatSchematic() {
+      setBackground(Color.black);
+
+      setPreferredSize(new Dimension(0,140));
+
+
    }
 
 }

src/UI/Elements/BottomPane.java

@@ -12,15 +12,11 @@
 
 public class BottomPane extends JPanel {
 
-   BoatSchematic boatSchematic;
    Log log;
 
    public BottomPane() {
       setLayout(new BorderLayout());
 
-      boatSchematic = new BoatSchematic();
-      add(boatSchematic,BorderLayout.NORTH);
-
       log = new Log();
       add(log,BorderLayout.SOUTH);
    }

src/UI/Elements/CommandPane.java

@@ -9,12 +9,57 @@
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
+import java.awt.*;
 
 public class CommandPane extends JPanel {
+   ThrottlePane throttlePane;
+   SystemOptionsPane systemPane;
+
    public CommandPane() {
 
-      TitledBorder title = BorderFactory.createTitledBorder("Commands");
-      setBorder(title);
+      //TitledBorder title = BorderFactory.createTitledBorder("Commands");
+      //setBorder(title);
+
+      setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
+
+      throttlePane = new ThrottlePane();
+      add(throttlePane);
+
+      systemPane = new SystemOptionsPane();
+      add(systemPane);
+
+   }
+
+   private class ThrottlePane extends JPanel {
+      public ThrottlePane() {
+
+         TitledBorder title = BorderFactory.createTitledBorder("Throttle");
+         setBorder(title);
+
+         JCheckBox throttleLimiter = new JCheckBox("Throttle Limit");
+         JSpinner throttleLimitPicker = new JSpinner(new SpinnerNumberModel(100,0,100,1));
+
+         add(throttleLimiter);
+         add(throttleLimitPicker);
+      }
+   }
+
+   private class SystemOptionsPane extends JPanel {
+      public SystemOptionsPane() {
+         GridLayout layout = new GridLayout(0,2);
+         setLayout(layout);
+
+         TitledBorder title = BorderFactory.createTitledBorder("System");
+         setBorder(title);
+
+         int i = 0;
+         for (int x = 0; x <= 1; x++){
+            for (int y = 0; y <= 4; y++){
+               JButton button = new JButton("Button "+i++);
+               add(button);
+            }
+         }
+      }
    }
 
 }

src/UI/Elements/DataPane.java

@@ -0,0 +1,43 @@
+////////////////////////////////////////////////
+// URSS-Telemetry-Manager
+// Chris Dalke
+////////////////////////////////////////////////
+// Module: CommandPane
+////////////////////////////////////////////////
+
+package UI.Elements;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class DataPane extends JPanel {
+   GraphPane graphPane;
+   BatteryPane batteryPane;
+   BoatSchematic boatPane;
+
+   public DataPane() {
+
+      /*
+      TitledBorder title = BorderFactory.createTitledBorder("Data");
+      setBorder(title);
+      */
+
+      setLayout(new BorderLayout());
+
+      batteryPane = new BatteryPane();
+      graphPane = new GraphPane();
+      boatPane = new BoatSchematic();
+
+      JSplitPane splitPane1 = new JSplitPane(JSplitPane.VERTICAL_SPLIT, graphPane, boatPane);
+      JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, splitPane1, batteryPane);
+      //splitPane1.setDividerLocation(50.0);
+      //splitPane2.setDividerLocation(50.0);
+
+      add(splitPane2,BorderLayout.CENTER);
+   }
+
+}
+
+////////////////////////////////////////////////
+// End of code
+////////////////////////////////////////////////

src/UI/Elements/Log.java

@@ -32,7 +32,7 @@ public Log() {
       textArea.setEditable(false);
       add(scrollPane, BorderLayout.CENTER);
       scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-      scrollPane.setPreferredSize(new Dimension(0,200));
+      scrollPane.setPreferredSize(new Dimension(0,140));
 
       PrintStream con=new PrintStream(new TextAreaOutputStream(textArea));
       System.setOut(con);

src/UI/MainInterface.java

@@ -15,10 +15,9 @@
 public class MainInterface extends javax.swing.JFrame {
 
    JMenuBar menuBar;
-   BatteryPane batteryPane;
+   DataPane dataPane;
    CommandPane commandPane;
    IndicatorPane indicatorPane;
-   GraphPane graphPane;
    BottomPane bottomPane;
 
 
@@ -52,17 +51,14 @@ public void initComponents(){
 
       setLayout(new BorderLayout());
 
-
-      batteryPane = new BatteryPane();
       commandPane = new CommandPane();
       indicatorPane = new IndicatorPane();
-      graphPane = new GraphPane();
       bottomPane = new BottomPane();
+      dataPane = new DataPane();
 
       add(indicatorPane,BorderLayout.NORTH);
-      add(graphPane,BorderLayout.CENTER);
-      add(batteryPane,BorderLayout.EAST);
-      add(commandPane,BorderLayout.WEST);
+      add(dataPane,BorderLayout.CENTER);
+      add(commandPane,BorderLayout.EAST);
       add(bottomPane,BorderLayout.SOUTH);