Song length is now unlimited.

Author: DC37

MainWindow.fxml

@@ -59,7 +59,7 @@
                         <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#f8c090" height="32.0" layoutX="4.0" layoutY="4.0" stroke="TRANSPARENT" strokeType="INSIDE" width="390.0" />
                         <StackPane id="StackPane" layoutY="2.0">
                           <children>
-                            <TextField fx:id="songName" prefHeight="30.0" prefWidth="390.0" promptText="Song Name" />
+                            <TextField fx:id="songName" focusTraversable="false" prefHeight="30.0" prefWidth="390.0" promptText="Song Name" />
                             <Rectangle fill="#1e90ff00" height="30.0" mouseTransparent="true" stroke="#d09048" strokeType="INSIDE" strokeWidth="2.0" width="390.0" />
                           </children>
                         </StackPane>
@@ -927,7 +927,7 @@
                                 <Point3D />
                               </rotationAxis>
                             </Rectangle>
-                            <Slider fx:id="scrollbar" blockIncrement="1.0" majorTickUnit="4.0" max="374.0" minorTickCount="1" prefWidth="660.0">
+                            <Slider fx:id="scrollbar" blockIncrement="1.0" majorTickUnit="4.0" max="390.0" minorTickCount="1" prefWidth="660.0">
                               <rotationAxis>
                                 <Point3D />
                               </rotationAxis>

README.md

@@ -42,11 +42,15 @@ Tasklist:
 * Release to a test group (v0.9 - **Alpha Release** - December 25, 2013)
 * Measure line numbers (done - December 27, 2013)
 * Tempo selector interface (done - December 27, 2013)
+* Remove limit on song length (done - January 1, 2014)
 * Options dialog
 * Import MPC songs
 * Arranger mode
-* [optional] Staff extension lines
+* [optional] Staff ledger lines
+* Copy-paste sections / MPCTxtTools functionality
+* Test run on more operating systems
 * Release to a test group (v0.95 - **Beta Release** - Release date unknown)
+* Undo/redo
 * Bookmarks
 * Speedmarks
 * Import AMS songs

src/smp/components/controls/ArrowButton.java

@@ -1,7 +1,10 @@
 package smp.components.controls;
 
 import smp.ImageIndex;
+import smp.components.Values;
 import smp.components.general.ImagePushButton;
+import smp.components.staff.sequences.StaffNoteLine;
+import smp.components.staff.sequences.StaffSequence;
 import javafx.scene.control.Slider;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
