Changeset 333 for trunk/src_apollo/org/apollo/widgets

Timestamp:

09/26/08 10:04:49 (16 years ago)

Author:

bjn8

Message:

Improved recording interactions for faster idea capturing.
Various fixes for interactive widgets

Location:

trunk/src_apollo/org/apollo/widgets

Files:

• FramePlayer.java (modified) (1 diff)
• LinkedTrack.java (modified) (2 diffs)
• MetronomePlayer.java (modified) (1 diff)
• SampleRecorder.java (modified) (12 diffs)
• SampledTrack.java (modified) (2 diffs)

trunk/src_apollo/org/apollo/widgets/FramePlayer.java

@@ -193 +193 @@
                 updateButtonGUI();
                 updateBorderColor();
+                setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS); // TODO: Fix this work around
+                setWidgetEdgeThickness(TrackWidgetCommons.STOPPED_TRACK_EDGE_THICKNESS);
 
         }

trunk/src_apollo/org/apollo/widgets/LinkedTrack.java

@@ -228 +228 @@
                 updateBorderColor();
                 
+                setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS); // TODO: Fix this work around
+                setWidgetEdgeThickness(TrackWidgetCommons.STOPPED_TRACK_EDGE_THICKNESS);
+                
                 
         }
@@ -1871 +1874 @@
         }
         
+        @Override
+        public boolean isWidgetEdgeThicknessAdjustable() {
+                return false;
+        }
+        
+        
 
 }

trunk/src_apollo/org/apollo/widgets/MetronomePlayer.java

@@ -119 +119 @@
                 _swingComponent.add(enabledCheckbox);
                 
+                setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS); // TODO: Fix this work around
+                setWidgetEdgeThickness(TrackWidgetCommons.STOPPED_TRACK_EDGE_THICKNESS);
+                
         }
         

trunk/src_apollo/org/apollo/widgets/SampleRecorder.java

@@ -42 +42 @@
 import org.apollo.gui.WaveFormRenderer;
 import org.apollo.io.IconRepository;
+import org.apollo.items.RecordOverdubLauncher;
 import org.apollo.mvc.Observer;
 import org.apollo.mvc.Subject;
@@ -94 +95 @@
         private boolean hasExplicityStopped = false;
         
-        private boolean isSelfDestructable = false;
+        private boolean isTemporary = false;
         
         private final static int BUTTON_HEIGHT = 50;
@@ -109 +110 @@
         private final static int RENDER_POINTS_PER_SECOND = 20; // how many points to render each second
         
-        private final static String SELF_DESTRUCT_OFF_META = "permanent";
         private final static String COUNTDOWN_META = "countdown=";
         
-        
         public SampleRecorder(Text source, String[] args) {
+                this(source, args, false);
+        }
+        
+        public SampleRecorder(Text source, String[] args, boolean isTemporary) {
                 super(source, new JPanel(new GridBagLayout()),
                                 AnimatedSampleGraph.GRAPH_WIDTH + (2 * HORO_SPACING), 
@@ -120 +123 @@
                                 COUNTDOWN_SETTINGS_HEIGHT + BUTTON_HEIGHT + LABEL_HEIGHT + AnimatedSampleGraph.GRAPH_HEIGHT + (4 * VERT_SPACING));
                 
-                isSelfDestructable = !containsDataTrimmedIgnoreCase(SELF_DESTRUCT_OFF_META);
+                this.isTemporary = isTemporary;
+                
                 int countdown = getStrippedDataInt(COUNTDOWN_META, 0);
                 if (countdown < 0) countdown = 0;
@@ -200 +204 @@
                 buttonPane.add(stopButton, c);
 
-                
                 // Assemble
                 
@@ -230 +233 @@
 
                 setState(WidgetState.Ready, "Ready");
+        }
+        
+        /**
+         * Starts recording with playback... counts down if one is set
+         *
+         */
+        public void commenceOverdubRecording() {
+                shouldPlayback = true;
+                setState(WidgetState.CountingDown, "Counting down...");
+        }
+        
+        /**
+         * 
+         * @param countdown
+         *              The countdown in seconds
+         * 
+         * @throws IllegalArgumentException 
+         *                      if countdown isn't allowed (due to restraints, i.e. can't be negative)
+         */
+        public void setCountdown(int countdown) {
+                this.countDownSpinner.setValue(countdown);
         }
         
@@ -250 +274 @@
                 if (newState == WidgetState.Ready) {
 
+                        // Self destructable recorders are only temporary.. is returned back to a ready state then
+                        // get rid of them completely
+                        if (oldState != null && isTemporary) {
+                                removeSelf();
+                        }
+                        
                         recordButton.setVisible(true);
                         recordSynchedButton.setVisible(true);
@@ -330 +360 @@
                         } else {
                                 
-                                if (isSelfDestructable) {
+                                if (isTemporary) {
                                         // Remove this temporary widget
                                         removeSelf();
@@ -360 +390 @@
                                                          null);
                                          
-                                         if (isSelfDestructable) {
+                                         if (isTemporary) {
                                                  
                                                  targetFrame.addAllItems(trackWidget.getItems());
@@ -420 +450 @@
                 List<String> data = new LinkedList<String>();
                 
-                if (isSelfDestructable) 
-                        data.add(SELF_DESTRUCT_OFF_META);
-                
                 data.add(COUNTDOWN_META + countDownSpinner.getValue());
 
@@ -566 +593 @@
                         }
                         
-                } else if (e.getSource() == recordButton || e.getSource() == recordSynchedButton) {
+                } else if (e.getSource() == recordButton) {
                         assert (state == WidgetState.Ready);
-                        shouldPlayback = (e.getSource() == recordSynchedButton);
+                        shouldPlayback = false;
                         setState(WidgetState.CountingDown, "Counting down...");
+                } else if (e.getSource() == recordSynchedButton) {
+                        assert (state == WidgetState.Ready);
+                        
+                        Frame target = DisplayIO.getCurrentFrame();
+                        if (target  == null) return;
+
+                        // Create the launcher
+                        
+                        RecordOverdubLauncher launcher = new RecordOverdubLauncher((Integer)countDownSpinner.getValue());
+                        launcher.setPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY);
+
+                        // Pick it up
+                        FrameMouseActions.pickup(launcher);
+                        
                 }
 
@@ -962 +1003 @@
         }
         
+        @Override
+        public boolean isWidgetEdgeThicknessAdjustable() {
+                return false;
+        }
+        
 }

trunk/src_apollo/org/apollo/widgets/SampledTrack.java

@@ -444 +444 @@
                 // Make sure border color is correct
                 updateBorderColor();
+                setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS); // TODO: Fix this work around
                 setWidgetEdgeThickness(TrackWidgetCommons.STOPPED_TRACK_EDGE_THICKNESS);
 
@@ -1870 +1871 @@
                                         );
                 }
-
-        }
+                
+        }
+
+        @Override
+        public boolean isWidgetEdgeThicknessAdjustable() {
+                return false;
+        }
+        
+        
         
 }