Fixed Layereditor

Cube Control/cubeWorker.java

@@ -417,6 +417,7 @@ class AFrame {
   }
 
   byte[] getData() {
+    data[0] = 3;
     return data;
   }
 

Cube Control/frame.java

@@ -74,6 +74,8 @@ public class frame extends JFrame implements ListSelectionListener {
   private JButton download = new JButton();
   private JLabel jLabel4 = new JLabel();
   private JTextField frameRemaining = new JTextField();
+  private JLabel frmLngthLbl = new JLabel();
+  private JTextField frmLngthTxt = new JTextField();
   // Ende Attribute
 
   private cubeWorker worker = new cubeWorker();
@@ -262,7 +264,8 @@ public class frame extends JFrame implements ListSelectionListener {
     frameList.setModel(frameListModel);
     //frameListModel.addElement();
     cp.add(frameListScrollPane);
-    frameUp.setBounds(544, 8, 107, 33);
+
+    frameUp.setBounds(544, 8, 107, 28);
     frameUp.setText("Move up");
     frameUp.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameUp);
@@ -272,7 +275,7 @@ public class frame extends JFrame implements ListSelectionListener {
       }
     });
 
-    frameDown.setBounds(544, 152, 107, 33);
+    frameDown.setBounds(544, 122, 107, 28);
     frameDown.setText("Move down");
     frameDown.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameDown);
@@ -282,7 +285,7 @@ public class frame extends JFrame implements ListSelectionListener {
       }
     });
 
-    frameAdd.setBounds(544, 56, 107, 33);
+    frameAdd.setBounds(544, 46, 107, 28);
     frameAdd.setText("Add");
     frameAdd.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameAdd);
@@ -292,7 +295,7 @@ public class frame extends JFrame implements ListSelectionListener {
       }
     });
 
-    frameRemove.setBounds(544, 104, 107, 33);
+    frameRemove.setBounds(544, 84, 107, 28);
     frameRemove.setText("Remove");
     frameRemove.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameRemove);
@@ -301,6 +304,16 @@ public class frame extends JFrame implements ListSelectionListener {
         frameRemove_ActionPerformed(evt);
       }
     });
+    
+    frmLngthLbl.setBounds(536, 160, 113, 24);
+    frmLngthLbl.setText("Length of a frame");
+    frmLngthLbl.setFont(new Font("Dialog", Font.PLAIN, 13));
+    cp.add(frmLngthLbl);
+    
+    frmLngthTxt.setBounds(536, 184, 113, 24);
+    frmLngthTxt.setText("0");
+    frmLngthTxt.setFont(new Font("Dialog", Font.PLAIN, 13));
+    cp.add(frmLngthTxt);
 
     animScrollPane.setBounds(8, 264, 209, 121);
     animList.setModel(animModel);
@@ -425,7 +438,8 @@ public class frame extends JFrame implements ListSelectionListener {
 
   // Anfang Ereignisprozeduren
   public void editA_ActionPerformed(ActionEvent evt) {
-     // layerEditFrame layerFrame1 = new layerEditFrame(worker.getLayer(0));
+
+     layerEditFrame layerFrame1 = new layerEditFrame(worker.getFrame(animList.getSelectedIndex(), frameList.getSelectedIndex()), 0);
   }
 
   public void editB_ActionPerformed(ActionEvent evt) {

Cube Control/layerEditFrame.java

@@ -17,15 +17,18 @@ public class layerEditFrame extends JFrame {
   JButton[][] ledPanels = new JButton[8][8];
   ImageIcon on = new ImageIcon(getClass().getResource("LEDon.png"));
   ImageIcon off = new ImageIcon(getClass().getResource("LEDoff.png"));
+  byte[][] ledStatus = new byte[8][8];
   boolean changedStateSinceSave = false;
   byte[] frame;
+  int li;
 
   // Ende Attribute
 
-  public layerEditFrame(byte[] f) {
+  public layerEditFrame(byte[] f, int layerIndex) {
     // Frame-Initialisierung
     super("Layer Edit");
     frame = f;
+    li = layerIndex;
     setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
     int frameWidth = 180;
     int frameHeight = 230;
@@ -93,31 +96,44 @@ public class layerEditFrame extends JFrame {
 
     // Ende Komponenten
   private void loadData(){
-    byte[][] frameArray = new byte[8][8];
-    //Load the data from the bytearray 'frame' and write it into frameArray.length A 0 means off, everything else means on
-    for(int i = 0; i < frameArray.length; i++){            //
-      for(int j = 0; j < frameArray[i].length; j++){       //This ist just that we have a starting point....
-        frameArray[i][j] = 0;                              //
+
+    for(int i = 0; i < 8; i++){
+      int div = frame[li + i];
+      int[] rest = new int[8];
+      int ctr = 0;
+      while(div != 0){
+        rest[ctr] = div%2;
+        div = div/2;
+        ctr++;
       }
-    }
-    for(int i = 0; i < frameArray.length; i++){            //
-      for(int j = 0; j < frameArray[i].length; j++){       //Set the LED-Buttons
-        if(frameArray[i][j] == 0){
-           ledPanels[i][j].setIcon(off);
+
+      for(int j = 0; j < 8; j++){
+        if(rest[j] == 0){
+         ledPanels[li + j][i].setIcon(off);
         } else {
-           ledPanels[i][j].setIcon(on);
+         ledPanels[li + j][i].setIcon(on);
         }
+        ledStatus[li + j][i] = (byte) rest[j];
       }
+
     }
+
   }
 
+   byte[] getFinalFrame(){
+      return frame;
+   }
+
   public void btnClicked(int i, int j){
     changedStateSinceSave = true;
     if (ledPanels[i][j].getIcon() == on){
       ledPanels[i][j].setIcon(off);
+       ledStatus[i][j] = 0;
     } else {
       ledPanels[i][j].setIcon(on);
+       ledStatus[i][j] = 1;
     }
+
   }
 
   public void cancel(){
@@ -126,7 +142,31 @@ public class layerEditFrame extends JFrame {
 
   
   public void save(){
+    int ctr = 0;
+    byte[] tmpFrame = new byte[64];
     changedStateSinceSave = false;
+    int reihe = 0;
+    for(int j = 0; j < 8; j++){
+      for(int i = 0; i < 8; i++){
+        reihe += ((int) Math.pow(2, i)) * ledStatus[i][j];
+        System.out.println("LED-Status: " + ledStatus[i][j]);
+        System.out.println("Reihe: " + i);
+        System.out.println("Spalte: " + j);
+        System.out.println("Wertigkeit: " + ((int) Math.pow(2, i)));
+        System.out.println("Zusammen: " + ((int) Math.pow(2, j)) * ledStatus[i][j]);
+        System.out.println("Reihe nacher: " + reihe);
+        System.out.println();
+        ctr++;
+      }
+      tmpFrame[j] = (byte)reihe;
+      reihe = 0;
+      System.out.println("----");
+      System.out.println("Frame-Array, Position " + j + " = " + tmpFrame[j]);
+      System.out.println("----");
+    }
+      frame = tmpFrame;
+
+
   }
 
   private int saveExitDialog() {