Worked at movement

CubeControl/AFrame.java

@@ -32,10 +32,50 @@ import java.util.Arrays;
  * @version 1.0
  */
 
-public class AFrame {
+public class AFrame implements Comparable<AFrame> {
 	private short[] data = new short[64];
 	private short duration = 1;
 	private String name = "Frame";
+	private int order;
+	private static int orderIndex = 0;
+
+	/**
+	 * Compare this frame to another frame.
+	 * Compares the order in the frame list.
+	 * @return 0 if equal, -1 if this one comes first, 1 if last
+	 */
+	public int compareTo(AFrame compareFrame) {
+		if (getOrder() < compareFrame.getOrder()) {
+			return -1;
+		} else if (getOrder() == compareFrame.getOrder()) {
+			return 0;
+		} else {
+			return 1;
+		} 
+	}
+
+	/**
+	 * Get index of frame in list of frames.
+	 * @return index
+	 */
+	public int getOrder() {
+		return order;
+	}
+
+	/**
+	 * Set index of frame in list of frames.
+	 * @param newOrder new index
+	 */
+	public void setOrder(int newOrder) {
+		order = newOrder;
+	}
+
+	/**
+	 * Inserts frane at end of frame list.
+	 */
+	public AFrame() {
+		order = orderIndex++;
+	}
 
 	/**
 	 * Gets the Name of this Frame

CubeControl/Animation.java

@@ -22,6 +22,7 @@
  */
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Collections;
 
 /**
  * A collection of frames that represent an entire animation.
@@ -32,10 +33,50 @@ import java.util.List;
  * @version 1.0
  */
 
-public class Animation {
+public class Animation implements Comparable<Animation> {
 	List<AFrame> frames = new ArrayList<AFrame>();
 	private int lastFrameIndex = 0;
 	private String name = "Animation";
+	private int order;
+	private static int orderIndex = 0;
+
+	/**
+	 * Compare this animation to another animation.
+	 * Compares the order in the animations list.
+	 * @return 0 if equal, -1 if this one comes first, 1 if last
+	 */
+	public int compareTo(Animation compareAnimation) {
+		if (getOrder() < compareAnimation.getOrder()) {
+			return -1;
+		} else if (getOrder() == compareAnimation.getOrder()) {
+			return 0;
+		} else {
+			return 1;
+		} 
+	}
+
+	/**
+	 * Get index of animation in list of animations.
+	 * @return index
+	 */
+	public int getOrder() {
+		return order;
+	}
+
+	/**
+	 * Set index of animation in list of animations.
+	 * @param newOrder new index
+	 */
+	public void setOrder(int newOrder) {
+		order = newOrder;
+	}
+
+	/**
+	 * Inserts animation at end of animation list.
+	 */
+	public Animation() {
+		order = orderIndex++;
+	}
 
 	/**
 	 * Gets the name of this animation
@@ -130,12 +171,31 @@ public class Animation {
 		}
 	}
 
+	private void sortFrameList() {
+		Collections.sort(frames);
+	}
+
+	// return true if damaged and fixed partially
+	private boolean checkFrameList() {
+		for (int i = 0; i < frames.size(); i++) {
+			if (frames.get(i).getOrder() != i) {
+				frames.get(i).setOrder(frames.size());
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
-	 * Return size of this animation, in number of frames
+	 * Return size of this animation, in number of frames.
+	 * Also fixes the order of the frame list, if needed.
 	 * 
 	 * @return number of frames
 	 */
 	public int size() {
+		while(checkFrameList()) {
+			sortFrameList();
+		}
 		return frames.size();
 	}
 }

CubeControl/Frame.java

@@ -926,6 +926,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 	public static void main(String[] args) {
 		Frame f = new Frame("Cube Control");
 		Led3D l = f.get3D();
+		String lastCommand = null;
 		java.util.Scanner sc = new java.util.Scanner(System.in);
 		System.out.println("#### Cube Control Debug Console ####");
 		System.out.println("## Enter a Command ('h' for help) ##");
@@ -935,6 +936,16 @@ public class Frame extends JFrame implements ListSelectionListener {
 			if (sc.hasNextLine()) {
 				String s = sc.nextLine();
 
+				// Up arrow key
+				if (s.equals("\u001B[A")) {
+					if (lastCommand != null) {
+						System.out.println("Last command: " + lastCommand);
+						s = new String(lastCommand);
+					} else {
+						System.out.println("No last command!");
+					}
+				}
+
 				if (s.equals("p") || (s.equals("print")))
 					l.printTranslationData();
 
@@ -964,23 +975,20 @@ public class Frame extends JFrame implements ListSelectionListener {
 				}
 
 				if (s.startsWith("port ")) {
-					s = s.substring(5);
-					f.jComboBox1.addItem(s);
-					f.jComboBox1.setSelectedItem(s);
+					f.jComboBox1.addItem(s.substring(5));
+					f.jComboBox1.setSelectedItem(s.substring(5));
 				}
 
 				if (s.startsWith("send ")) {
-					s = s.substring(5);
 					HelperUtility.openPort((String) f.jComboBox1
 							.getSelectedItem());
-					short[] dat = toShortArray(s);
+					short[] dat = toShortArray(s.substring(5));
 					HelperUtility.writeData(dat, dat.length);
 					HelperUtility.closePort();
 				}
 
 				if (s.startsWith("read ")) {
-					s = s.substring(5);
-					int leng = Integer.parseInt(s);
+					int leng = Integer.parseInt(s.substring(5));
 					HelperUtility.openPort((String) f.jComboBox1
 							.getSelectedItem());
 					short[] data = HelperUtility.readData(leng);
@@ -988,6 +996,19 @@ public class Frame extends JFrame implements ListSelectionListener {
 					HelperUtility.closePort();
 				}
 
+				if (s.startsWith("frames ")) {
+					int anim = Integer.parseInt(s.substring(7));
+					if (anim >= f.worker.numOfAnimations()) {
+						System.out.println("Animation does not exist! Max: " + (f.worker.numOfAnimations() - 1));
+					} else {
+						System.out.println("Animation: " + f.worker.getAnimationName(anim));
+						for (int i = 0; i < f.worker.numOfFrames(anim); i++) {
+							AFrame frame = f.worker.getAnimationList().get(anim).get(i);
+							System.out.println("\tFrame " + frame.getOrder() + " (" + frame.getTime() + "): " + frame.getName());
+						}
+					}
+				}
+
 				if (s.equals("s") || s.equals("scan")) {
 					String[] sPorts = f.worker.getSerialPorts();
 					f.jComboBox1.removeAllItems();
@@ -1015,11 +1036,16 @@ public class Frame extends JFrame implements ListSelectionListener {
 					System.out
 							.println("\t'reset'  / 'r'\t:\tReset rotation of cube");
 					System.out
+							.println("\t'anims'  / 'a'\t:\tPrint animation tree");
+					System.out
+							.println("\t'frames *anim*\t:\tPrint frame tree");
+					System.out
 							.println("\t'help'   / 'h'\t:\tShow this message");
 					System.out
 							.println("\t'quit'   / 'q'\t:\tExit Cube Control");
 				}
 
+				lastCommand = new String(s);
 				System.out.print("$> ");
 			}
 		} while (true);

CubeControl/cubeWorker.java

@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
+import java.util.Collections;
 
 /**
  * This class holds all Data of the Application. Additionally it performs the
@@ -98,12 +99,31 @@ public class cubeWorker {
 	// Misc. Methods
 	// --------------------
 
+	private void sortAnimationList() {
+		Collections.sort(animations);
+	}
+
+	// return true if damaged and fixed partially
+	private boolean checkAnimationList() {
+		for (int i = 0; i < animations.size(); i++) {
+			if (animations.get(i).getOrder() != i) {
+				animations.get(i).setOrder(animations.size());
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Get the number of animations in this worker.
+	 * Also fixes the order of the animation list, if needed.
 	 * 
 	 * @return number of animations
 	 */
 	public int numOfAnimations() {
+		while(checkAnimationList()) {
+			sortAnimationList();
+		}
 		return animations.size();
 	}