Fixed byte problems in layereditor

Signed-off-by: Max Nuding <the.short.german@gmail.com>

Cube Control/frame.java

@@ -9,28 +9,28 @@ import javax.media.j3d.*;
 import javax.vecmath.*;
 
 /*
- * frame.java
- *
- *
- * Copyright 2011 Thomas Buck <xythobuz@me.com>
- * Copyright 2011 Max Nuding <max.nuding@gmail.com>
- * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
- *
- * This file is part of LED-Cube.
- *
- * LED-Cube is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LED-Cube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
- */
+* frame.java
+*
+*
+* Copyright 2011 Thomas Buck <xythobuz@me.com>
+* Copyright 2011 Max Nuding <max.nuding@gmail.com>
+* Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+*
+* This file is part of LED-Cube.
+*
+* LED-Cube is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* LED-Cube is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with LED-Cube. If not, see <http://www.gnu.org/licenses/>.
+*/
 
 public class frame extends JFrame implements ListSelectionListener {
   // Anfang Variablen
@@ -154,7 +154,7 @@ public class frame extends JFrame implements ListSelectionListener {
     for(int i = 0; i < sPorts.length; i++){
       jComboBox1.addItem(sPorts[i]);
     }
-    
+
     for(int i = 0; i < worker.numOfAnimations(); i++){
       animModel.addElement(worker.getAnimationName(i));
     }
@@ -171,7 +171,7 @@ public class frame extends JFrame implements ListSelectionListener {
              System.exit(0);
       }
     });
-    int frameWidth = 661; 
+    int frameWidth = 661;
     int frameHeight = 417;
     setSize(frameWidth, frameHeight);
     Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
@@ -198,9 +198,9 @@ public class frame extends JFrame implements ListSelectionListener {
     branchgroup = new BranchGroup();
     branchgroup.addChild(transroot);
     universe.addBranchGraph(branchgroup);
-    
-    
-    
+
+
+
     //-------------
 
     editA.setBounds(264, 8, 107, 25);
@@ -354,12 +354,12 @@ 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));
@@ -511,11 +511,11 @@ public class frame extends JFrame implements ListSelectionListener {
   }
 
   public void editB_ActionPerformed(ActionEvent evt) {
-     // layerEditFrame layerFrame1 = new layerEditFrame(worker.getLayer(1));
+     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 1, worker);
   }
 
   public void editC_ActionPerformed(ActionEvent evt) {
-    // layerEditFrame layerFrame1 = new layerEditFrame(worker.getLayer(2));
+    layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 2, worker);
   }
 
   public void editD_ActionPerformed(ActionEvent evt) {
@@ -612,8 +612,8 @@ public class frame extends JFrame implements ListSelectionListener {
     int n = worker.numOfAnimations() - 1;
     // would have 0 anims after successfully adding one...
   /*if (n < 0) {
-      n = 0;
-    }*/
+n = 0;
+}*/
     animModel.clear();
     for (int i = 0; i < (n + 1); i++) {
         animModel.add(i, worker.getAnimationName(i));
@@ -708,3 +708,5 @@ public class frame extends JFrame implements ListSelectionListener {
   // Ende Methoden
 }
 
+
+

Cube Control/layerEditFrame.java

@@ -4,12 +4,12 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 /**
-  *
-  * Beschreibung
-  *
-  * @version 1.0 vom 11/16/2011
-  * @author
-  */
+*
+* Beschreibung
+*
+* @version 1.0 vom 11/16/2011
+* @author
+*/
 
 public class layerEditFrame extends JFrame {
   // Anfang Attribute
@@ -19,7 +19,7 @@ public class layerEditFrame extends JFrame {
   ImageIcon off = new ImageIcon(getClass().getResource("LEDoff.png"));
   byte[][] ledStatus = new byte[8][8];
   boolean changedStateSinceSave = false;
-  byte[] frame;
+  short[] frame;
   int li;
   boolean finish = false;
   cubeWorker worker = null;
@@ -30,11 +30,11 @@ public class layerEditFrame extends JFrame {
 
   public layerEditFrame(int animIndex, int frameIndex, int layerIndex, cubeWorker work) {
     // Frame-Initialisierung
-	super("Layer Edit");
-	worker = work;
-	animI = animIndex;
-	frameI = frameIndex;
-    frame = worker.getFrame(animIndex, frameIndex);
+    super("Layer Edit");
+    worker = work;
+    animI = animIndex;
+    frameI = frameIndex;
+    frame =  byteToShortArray(worker.getFrame(animIndex, frameIndex));
     li = layerIndex;
     setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
     int frameWidth = 180;
@@ -66,7 +66,7 @@ public class layerEditFrame extends JFrame {
     loadData();
     JButton saveBtn = new JButton("Save");
     JButton cancelBtn = new JButton("Cancel");
-    
+
     saveBtn.setBounds(5, 170, 70, 25);
     saveBtn.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(saveBtn);
@@ -74,9 +74,9 @@ public class layerEditFrame extends JFrame {
     cancelBtn.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(cancelBtn);
     setVisible(true);
-    
 
-    
+
+
     saveBtn.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
         save();
@@ -89,7 +89,7 @@ public class layerEditFrame extends JFrame {
       }
     });
 
-    
+
     addWindowListener(new WindowAdapter() {
       public void windowClosing(WindowEvent evt) {
              if(changedStateSinceSave){
@@ -128,10 +128,10 @@ public class layerEditFrame extends JFrame {
   }
 
    byte[] getFinalFrame(){
-	 if (finish == false) {
-		 return null;
-	 }
-	 return frame;
+      if (finish == false) {
+        return null;
+      }
+      return shortToByteArray(frame);
    }
 
   public void btnClicked(int i, int j){
@@ -150,23 +150,40 @@ public class layerEditFrame extends JFrame {
     dispose();
   }
 
-  
+
   public void save(){
     int ctr = 0;
-    byte[] tmpFrame = new byte[64];
+    short[] tmpFrame = new short[64];
     changedStateSinceSave = false;
-    int reihe = 0;
+    short 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];
+        reihe += ((short) Math.pow(2, i)) * ledStatus[i][j];
         ctr++;
       }
-      tmpFrame[j] = (byte)reihe;
+      tmpFrame[j] = reihe;
       reihe = 0;
     }
       frame = tmpFrame;
+      worker.setFrame(shortToByteArray(frame), animI, frameI);
       dispose();
-	  worker.setFrame(frame, animI, frameI);
+  }
+  
+  public byte[] shortToByteArray(short[] shrt){
+     byte[] tmpByte = new byte[shrt.length];
+     short min = 128;
+     for(int i = 0; i < tmpByte.length; i++){
+       tmpByte[i] = (byte) (shrt[i] - min);
+     }
+     return tmpByte;
+  }
+  
+  public short[] byteToShortArray(byte[] tmpByte){
+     short[] tmpShrt = new short[tmpByte.length];
+     for(int i = 0; i < tmpByte.length; i++){
+       tmpShrt[i] = (short) (tmpByte[i] + 128);
+     }
+     return tmpShrt;
   }
 
   private int saveExitDialog() {
@@ -180,3 +197,6 @@ public class layerEditFrame extends JFrame {
     }
   }
 }
+
+
+