Toggle legs, code cleanup

CubeControl/Frame.java

@@ -45,6 +45,7 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 	private JButton editG = new JButton();
 	private JButton editH = new JButton();
 	private JButton[] editButtons = { editA, editB, editC, editD, editE, editF, editG, editH };
+	private JButton toggleLegsButton = new JButton();
 	private DefaultListModel frameListModel = new DefaultListModel();
 	public JList frameList = new JList();
 	private JScrollPane frameListScrollPane = new JScrollPane(frameList);
@@ -90,9 +91,19 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 	private int lastSelectedAnim = 0;
 	public cubeWorker worker = new cubeWorker(this);
 	private boolean fileSelected = false;
+	private boolean showLegs = true;
 	private Frame thisFrame;
 	private static Frame recentFrame;
 
+	private void toggleLegs(){
+		ledView.toggleLegs();
+		if(showLegs) {
+			toggleLegsButton.setText("Beine aus");
+		} else {
+			toggleLegsButton.setText("Beine ein");
+		}
+	}
+
 	private int saveExitDialog() {
 		String[] Optionen = { "Yes", "No" };
 		int Auswahl = JOptionPane.showOptionDialog(this,
@@ -266,6 +277,26 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 		}
 	}
 
+	private void playAnimation() {
+		if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					for (int i = 0; i < frameList.getModel().getSize(); i++){
+						frameList.setSelectedIndex(i);
+						long time1 = (long) worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getTime();
+						long time = (long) (((time1+1) * 1000) / 24);
+						System.out.println("Wert: " + time1 + " Zeit: " + time);
+						try {
+							Thread.sleep(time);
+						} catch (Exception e) {
+							System.out.println(e);
+						}
+				} 
+		}
+	}
+
 	public Frame(String title) {
 		super(title);
 		thisFrame = this;
@@ -336,6 +367,15 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 			});
 		}
 
+		toggleLegsButton.setBounds(299, 312, 102, 34);
+		toggleLegsButton.setText("Beine aus");
+		cp.add(toggleLegsButton);
+		toggleLegsButton.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent evt){
+				toggleLegs();
+			}
+		});
+
 		// Add Frame List
 		frameListScrollPane.setBounds(339, 379, 187, 218);
 		frameList.setModel(frameListModel);
@@ -568,23 +608,7 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 		cp.add(playAnimation);
 		playAnimation.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt){
-				if (animList.getSelectedIndex() == -1) {
-					errorMessage("Please select an animation.");
-				} else if (frameList.getSelectedIndex() == -1) {
-					errorMessage("Please select a Frame.");
-				} else {
-					for (int i = 0; i < frameList.getModel().getSize(); i++){
-						frameList.setSelectedIndex(i);
-						long time1 = (long) worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getTime();
-						long time = (long) (((time1+1) * 1000) / 24);
-						System.out.println("Wert: " + time1 + " Zeit: " + time);
-						try {
-							Thread.sleep(time);
-						} catch (Exception e) {
-							System.out.println(e);
-						}
-					} 
-				}
+				playAnimation();
 			}
 		});
 	
@@ -594,23 +618,7 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 		cp.add(playAnimationFullscreen);
 		playAnimationFullscreen.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt){
-				if (animList.getSelectedIndex() == -1) {
-					errorMessage("Please select an animation.");
-				} else if (frameList.getSelectedIndex() == -1) {
-					errorMessage("Please select a Frame.");
-				} else {
-					for (int i = 0; i < frameList.getModel().getSize(); i++){
-						frameList.setSelectedIndex(i);
-						long time1 = (long) worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getTime();
-						long time = (long) (((time1+1) * 1000) / 24);
-						System.out.println("Wert: " + time1 + " Zeit: " + time);
-						try {
-							Thread.sleep(time);
-						} catch (Exception e) {
-							System.out.println(e);
-						}
-					} 
-				}
+				playAnimation();
 			}
 		});
 	
@@ -835,6 +843,9 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 
 				if (s.equals("r") || s.equals("reset"))
 					l.resetView();
+
+				if (s.equals("l"))
+					f.toggleLegs();
 		
 				if (s.equals("on") || s.equals("1")) {
 					short[] d = new short[64];

CubeControl/Led3D.java

@@ -51,6 +51,7 @@ public class Led3D extends MouseAdapter {
 	private Matrix4d fullScreenMat = null;
 	private Frame parentFrame = null;
 	private boolean inFullscreen = false;
+	private boolean showLegs = true;
 
 	private Sphere[][][] leds = new Sphere[8][8][8];
 	private static ColoringAttributes redColor = new ColoringAttributes(
@@ -65,6 +66,16 @@ public class Led3D extends MouseAdapter {
 			new Color3f(1.0f, 0.0f, 0.0f), new Color3f(1.0f, 0.0f, 0.0f), 64.0f);
 	private Background background;
 
+	
+	public void toggleLegs(){
+		if(showLegs){
+			group2.detach();
+		} else {
+			universe.addBranchGraph(group2);
+		}
+		showLegs = !showLegs;
+	}
+
 	/**
 	 * @param canv The Canvas3D we render our cube in
 	 */