@@ -59,6 +62,15 @@ public double getSkipAmount() {
     protected void reactPressed(MouseEvent event) {
         super.reactPressed(event);
         scrollbar.adjustValue(scrollbar.getValue() + skipAmount);
+        if (scrollbar.getMax() <= scrollbar.getValue()) {
+            scrollbar.setMax(scrollbar.getMax()
+                    + Values.NOTELINES_IN_THE_WINDOW * 2);
+            StaffSequence s = theStaff.getSequence();
+            int start = (int) scrollbar.getMax();
+            for(int i = start; i < start
+                    + Values.NOTELINES_IN_THE_WINDOW * 2; i++)
+                s.addLine(new StaffNoteLine(i));
+        }
     }
 
     @Override

src/smp/components/controls/Controls.java

@@ -30,6 +30,9 @@ public class Controls {
     /** The pointer to the loop button on the staff. */
     private LoopButton loop;
 
+    /** The pointer to the options button on the staff. */
+    private OptionsButton options;
+
     /** The pointer to the mute button on the staff. */
     private MuteButton mute;
 
@@ -128,10 +131,16 @@ private void initializeControlButtons() {
         loop = new LoopButton(SMPFXController.getLoopButton());
         mute = new MuteButton(SMPFXController.getMuteButton());
         muteA = new MuteInstButton(SMPFXController.getMuteAButton());
+        options = new OptionsButton(SMPFXController.getOptionsButton());
+
         mute.setMuteButton(muteA);
         muteA.setMuteButton(mute);
+        mute.setStaff(theStaff);
+        muteA.setStaff(theStaff);
+
         play.link(stop);
         stop.link(play);
+
         play.setStaff(theStaff);
         stop.setStaff(theStaff);
     }
@@ -157,6 +166,11 @@ private void initializeArrows() {
         rightArrow.setSkipAmount(1);
         rightFastArrow.setSkipAmount(Double.MAX_VALUE);
         leftFastArrow.setSkipAmount(-Double.MAX_VALUE);
+
+        leftArrow.setStaff(theStaff);
+        rightArrow.setStaff(theStaff);
+        rightFastArrow.setStaff(theStaff);
+        leftFastArrow.setStaff(theStaff);
     }
 
 

src/smp/components/controls/LoadButton.java

@@ -9,6 +9,7 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.stage.FileChooser;
+import smp.components.Values;
 import smp.components.general.ImagePushButton;
 import smp.components.staff.sequences.StaffSequence;
 import smp.fx.Dialog;
@@ -36,6 +37,11 @@ protected void reactPressed(MouseEvent event) {
         load();
     }
 
+    @Override
+    protected void reactReleased(MouseEvent event) {
+        // do nothing.
+    }
+
     /** This loads the song. */
     private void load() {
         boolean cont = true;
@@ -57,6 +63,8 @@ private void load() {
                 theStaff.setSequence(loaded);
                 StateMachine.setTempo(loaded.getTempo());
                 theStaff.getControlPanel().updateCurrTempo();
+                theStaff.getControlPanel().getScrollbar().setMax(
+                        loaded.getTheLines().size());
                 theStaff.getNoteMatrix().redraw();
                 o_in.close();
                 f_in.close();

src/smp/components/controls/NewButton.java

@@ -32,6 +32,11 @@ protected void reactPressed(MouseEvent event) {
         newSong();
     }
 
+    @Override
+    protected void reactReleased(MouseEvent event) {
+        // do nothing.
+    }
+
     /**
      * Creates a new song and clears the staff of all notes.
      * Make sure you save your song first!

src/smp/components/controls/OptionsButton.java

@@ -1,7 +1,17 @@
 package smp.components.controls;
 
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import smp.components.general.ImagePushButton;
 
 /**
@@ -11,6 +21,9 @@
  */
 public class OptionsButton extends ImagePushButton {
 
+    /** This is the text that will be shown in the options dialog. */
+    private String txt = "";
+
     /**
      * Default constructor.
      * @param i The image that we want to link this to.
@@ -26,11 +39,37 @@ protected void reactPressed(MouseEvent event) {
 
     @Override
     protected void reactReleased(MouseEvent event) {
-
+        // do nothing.
     }
 
     /** Opens up an options dialog. */
     private void options() {
+        final Stage dialog = new Stage();
+        dialog.setHeight(150);
+        dialog.setWidth(250);
+        dialog.setResizable(false);
+        dialog.initStyle(StageStyle.UTILITY);
+        Label label = new Label(txt);
+        Button okButton = new Button("OK");
+
+        okButton.setOnAction(new EventHandler<ActionEvent>() {
+
+            @Override
+            public void handle(ActionEvent event) {
+                dialog.close();
+            }
+
+        });
+
+        FlowPane pane = new FlowPane(10, 10);
+        pane.setAlignment(Pos.CENTER);
+        pane.getChildren().addAll(okButton);
+        VBox vBox = new VBox(10);
+        vBox.setAlignment(Pos.CENTER);
+        vBox.getChildren().addAll(label, pane);
+        Scene scene1 = new Scene(vBox);
+        dialog.setScene(scene1);
+        dialog.showAndWait();
         updateValues();
     }
 

src/smp/components/controls/SaveButton.java

@@ -48,6 +48,11 @@ protected void reactPressed(MouseEvent event) {
         save();
     }
 
+    @Override
+    protected void reactReleased(MouseEvent event) {
+        // do nothing.
+    }
+
     /** This saves the song. */
     private void save() {
         if (!saveTxt) {
@@ -68,8 +73,9 @@ private void saveObject() {
             FileChooser f = new FileChooser();
             f.setInitialDirectory(new File(System.getProperty("user.dir")));
             f.setInitialFileName(SMPFXController.getSongName().getText());
-            f.getExtensionFilters().add(new ExtensionFilter(
-                    "Text file", "*.txt"));
+            f.getExtensionFilters().addAll(
+                    new ExtensionFilter("Text file", "*.txt"),
+                    new ExtensionFilter("All files", "*"));
             File outputFile = f.showSaveDialog(null);
             if (outputFile == null)
                 return;

src/smp/components/staff/sequences/StaffSequence.java

@@ -40,7 +40,16 @@ public StaffSequence() {
      * index i.
      */
     public StaffNoteLine getLine(int i) {
-        return theLines.get(i);
+        try {
+            return theLines.get(i);
+        } catch (IndexOutOfBoundsException e) {
+            theLines.add(new StaffNoteLine(theLines.size()));
+            try {
+                return theLines.get(i);
+            } catch (IndexOutOfBoundsException e2) {
+                return getLine(i);
+            }
+        }
     }
 
     /**

src/smp/fx/SMPFXController.java

@@ -105,6 +105,10 @@ public class SMPFXController implements Initializable {
     @FXML
     private static ImageView newButton;
 
+    /** The button that opens the options dialog. */
+    @FXML
+    private static ImageView optionsButton;
+
     /** This is the text area that houses the song name. */
     @FXML
     private static TextField songName;
@@ -393,6 +397,11 @@ public static ImageView getNewButton() {
         return newButton;
     }
 
+    /** @return The options button. */
+    public static ImageView getOptionsButton() {
+        return optionsButton;
+    }
+
     /** @return The text area that contains the song name. */
     public static TextField getSongName() {
         return songName;

src/smp/stateMachine/StateMachine.java

@@ -58,7 +58,7 @@ public class StateMachine {
     /**
      * This is the current tempo that the program is running at.
      */
-    private static double tempo = 400;
+    private static double tempo = Values.DEFAULT_TEMPO;
 
 
     /**