Added the layereditor.

Note: Clicking the LED-Buttons does nothin yet, I don't wanna add 64 methods, and I couldn't figure it out how to do it in one.

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

Cube Control/cubeWorker.java

@@ -21,68 +21,115 @@
  * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * This class handles one animation file. This file can contain
+ * many animations, but has to be only 1Mbit in size (128*1024 Byte).
+ */
+
 public class cubeWorker {
-    final int UP = 0;
+
+// --------------------
+// Definitions
+// --------------------
+
+	final int UP = 0;
     final int DOWN = 1;
-    cubeWorker() {
 
-    }
+// --------------------
+// Fields
+// --------------------
 
-    // Adds a new Animation
-    // Returns id if ok, -1 if error or not enough space for
-    // another animation
-    public int addAnimation() {
+// --------------------
 
-           return -1;
-    }
-    
-    // Removes an animation
-    public void removeAnimation(int index) {
+	cubeWorker() {
 
     }
-    
-    // Returns how many animations are defined
+
+// --------------------
+// Misc. Methods
+// --------------------
+
+	// Returns how many animations are defined
     public int numOfAnimations() {
 
            return 3;
-    }
+    }   
     
-    // Selects an animation, on which the frame specific functions operate
-    // Returns -1 if it does not exist
+    // Returns how many frames are in the current animation
+    public int numOfFrames() {
+
+           return 3;
+    }
+
+	// Tells how many Frames you can add until you reached 1 Mbit...
+    public int framesRemaining() {
+
+           return 0;
+    }
+
+
+// --------------------
+// Animation Specific
+// --------------------
+
+	// Selects an animation on wich the animation specific functions operate
+    // Returns -1 if it does not exist, else its index
     public int selectAnimation(int index) {
-           System.out.println("Animation " + index + " selected");
-           return -1;
+           System.out.println("Animation " + index + " selected.");
+           
+		   return index;
     }
-    
-    public String getAnimationName(int index) {
 
-           return "TestAnim";
+	// Adds a new Animation
+    // Returns id if ok, -1 if error or not enough space for
+    // another animation
+    public int addAnimation() {
+
+           return -1;
     }
     
-    public void setAnimationName(int index, String s) {
+    // Removes an animation
+    public void removeAnimation() {
 
     }
     
-    public void moveAnimation(int dir){
-      if (dir == UP){
-        //animation moved up
-      } else if (dir == DOWN){
-        //animation moved down
-      }
+	public String getAnimationName() {
+
+           return "TestAnim";
     }
-    
-    // Returns how many frames are in the current animation
-    public int numOfFrames() {
 
-           return 3;
+	public void setAnimationName(String s) {
+
     }
-    
-    public String getFrameName(int index) {
+
+	public void moveAnimation(int dir) {
+		if (dir == UP){
+    		//animation moved up
+		
+		} else if (dir == DOWN){
+			//animation moved down
+
+		}
+	}
+
+// --------------------
+// Frame Specific
+// --------------------
+	
+	// Selects an animation on wich the frame specific functions operate
+    // Returns -1 if it does not exist, else its index
+	public int selectFrame(int index) {
+		System.out.println("Frame " + index + " selected.");
+
+		return index;
+	}
+
+	public String getFrameName() {
 
            return "Test";
     }
 
-    public void setFrameName(int index, String s) {
+    public void setFrameName(String s) {
 
     }
     
@@ -93,29 +140,35 @@ public class cubeWorker {
            return -1;
     }
     
-    // Remove a frame
-    public void removeFrame(int index) {
+    // Remove the frame
+    public void removeFrame() {
 
     }
     
     // Returns array with 64 bytes with led values
-    public byte[] getFrame(int index) {
+    public byte[] getFrame() {
 
            return null;
     }
     
-    public void setFrame(int index, byte[] data) {
+    public void setFrame(byte[] data) {
 
     }
-    
-    public void moveFrame(int dir){
-      if (dir == UP){
-        //animation moved up
-      } else if (dir == DOWN){
-        //animation moved down
-      }
-    }
-    
+
+	public void moveFrame(int dir){
+		if (dir == UP){
+    		// frame moved up
+      
+		} else if (dir == DOWN){
+			// frame moved down
+
+		}
+	}
+
+// --------------------
+// File Specific
+// --------------------
+
     // Loads an animation file into this object
     public int loadState(String path) {
 
@@ -127,6 +180,16 @@ public class cubeWorker {
            System.out.println("Saving to " + path);
            return 0;
     }
+
+	// Returns true if last saved state != current state
+    public boolean changedStateSinceSave() {
+
+           return true;
+    }
+
+// --------------------
+// Serial Port Specific
+// --------------------
     
     // sends state of object to led cube
     public int uploadState(String port) {
@@ -139,22 +202,13 @@ public class cubeWorker {
 
            return 0;
     }
-    
-    // Tells how many Frames you can add until you reached 1 Mbit...
-    public int framesRemaining() {
-
-           return 0;
-    }
-    
+        
     public String[] getSerialPorts() {
 
-           String[] sPorts = {"Select serial port..."};
+           String[] sPorts = { "Select serial port..." }; // Has to be the first entry
            return sPorts;
     }
-    
-    // Returns true if last saved state != current state
-    public boolean changedStateSinceSave() {
 
-           return true;
-    }
+// --------------------
+
 }

Cube Control/frame.java

@@ -47,9 +47,10 @@ public class frame extends JFrame {
   private JButton frameDown = new JButton();
   private JButton frameAdd = new JButton();
   private JButton frameRemove = new JButton();
-  private JList jList2 = new JList();
-  private DefaultListModel jList2Model = new DefaultListModel();
-  private JScrollPane jList2ScrollPane = new JScrollPane(jList2);
+  private JButton frame = new JButton();
+  private JList animList = new JList();
+  private DefaultListModel animModel = new DefaultListModel();
+  private JScrollPane animScrollPane = new JScrollPane(animList);
   private JButton animUp = new JButton();
   private JButton animDown = new JButton();
   private JButton animAdd = new JButton();
@@ -93,10 +94,10 @@ public class frame extends JFrame {
     }
     
     for(int i = 0; i < worker.numOfAnimations(); i++){
-      jList2Model.addElement(worker.getAnimationName(i));
+      animModel.addElement(worker.getAnimationName());
     }
     for(int i = 0; i < worker.numOfFrames(); i++){
-      frameListModel.add(i, worker.getFrameName(i));
+      frameListModel.add(i, worker.getFrameName());
     }
 
     addWindowListener(new WindowAdapter() {
@@ -245,10 +246,10 @@ public class frame extends JFrame {
       }
     });
 
-    jList2ScrollPane.setBounds(8, 264, 209, 121);
-    jList2.setModel(jList2Model);
+    animScrollPane.setBounds(8, 264, 209, 121);
+    animList.setModel(animModel);
     //jList2Model.addElement("");
-    cp.add(jList2ScrollPane);
+    cp.add(animScrollPane);
     animUp.setBounds(224, 264, 99, 25);
     animUp.setText("Move up");
     animUp.setFont(new Font("Dialog", Font.PLAIN, 13));
@@ -346,10 +347,10 @@ public class frame extends JFrame {
     frameRemaining.setText("2048");
     frameRemaining.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameRemaining);
-    jList2.setFont(new Font("Dialog", Font.PLAIN, 13));
+    animList.setFont(new Font("Dialog", Font.PLAIN, 13));
     frameList.setFont(new Font("Dialog", Font.PLAIN, 13));
     // Ende Komponenten
-    jList2.addListSelectionListener(new MyListSelectionListener(jList2, worker));
+    animList.addListSelectionListener(new MyListSelectionListener(animList, worker));
     setResizable(false);
     setVisible(true);
   }
@@ -358,7 +359,7 @@ public class frame extends JFrame {
 
   // Anfang Ereignisprozeduren
   public void editA_ActionPerformed(ActionEvent evt) {
-
+     layerEditFrame layerFrame1 = new layerEditFrame();
   }
 
   public void editB_ActionPerformed(ActionEvent evt) {
@@ -417,28 +418,28 @@ public class frame extends JFrame {
   }
 
   public void frameRemove_ActionPerformed(ActionEvent evt) {
-         worker.removeFrame(jList2.getSelectedIndex());
+         worker.removeFrame();
          frameRemaining.setText(Integer.toString(worker.framesRemaining()));
   }
 
   public void animUp_ActionPerformed(ActionEvent evt) {
-         int i = jList2.getSelectedIndex();
-         if ((i > 0) && (jList2Model.getSize() >= 2)) {
-            Object tmp = jList2Model.get(i);
-            jList2Model.set(i, jList2Model.get(i - 1));
-            jList2Model.set(i - 1, tmp);
-            jList2.setSelectedIndex(i - 1);
+         int i = animList.getSelectedIndex();
+         if ((i > 0) && (animModel.getSize() >= 2)) {
+            Object tmp = animModel.get(i);
+            animModel.set(i, animModel.get(i - 1));
+            animModel.set(i - 1, tmp);
+            animList.setSelectedIndex(i - 1);
             worker.moveAnimation(worker.UP);
          }
   }
 
   public void animDown_ActionPerformed(ActionEvent evt) {
-         int i = jList2.getSelectedIndex();
-         if ((i >= 0) && (jList2Model.getSize() >= 2) && (i < (jList2Model.getSize() - 1))) {
-            Object tmp = jList2Model.get(i);
-            jList2Model.set(i, jList2Model.get(i + 1));
-            jList2Model.set(i + 1, tmp);
-            jList2.setSelectedIndex(i + 1);
+         int i = animList.getSelectedIndex();
+         if ((i >= 0) && (animModel.getSize() >= 2) && (i < (animModel.getSize() - 1))) {
+            Object tmp = animModel.get(i);
+            animModel.set(i, animModel.get(i + 1));
+            animModel.set(i + 1, tmp);
+            animList.setSelectedIndex(i + 1);
             worker.moveAnimation(worker.DOWN);
          }
   }
@@ -451,7 +452,7 @@ public class frame extends JFrame {
   }
 
   public void animRemove_ActionPerformed(ActionEvent evt) {
-     worker.removeAnimation(jList2.getSelectedIndex());
+     worker.removeAnimation();
   }
 
   public void load_ActionPerformed(ActionEvent evt) {

Cube Control/layerEditFrame.java

@@ -0,0 +1,112 @@
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.event.*;
+
+/**
+  *
+  * Beschreibung
+  *
+  * @version 1.0 vom 11/16/2011
+  * @author
+  */
+
+public class layerEditFrame extends JFrame {
+  // Anfang Attribute
+  private JPanel panelLED1 = new JPanel(null, true);
+  public static ImageIcon on = new ImageIcon("LEDon.png");
+  public static ImageIcon off = new ImageIcon("LEDoff.png");
+  JButton[][] ledPanels = new JButton[8][8];
+
+  // Ende Attribute
+
+  public layerEditFrame() {
+    // Frame-Initialisierung
+    super("Layer Edit");
+    setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+    int frameWidth = 180;
+    int frameHeight = 230;
+    setSize(frameWidth, frameHeight);
+    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+    int x = (d.width - getSize().width) / 2;
+    int y = (d.height - getSize().height) / 2;
+    setLocation(x, y);
+    setResizable(false);
+    Container cp = getContentPane();
+    cp.setLayout(null);
+
+    for(int i = 0; i < 8; i++){
+      for(int j = 0; j < 8; j++){
+         System.out.println(x);
+         System.out.println(y);
+         ledPanels[i][j] = new JButton(on);
+         ledPanels[i][j].setBounds((i*20)+5, (j*20)+5, 15, 15);
+         ledPanels[i][j].setVisible(true);
+         cp.add(ledPanels[i][j]);
+      }
+    }
+    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);
+    cancelBtn.setBounds(80, 170, 80, 25);
+    cancelBtn.setFont(new Font("Dialog", Font.PLAIN, 13));
+    cp.add(cancelBtn);
+    setVisible(true);
+    
+
+    
+    saveBtn.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent evt) {
+        save();
+      }
+    });
+
+    cancelBtn.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent evt) {
+        cancel();
+      }
+    });
+
+    
+    addWindowListener(new WindowAdapter() {
+      public void windowClosing(WindowEvent evt) {
+
+             saveExitDialog();
+             dispose();
+      }
+    });
+  }
+    // Anfang Komponenten
+
+    // Ende Komponenten
+  /*public void btnClicked(){
+    if (getIcon() == on){
+      setIcon(off);
+    } else {
+      setIcon(on);
+    }
+  } */
+
+  public void cancel(){
+    dispose();
+  }
+
+  
+  public void save(){
+
+  }
+
+  private int saveExitDialog() {
+    String[] Optionen = {"Yes", "No"};
+    int Auswahl = JOptionPane.showOptionDialog(this, "Do you want to save your changes?", "Save?", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, Optionen, Optionen[0]);
+    if (Auswahl == JOptionPane.YES_OPTION) {
+       save();
+       return 1;
+    } else {
+       return 0;
+    }
+  }
+}

Cube Control/layerEditFrame.jfm

@@ -0,0 +1,56 @@
+object layerEditFrame: TFGUIFormular
+  Left = 459
+  Top = 62
+  BorderIcons = [biSystemMenu, biMinimize]
+  Caption = 'layerEditFrame'
+  ClientHeight = 396
+  ClientWidth = 458
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -10
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  FormStyle = fsMDIChild
+  OldCreateOrder = True
+  Position = poDesigned
+  Visible = True
+  OnClose = FormClose
+  OnCloseQuery = FormCloseQuery
+  OnResize = FormResize
+  FrameType = 5
+  Resizable = False
+  Undecorated = False
+  Background = clBtnFace
+  PixelsPerInch = 96
+  TextHeight = 13
+  object panelLED1: TJPanel
+    Tag = 12
+    Left = 16
+    Top = 24
+    Width = 57
+    Height = 57
+    Foreground = 3355443
+    Background = 15658734
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -12
+    Font.Name = 'Dialog'
+    Font.Style = [fsBold]
+    Border.BorderType = NoBorder
+    Border.LineColor = clBlack
+    Border.LineThickness = 0
+    Border.LineRounded = False
+    Border.EtchHighlightColor = clBlack
+    Border.EtchShadowColor = clBlack
+    Border.Etchtype = 0
+    Border.BevelHighlightColor = clBlack
+    Border.BevelShadowColor = clBlack
+    Border.Beveltype = 0
+    Border.MatteColor = clBlack
+    Border.MatteTop = 0
+    Border.MatteLeft = 0
+    Border.MatteBottom = 0
+    Border.MatteRight = 0
+  end
+end