Added view button stuff

zk · Jan 15, 2009 · 4d52063 · 4d52063
1 parent 742cf50
commit 4d52063
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 22 deletions.
diff --git a/bin-groovy/napplelabs/dbssim/ui/MacFrame$_addToolbarButton_closure1.class b/bin-groovy/napplelabs/dbssim/ui/MacFrame$_addToolbarButton_closure1.class
diff --git a/bin-groovy/napplelabs/dbssim/ui/MacFrame.class b/bin-groovy/napplelabs/dbssim/ui/MacFrame.class
diff --git a/bin-groovy/napplelabs/dbssim/ui/SimUI$_closure1.class b/bin-groovy/napplelabs/dbssim/ui/SimUI$_closure1.class
diff --git a/bin-groovy/napplelabs/dbssim/ui/SimUI$_closure1_closure3.class b/bin-groovy/napplelabs/dbssim/ui/SimUI$_closure1_closure3.class
diff --git a/bin-groovy/napplelabs/dbssim/ui/SimUI$_closure2.class b/bin-groovy/napplelabs/dbssim/ui/SimUI$_closure2.class
diff --git a/bin-groovy/napplelabs/dbssim/ui/SimUI$_closure2_closure4.class b/bin-groovy/napplelabs/dbssim/ui/SimUI$_closure2_closure4.class
diff --git a/bin-groovy/napplelabs/dbssim/ui/SimUI.class b/bin-groovy/napplelabs/dbssim/ui/SimUI.class
diff --git a/src/main/java/napplelabs/dbssim/TracePanel.java b/src/main/java/napplelabs/dbssim/TracePanel.java
@@ -48,6 +48,7 @@ public boolean isDone() {
 	}
 
 	public void run() {
+		done = false;
 		while(!isDone()) {
 		SwingUtilities.invokeLater(new Runnable() {
 				public void run() {
@@ -63,4 +64,12 @@ public void run() {
 			}
 		}
 	}
+
+	public void start() {
+		new Thread(this).start();
+	}
+
+	public void stop() {
+		this.done = true;
+	}
 }
diff --git a/src/main/java/napplelabs/dbssim/ui/MacFrame.groovy b/src/main/java/napplelabs/dbssim/ui/MacFrame.groovy
@@ -3,7 +3,7 @@
  */
 package napplelabs.dbssim.ui
 
-import javax.swing.JFrameimport java.awt.Dimensionimport javax.swing.SwingUtilitiesimport java.lang.Runnableimport com.explodingpixels.macwidgets.MacWidgetFactoryimport com.explodingpixels.macwidgets.TriAreaComponentimport java.awt.BorderLayoutimport com.explodingpixels.macwidgets.BottomBarSizeimport javax.swing.JLabelimport javax.swing.JPanelimport javax.swing.JButtonimport ddf.minim.Minimimport napplelabs.dbssim.NeuronSignalimport ddf.minim.signals.PinkNoiseimport napplelabs.dbssim.TracePanelimport ddf.minim.AudioOutputimport javax.swing.AbstractButtonimport javax.swing.JComponent/**
+import javax.swing.JFrameimport java.awt.Dimensionimport javax.swing.SwingUtilitiesimport java.lang.Runnableimport com.explodingpixels.macwidgets.MacWidgetFactoryimport com.explodingpixels.macwidgets.TriAreaComponentimport java.awt.BorderLayoutimport com.explodingpixels.macwidgets.BottomBarSizeimport javax.swing.JLabelimport javax.swing.JPanelimport javax.swing.JButtonimport ddf.minim.Minimimport napplelabs.dbssim.NeuronSignalimport ddf.minim.signals.PinkNoiseimport napplelabs.dbssim.TracePanelimport ddf.minim.AudioOutputimport javax.swing.AbstractButtonimport javax.swing.JComponentimport java.util.Listimport javax.swing.ButtonGroupimport com.explodingpixels.macwidgets.LabeledComponentGroup/**
  * @author zkim
  *
  */
@@ -13,6 +13,7 @@ public class MacFrame{
 	TriAreaComponent toolbar
 	TriAreaComponent bottombar
 	JPanel content;
+	List<JButton> toolbarButtons = []
 
 	public MacFrame() {
 
@@ -46,6 +47,29 @@ public class MacFrame{
 		toolbar.addComponentToCenter(comp)
 	}
 
+	def addToolbarButton(List<JButton> buttons) {
+
+		ButtonGroup group = new ButtonGroup();
+
+		buttons.eachWithIndex {button, i ->
+			button.putClientProperty("JButton.buttonType", "segmentedTextured");
+			if(i == 0) {
+				button.putClientProperty("JButton.segmentPosition", "first");
+			} else if(i == buttons.size()-1) {
+				button.putClientProperty("JButton.segmentPosition", "last");
+			} else {
+				button.putClientProperty("JButton.segmentPosition", "middle");
+			}
+
+			group.add(button)
+			button.setFocusable(false);
+		};
+
+        LabeledComponentGroup viewButtons = new LabeledComponentGroup(null, buttons);
+        //addToolbarComponentCenter(viewButtons.component)
+        revalidate()
+	}
+
 	public static void main(String[] args) {
 		MacFrame mf = new MacFrame();
 

diff --git a/src/main/java/napplelabs/dbssim/ui/SimUI.groovy b/src/main/java/napplelabs/dbssim/ui/SimUI.groovy
@@ -1,6 +1,6 @@
 package napplelabs.dbssim.ui
 
-import ddf.minim.Minimimport ddf.minim.AudioOutputimport napplelabs.dbssim.NeuronSignalimport napplelabs.dbssim.TracePanelimport ddf.minim.signals.PinkNoiseimport java.awt.BorderLayoutimport com.explodingpixels.macwidgets.MacButtonFactoryimport javax.swing.AbstractButtonimport javax.swing.JButtonimport javax.swing.ImageIconimport javax.swing.JToggleButtonimport javax.swing.ButtonGroupimport com.explodingpixels.macwidgets.LabeledComponentGroupclass SimUI {
+import ddf.minim.Minimimport ddf.minim.AudioOutputimport napplelabs.dbssim.NeuronSignalimport napplelabs.dbssim.TracePanelimport ddf.minim.signals.PinkNoiseimport java.awt.BorderLayoutimport com.explodingpixels.macwidgets.MacButtonFactoryimport javax.swing.AbstractButtonimport javax.swing.JButtonimport javax.swing.ImageIconimport javax.swing.JToggleButtonimport javax.swing.ButtonGroupimport com.explodingpixels.macwidgets.LabeledComponentGroupimport java.awt.event.ActionListenerimport javax.swing.SwingUtilitiesimport java.lang.Runnableclass SimUI {
 	MacFrame mf
 	public SimUI() {
 		mf = new MacFrame()
@@ -20,7 +20,8 @@ import ddf.minim.Minim
import ddf.minim.AudioOutput
import napplelabs.dbssim.Neu
 		out.addSignal(ns);
 		out.addSignal(new PinkNoise(0.1f));
 
-		TracePanel panel = new TracePanel(out);
+		final TracePanel panel = new TracePanel(out);
+		panel.start()
 
 		mf.content.add(panel, BorderLayout.CENTER)
 
@@ -31,29 +32,40 @@ import ddf.minim.Minim
import ddf.minim.AudioOutput
import napplelabs.dbssim.Neu
 
 		mf.addToolbarComponentRight(playButton)
 
+		JButton control = new JButton("Control");
+		control.putClientProperty("JButton.buttonType", "segmentedTextured");
+		control.putClientProperty("JButton.segmentPosition", "first");
+		control.setFocusable(false);
+		control.addActionListener({
+			mf.content.remove(panel)
+			SwingUtilities.invokeLater({
+				mf.content.repaint()
+				mf.revalidate()
+			} as Runnable)
+		} as ActionListener);
 
-		JToggleButton leftButton = new JToggleButton("Control");
+		JButton trace = new JButton("Trace");
-        
+		trace.putClientProperty("JButton.buttonType", "segmentedTextured");
-        leftButton.putClientProperty("JButton.buttonType", "segmentedTextured");
+		trace.putClientProperty("JButton.segmentPosition", "last");
-        leftButton.putClientProperty("JButton.segmentPosition", "first");
+		trace.setFocusable(false);
-        leftButton.setFocusable(false);
+		trace.addActionListener({
-
+			mf.content.add(panel, BorderLayout.CENTER)
-        JToggleButton rightButton = new JToggleButton("Trace");
+			SwingUtilities.invokeLater({
-        rightButton.putClientProperty("JButton.buttonType", "segmentedTextured");
+				mf.content.repaint()
-        rightButton.putClientProperty("JButton.segmentPosition", "last");
+				mf.revalidate()
-        rightButton.setFocusable(false);
+			} as Runnable)
-
+		} as ActionListener);
-        ButtonGroup group = new ButtonGroup();
+		
-        group.add(leftButton);
+		ButtonGroup group = new ButtonGroup();
-        group.add(rightButton);
+		group.add(control)
-
+		group.add(trace)
-        LabeledComponentGroup viewButtons = new LabeledComponentGroup(null, leftButton, rightButton);
+		
-        
+		LabeledComponentGroup viewButtons = new LabeledComponentGroup(null, control, trace);
-        mf.addToolbarComponentCenter(viewButtons.component)
+		mf.addToolbarComponentCenter(viewButtons.component)
 
 		mf.revalidate()
 
-		new Thread(panel).start()
+
 	}
 
 	public static void main(String[] args) {

diff --git a/target/classes/napplelabs/dbssim/TracePanel$1.class b/target/classes/napplelabs/dbssim/TracePanel$1.class
diff --git a/target/classes/napplelabs/dbssim/TracePanel.class b/target/classes/napplelabs/dbssim/TracePanel.class