From 47eec5be0d5b4e27cb9dfefe20286b397787acd1 Mon Sep 17 00:00:00 2001 From: gaugendre Date: Mon, 16 Jun 2014 16:48:34 +0200 Subject: [PATCH] Adding space after license text --- .gitignore | 2 + src/JNLP/Reversound.jnlp | 21 ++++++++ src/actions/ExpertModeAction.java | 30 +----------- src/actions/ImportFileAction.java | 49 +------------------ src/actions/QuitAction.java | 5 ++ src/actions/ShowInternalFrameAction.java | 35 +------------ src/conteneurs/CustomGamme.java | 41 ++++++++-------- src/conteneurs/Gamme.java | 41 ++++++++-------- src/conteneurs/Note.java | 3 +- src/conteneurs/NoteEvent.java | 3 +- src/conteneurs/NoteEventList.java | 3 +- src/conteneurs/NoteGamme.java | 41 ++++++++-------- src/conteneurs/NoteID.java | 7 +-- src/conteneurs/NoteList.java | 7 +-- src/conteneurs/NoteProfiled.java | 3 +- src/conteneurs/ObservableList.java | 3 +- src/conteneurs/ObservableObject.java | 3 +- src/conteneurs/ObservableObjectEvent.java | 3 +- src/conteneurs/Profil.java | 41 ++++++++-------- src/conteneurs/RegularGamme.java | 41 ++++++++-------- src/conteneurs/Spectre.java | 41 ++++++++-------- src/generictools/Complex.java | 41 ++++++++-------- src/generictools/Instant.java | 3 +- src/generictools/Pair.java | 3 +- src/generictools/Strings.java | 3 +- src/generictools/WindowFunction.java | 41 ++++++++-------- src/gui/Box.java | 3 +- src/gui/ClipView.java | 3 +- src/gui/Connector.java | 3 +- src/gui/InputBox.java | 3 +- src/gui/MainWindow.java | 42 ++++++++-------- src/gui/PlayerControl.java | 3 +- src/gui/PlayerControlEvent.java | 3 +- src/gui/ProcessBox.java | 3 +- src/gui/ProcessSumUp.java | 4 +- src/gui/ProgressBar.css | 20 ++++++++ src/gui/ProgressIndicator.css | 20 ++++++++ src/gui/TimeSlider.java | 3 +- src/gui/graphs/AbstractBufferGraph.java | 7 ++- src/gui/graphs/AbstractGraph.java | 7 +-- src/gui/graphs/AbstractObservableGraph.java | 5 +- src/gui/graphs/AmpliFreqView.java | 12 +++-- src/gui/graphs/AmpliView.css | 21 ++++++++ src/gui/graphs/AmpliView.java | 3 +- src/gui/graphs/AudioBarChart.css | 2 +- src/gui/graphs/Bar.java | 3 +- src/gui/graphs/BarExtraValues.java | 3 +- src/gui/graphs/BargramView.java | 3 +- src/gui/graphs/EventViewer.java | 8 ++- src/gui/graphs/GraphicView.java | 3 +- src/gui/graphs/NoteViewer.java | 3 +- src/gui/graphs/Overlay.css | 19 +++++++ src/gui/graphs/OverlayGraph.java | 5 +- src/gui/graphs/ProfilView.java | 9 ++-- src/gui/graphs/SpectreView.java | 3 +- src/gui/graphs/Spectrogram.java | 3 +- src/gui/graphs/SpectrogramView.java | 3 +- src/gui/graphs/TraceChart.java | 5 +- src/gui/viewer_state/BufferViewerState.java | 3 +- .../viewer_state/ObservableViewerState.java | 3 +- src/gui/viewer_state/Viewer.java | 3 +- src/gui/viewer_state/ViewerState.java | 5 +- src/processing/AudioInputToBuffer.java | 3 +- src/processing/BufferPlayer.java | 3 +- src/processing/PostProcessScript.java | 8 +-- src/processing/ProcessControl.java | 4 +- src/processing/SpectreFilter.java | 3 +- src/processing/SpectreFilterFactory.java | 4 +- src/processing/buffer/Buffer.java | 5 +- src/processing/buffer/BufferEvent.java | 3 +- .../buffer/BufferEventListener.java | 3 +- src/processing/buffer/NoteBuffer.java | 5 +- src/processing/buffer/Storage.java | 3 +- src/processing/buffer/StorageArrayList.java | 3 +- src/processing/buffer/StorageIterator.java | 3 +- src/processing/buffer/TemporalBuffer.java | 3 +- src/processing/processes/EventToNote.java | 5 +- src/processing/processes/FFT.java | 3 +- .../processes/FreqEdgeDetector.java | 3 +- src/processing/processes/FreqEdgeToEvent.java | 47 +++++++++--------- src/processing/processes/IndexedProcess.java | 5 +- src/processing/processes/Process.java | 5 +- src/processing/processes/ProcessEvent.java | 3 +- .../properties/BooleanProperty.java | 5 +- src/processing/properties/ChoiceProperty.java | 4 +- src/processing/properties/FloatProperty.java | 4 +- src/processing/properties/IntProperty.java | 3 +- .../properties/PropertiesManager.java | 3 +- src/processing/properties/Property.java | 3 +- src/processing/properties/StringProperty.java | 8 ++- 90 files changed, 489 insertions(+), 430 deletions(-) diff --git a/.gitignore b/.gitignore index 32858aa..cac8430 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +.idea diff --git a/src/JNLP/Reversound.jnlp b/src/JNLP/Reversound.jnlp index 2d7a6d9..401b7b6 100644 --- a/src/JNLP/Reversound.jnlp +++ b/src/JNLP/Reversound.jnlp @@ -1,3 +1,24 @@ + + diff --git a/src/actions/ExpertModeAction.java b/src/actions/ExpertModeAction.java index 9d5e874..0955ad6 100644 --- a/src/actions/ExpertModeAction.java +++ b/src/actions/ExpertModeAction.java @@ -18,60 +18,32 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see .package actions; */ - +package actions; import javax.swing.*; - import java.awt.event.ActionEvent; - - /** - * Created by Gabriel on 28/03/2014. - */ - - - public class ExpertModeAction extends AbstractAction { - public static final String ACTIVE = "ExpertModeActive"; - - /** - * Create the ExpertModeAction. - * @param default_value Is the expert mode enabled ? - */ - public ExpertModeAction(boolean default_value) { - super("Mode expert"); - putValue(ACTIVE,default_value); - } - - @Override - public void actionPerformed(ActionEvent e) { - putValue(ACTIVE, !((Boolean) getValue(ACTIVE))); - } - - /* public void setExpertMode(Boolean enabled) { - putValue(ACTIVE,enabled); - }*/ - } \ No newline at end of file diff --git a/src/actions/ImportFileAction.java b/src/actions/ImportFileAction.java index f68e72e..8c60f24 100644 --- a/src/actions/ImportFileAction.java +++ b/src/actions/ImportFileAction.java @@ -19,96 +19,51 @@ You should have received a copy of the GNU General Public License along with this program. If not, see .package actions; */ +package actions; import generictools.Strings; - - import javax.swing.*; - import javax.swing.filechooser.FileNameExtensionFilter; - import java.awt.event.ActionEvent; - import java.io.File; - - /** - * Ask to user to open a File and start reading. - */ - public class ImportFileAction extends AbstractAction { - public static final String FILE = "Fichier"; - private final JComboBox sourceList; - private final JFileChooser chooser = new JFileChooser(); - private final JFrame frame; - - public ImportFileAction(JFrame frame, JComboBox sourceList){ - super("Importer un fichier..."); - this.frame = frame; - this.sourceList = sourceList; - } - - /** - * Invoked when the user clicks either on file import button or menu item. - * Loads the file in memory - * @param e An event. - */ - @Override - public void actionPerformed(ActionEvent e) { - FileNameExtensionFilter filter = new FileNameExtensionFilter("Fichier Audio wav", "wav"); - chooser.setFileFilter(filter); - int returnVal = chooser.showOpenDialog(frame); - if(returnVal == JFileChooser.APPROVE_OPTION) { - if (sourceList.getItemCount() > 1) - sourceList.removeItemAt(1); - File audioFile = new File(chooser.getSelectedFile().getAbsolutePath()); - putValue(FILE, audioFile); - sourceList.addItem(audioFile.getName()); - sourceList.setPrototypeDisplayValue(Strings.longestString("Fichier", audioFile.getName())); - sourceList.setSelectedIndex(1); - } - } - - - - -} - +} \ No newline at end of file diff --git a/src/actions/QuitAction.java b/src/actions/QuitAction.java index f17437b..fca4c90 100644 --- a/src/actions/QuitAction.java +++ b/src/actions/QuitAction.java @@ -22,6 +22,11 @@ import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.WindowEvent; */ +package actions; + +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.WindowEvent; /** * Created by gaugendre on 18/04/2014. diff --git a/src/actions/ShowInternalFrameAction.java b/src/actions/ShowInternalFrameAction.java index 55b8c0b..0b4d876 100644 --- a/src/actions/ShowInternalFrameAction.java +++ b/src/actions/ShowInternalFrameAction.java @@ -18,68 +18,35 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see .package actions; */ - +package actions; import javax.swing.*; - import java.awt.event.ActionEvent; - import java.beans.PropertyVetoException; - - - - - /** - * Created by Gabriel on 28/03/2014. - */ - public class ShowInternalFrameAction extends AbstractAction { - private final JDesktopPane desktopPane; - private final JInternalFrame internalFrame; - - public ShowInternalFrameAction(JDesktopPane desktopPane, JInternalFrame internalFrame) { - super(internalFrame.getTitle()); - this.desktopPane = desktopPane; - this.internalFrame = internalFrame; - } - - @Override - public void actionPerformed(ActionEvent e) { - if (!internalFrame.isVisible()) { - desktopPane.add(internalFrame); - internalFrame.setVisible(true); - } else { - try { - internalFrame.setSelected(true); - } catch (PropertyVetoException e1) { - e1.printStackTrace(System.err); - } - } - } - } \ No newline at end of file diff --git a/src/conteneurs/CustomGamme.java b/src/conteneurs/CustomGamme.java index f8847c9..a6c114d 100644 --- a/src/conteneurs/CustomGamme.java +++ b/src/conteneurs/CustomGamme.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package conteneurs; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package conteneurs; import java.util.ArrayList; diff --git a/src/conteneurs/Gamme.java b/src/conteneurs/Gamme.java index 5863a58..4795b77 100644 --- a/src/conteneurs/Gamme.java +++ b/src/conteneurs/Gamme.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package conteneurs; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package conteneurs; import java.util.ArrayList; diff --git a/src/conteneurs/Note.java b/src/conteneurs/Note.java index 18afb10..e557944 100644 --- a/src/conteneurs/Note.java +++ b/src/conteneurs/Note.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; +*/ +package conteneurs; import generictools.Instant; import processing.buffer.NoteBuffer; diff --git a/src/conteneurs/NoteEvent.java b/src/conteneurs/NoteEvent.java index d8c13bb..dc31b58 100644 --- a/src/conteneurs/NoteEvent.java +++ b/src/conteneurs/NoteEvent.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; +*/ +package conteneurs; /** * Created by gaby on 14/05/14. diff --git a/src/conteneurs/NoteEventList.java b/src/conteneurs/NoteEventList.java index 48ccc0a..d1c6047 100644 --- a/src/conteneurs/NoteEventList.java +++ b/src/conteneurs/NoteEventList.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; +*/ +package conteneurs; import java.util.ArrayList; diff --git a/src/conteneurs/NoteGamme.java b/src/conteneurs/NoteGamme.java index 8456510..2dc7698 100644 --- a/src/conteneurs/NoteGamme.java +++ b/src/conteneurs/NoteGamme.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package conteneurs; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package conteneurs; import java.util.ArrayList; diff --git a/src/conteneurs/NoteID.java b/src/conteneurs/NoteID.java index 1c2ea40..4c9f0e8 100644 --- a/src/conteneurs/NoteID.java +++ b/src/conteneurs/NoteID.java @@ -17,16 +17,17 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; +*/ +package conteneurs; - import processing.buffer.NoteBuffer; +import processing.buffer.NoteBuffer; /** Created by gaby on 02/06/14. * Contient l'identifiant d'une note. Une note jouée est déclarée à tous les instants où elle est jouée, * mais l'identifiant de la note est commun car il s'agit de la meme note. Fait le lien entre tous les instants * ou une note est jouee */ public class NoteID extends ObservableObject implements ObservableObject.Listener{ - private NoteBuffer buffer; + private NoteBuffer buffer; private int bufferID=-1; public NoteID(Note note){ diff --git a/src/conteneurs/NoteList.java b/src/conteneurs/NoteList.java index 0d25d92..51433d4 100644 --- a/src/conteneurs/NoteList.java +++ b/src/conteneurs/NoteList.java @@ -17,11 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; - -import processing.buffer.NoteBuffer; - -import java.util.ArrayList; +*/ +package conteneurs; /** * Created by gaby on 02/06/14. diff --git a/src/conteneurs/NoteProfiled.java b/src/conteneurs/NoteProfiled.java index b93a243..75ab2f9 100644 --- a/src/conteneurs/NoteProfiled.java +++ b/src/conteneurs/NoteProfiled.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; +*/ +package conteneurs; /** * Created by gaby on 14/05/14. diff --git a/src/conteneurs/ObservableList.java b/src/conteneurs/ObservableList.java index 96a99b9..37e2c93 100644 --- a/src/conteneurs/ObservableList.java +++ b/src/conteneurs/ObservableList.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; +*/ +package conteneurs; import java.util.ArrayList; diff --git a/src/conteneurs/ObservableObject.java b/src/conteneurs/ObservableObject.java index d7d4b18..64447d2 100644 --- a/src/conteneurs/ObservableObject.java +++ b/src/conteneurs/ObservableObject.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; +*/ +package conteneurs; import java.util.ArrayList; diff --git a/src/conteneurs/ObservableObjectEvent.java b/src/conteneurs/ObservableObjectEvent.java index df3e433..82f4d5f 100644 --- a/src/conteneurs/ObservableObjectEvent.java +++ b/src/conteneurs/ObservableObjectEvent.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package conteneurs; +*/ +package conteneurs; /** * Created by gaby on 06/05/14. diff --git a/src/conteneurs/Profil.java b/src/conteneurs/Profil.java index dceab19..1a467b0 100644 --- a/src/conteneurs/Profil.java +++ b/src/conteneurs/Profil.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package conteneurs; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package conteneurs; import java.util.ArrayList; diff --git a/src/conteneurs/RegularGamme.java b/src/conteneurs/RegularGamme.java index d87d585..5a8d39a 100644 --- a/src/conteneurs/RegularGamme.java +++ b/src/conteneurs/RegularGamme.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package conteneurs; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package conteneurs; import java.util.ArrayList; diff --git a/src/conteneurs/Spectre.java b/src/conteneurs/Spectre.java index a14d8c8..282d838 100644 --- a/src/conteneurs/Spectre.java +++ b/src/conteneurs/Spectre.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package conteneurs; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package conteneurs; import generictools.Pair; diff --git a/src/generictools/Complex.java b/src/generictools/Complex.java index b12dd78..e45cccc 100644 --- a/src/generictools/Complex.java +++ b/src/generictools/Complex.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package generictools; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package generictools; /** * Created by Gabriel on 25/03/2014. diff --git a/src/generictools/Instant.java b/src/generictools/Instant.java index 69400bb..2c880c0 100644 --- a/src/generictools/Instant.java +++ b/src/generictools/Instant.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package generictools; +*/ +package generictools; import processing.buffer.Buffer; import processing.buffer.TemporalBuffer; diff --git a/src/generictools/Pair.java b/src/generictools/Pair.java index 26c706e..f4e17c7 100644 --- a/src/generictools/Pair.java +++ b/src/generictools/Pair.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package generictools; +*/ +package generictools; /** * Created by gaby on 21/03/14. diff --git a/src/generictools/Strings.java b/src/generictools/Strings.java index 67da639..aa13882 100644 --- a/src/generictools/Strings.java +++ b/src/generictools/Strings.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package generictools; +*/ +package generictools; /** Created by Gabriel Augendre on 18/04/2014. * Renvoie la chaine de caractere la plus longue parmi celles donnees en paramètre */ diff --git a/src/generictools/WindowFunction.java b/src/generictools/WindowFunction.java index 08275d5..4f23780 100644 --- a/src/generictools/WindowFunction.java +++ b/src/generictools/WindowFunction.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package generictools; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package generictools; import processing.buffer.Buffer; diff --git a/src/gui/Box.java b/src/gui/Box.java index 43e82dc..3502198 100644 --- a/src/gui/Box.java +++ b/src/gui/Box.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ +package gui; import generictools.Pair; import javafx.scene.Group; diff --git a/src/gui/ClipView.java b/src/gui/ClipView.java index bbb9dee..08d369c 100644 --- a/src/gui/ClipView.java +++ b/src/gui/ClipView.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ +package gui; public interface ClipView { public void currentFrameChanged(); diff --git a/src/gui/Connector.java b/src/gui/Connector.java index 804d1a6..93819ef 100644 --- a/src/gui/Connector.java +++ b/src/gui/Connector.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ +package gui; import javafx.geometry.Point2D; import javafx.scene.shape.Line; diff --git a/src/gui/InputBox.java b/src/gui/InputBox.java index 9421d5d..1c6b149 100644 --- a/src/gui/InputBox.java +++ b/src/gui/InputBox.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ +package gui; import javafx.scene.paint.Color; import javafx.scene.text.Text; diff --git a/src/gui/MainWindow.java b/src/gui/MainWindow.java index 7fd7b61..9739536 100644 --- a/src/gui/MainWindow.java +++ b/src/gui/MainWindow.java @@ -1,23 +1,24 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package gui; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package gui; import actions.ExpertModeAction; @@ -33,7 +34,6 @@ import processing.buffer.Buffer; import javax.swing.*; import java.awt.*; import java.awt.event.*; -import java.beans.PropertyChangeListener; import java.beans.PropertyVetoException; import java.io.File; import java.util.ArrayList; diff --git a/src/gui/PlayerControl.java b/src/gui/PlayerControl.java index 1fc4be0..f41ed4f 100644 --- a/src/gui/PlayerControl.java +++ b/src/gui/PlayerControl.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ +package gui; import generictools.Instant; import processing.BufferPlayer; diff --git a/src/gui/PlayerControlEvent.java b/src/gui/PlayerControlEvent.java index c065d74..b459459 100644 --- a/src/gui/PlayerControlEvent.java +++ b/src/gui/PlayerControlEvent.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ +package gui; import generictools.Instant; diff --git a/src/gui/ProcessBox.java b/src/gui/ProcessBox.java index 7995583..2519ca4 100644 --- a/src/gui/ProcessBox.java +++ b/src/gui/ProcessBox.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ +package gui; import javafx.scene.control.Button; import javafx.scene.control.ProgressBar; diff --git a/src/gui/ProcessSumUp.java b/src/gui/ProcessSumUp.java index 658b0cf..f471c54 100644 --- a/src/gui/ProcessSumUp.java +++ b/src/gui/ProcessSumUp.java @@ -17,7 +17,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ + +package gui; import gui.graphs.GraphicView; import javafx.application.Platform; diff --git a/src/gui/ProgressBar.css b/src/gui/ProgressBar.css index 628282c..d9aeccd 100644 --- a/src/gui/ProgressBar.css +++ b/src/gui/ProgressBar.css @@ -1 +1,21 @@ +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ .progress-bar .bar {-fx-padding:3px; -fx-background-insets:0;} \ No newline at end of file diff --git a/src/gui/ProgressIndicator.css b/src/gui/ProgressIndicator.css index ffd968d..cec0e25 100644 --- a/src/gui/ProgressIndicator.css +++ b/src/gui/ProgressIndicator.css @@ -1 +1,21 @@ +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ .progress-indicator .percentage {-fx-font-size: 0.01em;} \ No newline at end of file diff --git a/src/gui/TimeSlider.java b/src/gui/TimeSlider.java index c3423f9..f2e4d54 100644 --- a/src/gui/TimeSlider.java +++ b/src/gui/TimeSlider.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui; +*/ +package gui; import generictools.Instant; import gui.viewer_state.BufferViewerState; diff --git a/src/gui/graphs/AbstractBufferGraph.java b/src/gui/graphs/AbstractBufferGraph.java index 0274c2c..555fae3 100644 --- a/src/gui/graphs/AbstractBufferGraph.java +++ b/src/gui/graphs/AbstractBufferGraph.java @@ -17,16 +17,15 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ + +package gui.graphs; import conteneurs.ObservableObject; import gui.PlayerControl; import gui.viewer_state.BufferViewerState; import gui.viewer_state.Viewer; -import javafx.event.EventHandler; -import javafx.scene.input.ContextMenuEvent; import processing.buffer.Buffer; -import processing.buffer.TemporalBuffer; /** * Created by gaby on 08/05/14. diff --git a/src/gui/graphs/AbstractGraph.java b/src/gui/graphs/AbstractGraph.java index 9527437..99be4e7 100644 --- a/src/gui/graphs/AbstractGraph.java +++ b/src/gui/graphs/AbstractGraph.java @@ -17,18 +17,15 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import conteneurs.ObservableObject; import javafx.application.Platform; -import javafx.event.EventHandler; -import javafx.scene.Node; import javafx.scene.Parent; -import javafx.scene.input.ContextMenuEvent; import processing.buffer.Buffer; import javax.swing.*; -import java.util.ArrayList; /** * Created by gaby on 07/05/14. diff --git a/src/gui/graphs/AbstractObservableGraph.java b/src/gui/graphs/AbstractObservableGraph.java index 59338fd..b7dbc5e 100644 --- a/src/gui/graphs/AbstractObservableGraph.java +++ b/src/gui/graphs/AbstractObservableGraph.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import conteneurs.ObservableObject; import gui.PlayerControl; @@ -26,8 +27,6 @@ import gui.viewer_state.BufferViewerState; import gui.viewer_state.ObservableViewerState; import gui.viewer_state.Viewer; import gui.viewer_state.ViewerState; -import javafx.event.EventHandler; -import javafx.scene.input.ContextMenuEvent; import processing.buffer.Buffer; import processing.buffer.TemporalBuffer; diff --git a/src/gui/graphs/AmpliFreqView.java b/src/gui/graphs/AmpliFreqView.java index 649c1ff..4361e78 100644 --- a/src/gui/graphs/AmpliFreqView.java +++ b/src/gui/graphs/AmpliFreqView.java @@ -17,12 +17,13 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; -import conteneurs.*; +import conteneurs.ObservableObject; +import conteneurs.Spectre; import javafx.application.Platform; -import javafx.collections.*;import javafx.collections.ObservableList;import javafx.scene.Parent; -import javafx.scene.Scene; +import javafx.scene.Parent; import javafx.scene.chart.BarChart; import javafx.scene.chart.CategoryAxis; import javafx.scene.chart.NumberAxis; @@ -31,7 +32,8 @@ import javafx.scene.text.Font; import javax.swing.*; import java.awt.event.ItemEvent; -import java.awt.event.ItemListener;import java.util.ArrayList; +import java.awt.event.ItemListener; +import java.util.ArrayList; /** * Created by gaby on 01/06/14. diff --git a/src/gui/graphs/AmpliView.css b/src/gui/graphs/AmpliView.css index bf7e51b..1834520 100644 --- a/src/gui/graphs/AmpliView.css +++ b/src/gui/graphs/AmpliView.css @@ -1,3 +1,24 @@ +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + .thick-chart .chart-series-line { -fx-stroke-width: 1px; } diff --git a/src/gui/graphs/AmpliView.java b/src/gui/graphs/AmpliView.java index 44b35f8..7f7f06f 100644 --- a/src/gui/graphs/AmpliView.java +++ b/src/gui/graphs/AmpliView.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import generictools.Instant; import gui.PlayerControl; diff --git a/src/gui/graphs/AudioBarChart.css b/src/gui/graphs/AudioBarChart.css index d4c171a..32fe333 100644 --- a/src/gui/graphs/AudioBarChart.css +++ b/src/gui/graphs/AudioBarChart.css @@ -1 +1 @@ -.chart-bar { -fx-background-color: #69de01; -fx-background-insets: 0; -fx-background-radius: 0; } /* .data0.chart-bar { -fx-background-color: #69de01; } .data1.chart-bar { -fx-background-color: #69de01; } .data2.chart-bar { -fx-background-color: #69de01; } .data3.chart-bar { -fx-background-color: #69de01; } .data4.chart-bar { -fx-background-color: #69de01; } .data5.chart-bar { -fx-background-color: #69de01; } .data6.chart-bar { -fx-background-color: #69de01; } .data7.chart-bar { -fx-background-color: #69de01; } .data8.chart-bar { -fx-background-color: #75e101; } .data9.chart-bar { -fx-background-color: #75e101; } .data10.chart-bar { -fx-background-color: #75e101; } .data11.chart-bar { -fx-background-color: #75e101; } .data12.chart-bar { -fx-background-color: #75e101; } .data13.chart-bar { -fx-background-color: #75e101; } .data14.chart-bar { -fx-background-color: #75e101; } .data15.chart-bar { -fx-background-color: #75e101; } .data16.chart-bar { -fx-background-color: #86e701; } .data17.chart-bar { -fx-background-color: #86e701; } .data18.chart-bar { -fx-background-color: #86e701; } .data19.chart-bar { -fx-background-color: #86e701; } .data20.chart-bar { -fx-background-color: #86e701; } .data21.chart-bar { -fx-background-color: #86e701; } .data22.chart-bar { -fx-background-color: #86e701; } .data23.chart-bar { -fx-background-color: #86e701; } .data24.chart-bar { -fx-background-color: #9aee01; } .data25.chart-bar { -fx-background-color: #9aee01; } .data26.chart-bar { -fx-background-color: #9aee01; } .data27.chart-bar { -fx-background-color: #9aee01; } .data28.chart-bar { -fx-background-color: #9aee01; } .data29.chart-bar { -fx-background-color: #9aee01; } .data30.chart-bar { -fx-background-color: #9aee01; } .data31.chart-bar { -fx-background-color: #9aee01; } .data32.chart-bar { -fx-background-color: #b0f000; } .data33.chart-bar { -fx-background-color: #b0f000; } .data34.chart-bar { -fx-background-color: #b0f000; } .data35.chart-bar { -fx-background-color: #b0f000; } .data36.chart-bar { -fx-background-color: #b0f000; } .data37.chart-bar { -fx-background-color: #b0f000; } .data38.chart-bar { -fx-background-color: #b0f000; } .data39.chart-bar { -fx-background-color: #b0f000; } .data40.chart-bar { -fx-background-color: #c6f000; } .data41.chart-bar { -fx-background-color: #c6f000; } .data42.chart-bar { -fx-background-color: #c6f000; } .data43.chart-bar { -fx-background-color: #c6f000; } .data44.chart-bar { -fx-background-color: #c6f000; } .data45.chart-bar { -fx-background-color: #c6f000; } .data46.chart-bar { -fx-background-color: #c6f000; } .data47.chart-bar { -fx-background-color: #c6f000; } .data48.chart-bar { -fx-background-color: #dbf000; } .data49.chart-bar { -fx-background-color: #dbf000; } .data50.chart-bar { -fx-background-color: #dbf000; } .data51.chart-bar { -fx-background-color: #dbf000; } .data52.chart-bar { -fx-background-color: #dbf000; } .data53.chart-bar { -fx-background-color: #dbf000; } .data54.chart-bar { -fx-background-color: #dbf000; } .data55.chart-bar { -fx-background-color: #dbf000; } .data56.chart-bar { -fx-background-color: #edf000; } .data57.chart-bar { -fx-background-color: #edf000; } .data58.chart-bar { -fx-background-color: #edf000; } .data59.chart-bar { -fx-background-color: #edf000; } .data60.chart-bar { -fx-background-color: #edf000; } .data61.chart-bar { -fx-background-color: #edf000; } .data62.chart-bar { -fx-background-color: #edf000; } .data63.chart-bar { -fx-background-color: #edf000; } .data64.chart-bar { -fx-background-color: #fbf002; } .data65.chart-bar { -fx-background-color: #fbf002; } .data66.chart-bar { -fx-background-color: #fbf002; } .data67.chart-bar { -fx-background-color: #fbf002; } .data68.chart-bar { -fx-background-color: #fbf002; } .data69.chart-bar { -fx-background-color: #fbf002; } .data70.chart-bar { -fx-background-color: #fbf002; } .data71.chart-bar { -fx-background-color: #fbf002; } .data72.chart-bar { -fx-background-color: #ffe500; } .data73.chart-bar { -fx-background-color: #ffe500; } .data74.chart-bar { -fx-background-color: #ffe500; } .data75.chart-bar { -fx-background-color: #ffe500; } .data76.chart-bar { -fx-background-color: #ffe500; } .data77.chart-bar { -fx-background-color: #ffe500; } .data78.chart-bar { -fx-background-color: #ffe500; } .data79.chart-bar { -fx-background-color: #ffe500; } .data80.chart-bar { -fx-background-color: #ffca00; } .data81.chart-bar { -fx-background-color: #ffca00; } .data82.chart-bar { -fx-background-color: #ffca00; } .data83.chart-bar { -fx-background-color: #ffca00; } .data84.chart-bar { -fx-background-color: #ffca00; } .data85.chart-bar { -fx-background-color: #ffca00; } .data86.chart-bar { -fx-background-color: #ffca00; } .data87.chart-bar { -fx-background-color: #ffca00; } .data88.chart-bar { -fx-background-color: #ffa700; } .data89.chart-bar { -fx-background-color: #ffa700; } .data90.chart-bar { -fx-background-color: #ffa700; } .data91.chart-bar { -fx-background-color: #ffa700; } .data92.chart-bar { -fx-background-color: #ffa700; } .data93.chart-bar { -fx-background-color: #ffa700; } .data94.chart-bar { -fx-background-color: #ffa700; } .data95.chart-bar { -fx-background-color: #ffa700; } .data96.chart-bar { -fx-background-color: #ff8100; } .data97.chart-bar { -fx-background-color: #ff8100; } .data98.chart-bar { -fx-background-color: #ff8100; } .data99.chart-bar { -fx-background-color: #ff8100; } .data100.chart-bar { -fx-background-color: #ff8100; } .data101.chart-bar { -fx-background-color: #ff8100; } .data102.chart-bar { -fx-background-color: #ff8100; } .data103.chart-bar { -fx-background-color: #ff8100; } .data104.chart-bar { -fx-background-color: #ff5900; } .data105.chart-bar { -fx-background-color: #ff5900; } .data106.chart-bar { -fx-background-color: #ff5900; } .data107.chart-bar { -fx-background-color: #ff5900; } .data108.chart-bar { -fx-background-color: #ff5900; } .data109.chart-bar { -fx-background-color: #ff5900; } .data110.chart-bar { -fx-background-color: #ff5900; } .data111.chart-bar { -fx-background-color: #ff5900; } .data112.chart-bar { -fx-background-color: #ff3400; } .data113.chart-bar { -fx-background-color: #ff3400; } .data114.chart-bar { -fx-background-color: #ff3400; } .data115.chart-bar { -fx-background-color: #ff3400; } .data116.chart-bar { -fx-background-color: #ff3400; } .data117.chart-bar { -fx-background-color: #ff3400; } .data118.chart-bar { -fx-background-color: #ff3400; } .data119.chart-bar { -fx-background-color: #ff3400; } .data120.chart-bar { -fx-background-color: #ff1600; } .data121.chart-bar { -fx-background-color: #ff1600; } .data122.chart-bar { -fx-background-color: #ff1600; } .data123.chart-bar { -fx-background-color: #ff1600; } .data124.chart-bar { -fx-background-color: #ff1600; } .data125.chart-bar { -fx-background-color: #ff1600; } .data126.chart-bar { -fx-background-color: #ff1600; } .data127.chart-bar { -fx-background-color: #ff1600; }*/ \ No newline at end of file +/* Reversound is used to get the music sheet of a piece from a music file. Copyright (C) 2014 Gabriel AUGENDRE Copyright (C) 2014 Gabriel DIENY Copyright (C) 2014 Arthur GAUCHER Copyright (C) 2014 Gabriel LEPETIT-AIMON This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ .chart-bar { -fx-background-color: #69de01; -fx-background-insets: 0; -fx-background-radius: 0; } /* .data0.chart-bar { -fx-background-color: #69de01; } .data1.chart-bar { -fx-background-color: #69de01; } .data2.chart-bar { -fx-background-color: #69de01; } .data3.chart-bar { -fx-background-color: #69de01; } .data4.chart-bar { -fx-background-color: #69de01; } .data5.chart-bar { -fx-background-color: #69de01; } .data6.chart-bar { -fx-background-color: #69de01; } .data7.chart-bar { -fx-background-color: #69de01; } .data8.chart-bar { -fx-background-color: #75e101; } .data9.chart-bar { -fx-background-color: #75e101; } .data10.chart-bar { -fx-background-color: #75e101; } .data11.chart-bar { -fx-background-color: #75e101; } .data12.chart-bar { -fx-background-color: #75e101; } .data13.chart-bar { -fx-background-color: #75e101; } .data14.chart-bar { -fx-background-color: #75e101; } .data15.chart-bar { -fx-background-color: #75e101; } .data16.chart-bar { -fx-background-color: #86e701; } .data17.chart-bar { -fx-background-color: #86e701; } .data18.chart-bar { -fx-background-color: #86e701; } .data19.chart-bar { -fx-background-color: #86e701; } .data20.chart-bar { -fx-background-color: #86e701; } .data21.chart-bar { -fx-background-color: #86e701; } .data22.chart-bar { -fx-background-color: #86e701; } .data23.chart-bar { -fx-background-color: #86e701; } .data24.chart-bar { -fx-background-color: #9aee01; } .data25.chart-bar { -fx-background-color: #9aee01; } .data26.chart-bar { -fx-background-color: #9aee01; } .data27.chart-bar { -fx-background-color: #9aee01; } .data28.chart-bar { -fx-background-color: #9aee01; } .data29.chart-bar { -fx-background-color: #9aee01; } .data30.chart-bar { -fx-background-color: #9aee01; } .data31.chart-bar { -fx-background-color: #9aee01; } .data32.chart-bar { -fx-background-color: #b0f000; } .data33.chart-bar { -fx-background-color: #b0f000; } .data34.chart-bar { -fx-background-color: #b0f000; } .data35.chart-bar { -fx-background-color: #b0f000; } .data36.chart-bar { -fx-background-color: #b0f000; } .data37.chart-bar { -fx-background-color: #b0f000; } .data38.chart-bar { -fx-background-color: #b0f000; } .data39.chart-bar { -fx-background-color: #b0f000; } .data40.chart-bar { -fx-background-color: #c6f000; } .data41.chart-bar { -fx-background-color: #c6f000; } .data42.chart-bar { -fx-background-color: #c6f000; } .data43.chart-bar { -fx-background-color: #c6f000; } .data44.chart-bar { -fx-background-color: #c6f000; } .data45.chart-bar { -fx-background-color: #c6f000; } .data46.chart-bar { -fx-background-color: #c6f000; } .data47.chart-bar { -fx-background-color: #c6f000; } .data48.chart-bar { -fx-background-color: #dbf000; } .data49.chart-bar { -fx-background-color: #dbf000; } .data50.chart-bar { -fx-background-color: #dbf000; } .data51.chart-bar { -fx-background-color: #dbf000; } .data52.chart-bar { -fx-background-color: #dbf000; } .data53.chart-bar { -fx-background-color: #dbf000; } .data54.chart-bar { -fx-background-color: #dbf000; } .data55.chart-bar { -fx-background-color: #dbf000; } .data56.chart-bar { -fx-background-color: #edf000; } .data57.chart-bar { -fx-background-color: #edf000; } .data58.chart-bar { -fx-background-color: #edf000; } .data59.chart-bar { -fx-background-color: #edf000; } .data60.chart-bar { -fx-background-color: #edf000; } .data61.chart-bar { -fx-background-color: #edf000; } .data62.chart-bar { -fx-background-color: #edf000; } .data63.chart-bar { -fx-background-color: #edf000; } .data64.chart-bar { -fx-background-color: #fbf002; } .data65.chart-bar { -fx-background-color: #fbf002; } .data66.chart-bar { -fx-background-color: #fbf002; } .data67.chart-bar { -fx-background-color: #fbf002; } .data68.chart-bar { -fx-background-color: #fbf002; } .data69.chart-bar { -fx-background-color: #fbf002; } .data70.chart-bar { -fx-background-color: #fbf002; } .data71.chart-bar { -fx-background-color: #fbf002; } .data72.chart-bar { -fx-background-color: #ffe500; } .data73.chart-bar { -fx-background-color: #ffe500; } .data74.chart-bar { -fx-background-color: #ffe500; } .data75.chart-bar { -fx-background-color: #ffe500; } .data76.chart-bar { -fx-background-color: #ffe500; } .data77.chart-bar { -fx-background-color: #ffe500; } .data78.chart-bar { -fx-background-color: #ffe500; } .data79.chart-bar { -fx-background-color: #ffe500; } .data80.chart-bar { -fx-background-color: #ffca00; } .data81.chart-bar { -fx-background-color: #ffca00; } .data82.chart-bar { -fx-background-color: #ffca00; } .data83.chart-bar { -fx-background-color: #ffca00; } .data84.chart-bar { -fx-background-color: #ffca00; } .data85.chart-bar { -fx-background-color: #ffca00; } .data86.chart-bar { -fx-background-color: #ffca00; } .data87.chart-bar { -fx-background-color: #ffca00; } .data88.chart-bar { -fx-background-color: #ffa700; } .data89.chart-bar { -fx-background-color: #ffa700; } .data90.chart-bar { -fx-background-color: #ffa700; } .data91.chart-bar { -fx-background-color: #ffa700; } .data92.chart-bar { -fx-background-color: #ffa700; } .data93.chart-bar { -fx-background-color: #ffa700; } .data94.chart-bar { -fx-background-color: #ffa700; } .data95.chart-bar { -fx-background-color: #ffa700; } .data96.chart-bar { -fx-background-color: #ff8100; } .data97.chart-bar { -fx-background-color: #ff8100; } .data98.chart-bar { -fx-background-color: #ff8100; } .data99.chart-bar { -fx-background-color: #ff8100; } .data100.chart-bar { -fx-background-color: #ff8100; } .data101.chart-bar { -fx-background-color: #ff8100; } .data102.chart-bar { -fx-background-color: #ff8100; } .data103.chart-bar { -fx-background-color: #ff8100; } .data104.chart-bar { -fx-background-color: #ff5900; } .data105.chart-bar { -fx-background-color: #ff5900; } .data106.chart-bar { -fx-background-color: #ff5900; } .data107.chart-bar { -fx-background-color: #ff5900; } .data108.chart-bar { -fx-background-color: #ff5900; } .data109.chart-bar { -fx-background-color: #ff5900; } .data110.chart-bar { -fx-background-color: #ff5900; } .data111.chart-bar { -fx-background-color: #ff5900; } .data112.chart-bar { -fx-background-color: #ff3400; } .data113.chart-bar { -fx-background-color: #ff3400; } .data114.chart-bar { -fx-background-color: #ff3400; } .data115.chart-bar { -fx-background-color: #ff3400; } .data116.chart-bar { -fx-background-color: #ff3400; } .data117.chart-bar { -fx-background-color: #ff3400; } .data118.chart-bar { -fx-background-color: #ff3400; } .data119.chart-bar { -fx-background-color: #ff3400; } .data120.chart-bar { -fx-background-color: #ff1600; } .data121.chart-bar { -fx-background-color: #ff1600; } .data122.chart-bar { -fx-background-color: #ff1600; } .data123.chart-bar { -fx-background-color: #ff1600; } .data124.chart-bar { -fx-background-color: #ff1600; } .data125.chart-bar { -fx-background-color: #ff1600; } .data126.chart-bar { -fx-background-color: #ff1600; } .data127.chart-bar { -fx-background-color: #ff1600; }*/ \ No newline at end of file diff --git a/src/gui/graphs/Bar.java b/src/gui/graphs/Bar.java index 11716b0..ef45898 100644 --- a/src/gui/graphs/Bar.java +++ b/src/gui/graphs/Bar.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; /** * Adapted by arthur from Candle.java in javafx's Ensemble8 demo. diff --git a/src/gui/graphs/BarExtraValues.java b/src/gui/graphs/BarExtraValues.java index cde5bdd..776a0e5 100644 --- a/src/gui/graphs/BarExtraValues.java +++ b/src/gui/graphs/BarExtraValues.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; /** * Modified by arthur in javafx's Ensemble8 demo. diff --git a/src/gui/graphs/BargramView.java b/src/gui/graphs/BargramView.java index 2600713..fa5b3ba 100644 --- a/src/gui/graphs/BargramView.java +++ b/src/gui/graphs/BargramView.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import conteneurs.Gamme; import conteneurs.NoteGamme; diff --git a/src/gui/graphs/EventViewer.java b/src/gui/graphs/EventViewer.java index a321a72..746b45b 100644 --- a/src/gui/graphs/EventViewer.java +++ b/src/gui/graphs/EventViewer.java @@ -17,9 +17,13 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; -import conteneurs.*; +import conteneurs.NoteEvent; +import conteneurs.NoteEventList; +import conteneurs.NoteGamme; +import conteneurs.Profil; import generictools.Instant; import javafx.scene.paint.Color; import processing.buffer.TemporalBuffer; diff --git a/src/gui/graphs/GraphicView.java b/src/gui/graphs/GraphicView.java index bf327e7..7db9c63 100644 --- a/src/gui/graphs/GraphicView.java +++ b/src/gui/graphs/GraphicView.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import conteneurs.ObservableObject; import javafx.application.Platform; diff --git a/src/gui/graphs/NoteViewer.java b/src/gui/graphs/NoteViewer.java index c237c0b..a47415e 100644 --- a/src/gui/graphs/NoteViewer.java +++ b/src/gui/graphs/NoteViewer.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import conteneurs.NoteList; import generictools.Instant; diff --git a/src/gui/graphs/Overlay.css b/src/gui/graphs/Overlay.css index 1af6be8..2c7eb71 100644 --- a/src/gui/graphs/Overlay.css +++ b/src/gui/graphs/Overlay.css @@ -1,4 +1,23 @@ +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ .overlay{ diff --git a/src/gui/graphs/OverlayGraph.java b/src/gui/graphs/OverlayGraph.java index 81aaefa..2b2562e 100644 --- a/src/gui/graphs/OverlayGraph.java +++ b/src/gui/graphs/OverlayGraph.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import javafx.application.Platform; import javafx.beans.value.ChangeListener; @@ -26,7 +27,7 @@ import javafx.event.EventHandler; import javafx.scene.effect.DropShadow; import javafx.scene.input.ContextMenuEvent; import javafx.scene.input.MouseEvent; -import javafx.scene.layout.*; +import javafx.scene.layout.BorderPane; /** diff --git a/src/gui/graphs/ProfilView.java b/src/gui/graphs/ProfilView.java index 8344647..17843a0 100644 --- a/src/gui/graphs/ProfilView.java +++ b/src/gui/graphs/ProfilView.java @@ -17,13 +17,12 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; -import conteneurs.*;import javafx.scene.chart.CategoryAxis; +import conteneurs.Profil; -import javax.swing.*; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener;import java.util.ArrayList; +import java.util.ArrayList; /** diff --git a/src/gui/graphs/SpectreView.java b/src/gui/graphs/SpectreView.java index a582730..225c46b 100644 --- a/src/gui/graphs/SpectreView.java +++ b/src/gui/graphs/SpectreView.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import conteneurs.Gamme; import conteneurs.NoteGamme; diff --git a/src/gui/graphs/Spectrogram.java b/src/gui/graphs/Spectrogram.java index 27fa74e..a72e9f2 100644 --- a/src/gui/graphs/Spectrogram.java +++ b/src/gui/graphs/Spectrogram.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import conteneurs.Spectre; import generictools.Instant; diff --git a/src/gui/graphs/SpectrogramView.java b/src/gui/graphs/SpectrogramView.java index c311604..9a8ee2f 100644 --- a/src/gui/graphs/SpectrogramView.java +++ b/src/gui/graphs/SpectrogramView.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; import conteneurs.Gamme; import conteneurs.NoteGamme; diff --git a/src/gui/graphs/TraceChart.java b/src/gui/graphs/TraceChart.java index 95fbcf8..6b8e2ec 100644 --- a/src/gui/graphs/TraceChart.java +++ b/src/gui/graphs/TraceChart.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.graphs; +*/ +package gui.graphs; /* * Copyright (c) 2008, 2013 Oracle and/or its affiliates. @@ -243,4 +244,4 @@ public class TraceChart extends XYChart { } } } -} \ No newline at end of file +} diff --git a/src/gui/viewer_state/BufferViewerState.java b/src/gui/viewer_state/BufferViewerState.java index 26acc99..d5b8a1d 100644 --- a/src/gui/viewer_state/BufferViewerState.java +++ b/src/gui/viewer_state/BufferViewerState.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.viewer_state; +*/ +package gui.viewer_state; import processing.buffer.Buffer; import processing.buffer.BufferEvent; diff --git a/src/gui/viewer_state/ObservableViewerState.java b/src/gui/viewer_state/ObservableViewerState.java index 23ae4ef..ad3dbdc 100644 --- a/src/gui/viewer_state/ObservableViewerState.java +++ b/src/gui/viewer_state/ObservableViewerState.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.viewer_state; +*/ +package gui.viewer_state; import conteneurs.ObservableObject; import conteneurs.ObservableObjectEvent; diff --git a/src/gui/viewer_state/Viewer.java b/src/gui/viewer_state/Viewer.java index 49a60f8..af80b8d 100644 --- a/src/gui/viewer_state/Viewer.java +++ b/src/gui/viewer_state/Viewer.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.viewer_state; +*/ +package gui.viewer_state; /** * Created by gaby on 09/04/14. diff --git a/src/gui/viewer_state/ViewerState.java b/src/gui/viewer_state/ViewerState.java index 73237d5..6a025c5 100644 --- a/src/gui/viewer_state/ViewerState.java +++ b/src/gui/viewer_state/ViewerState.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package gui.viewer_state; +*/ +package gui.viewer_state; import processing.ProcessControl; @@ -129,4 +130,4 @@ public abstract class ViewerState { public void setSlowingFactorOnDataChange(int slowingFactorOnDataChange) { this.slowingFactorOnDataChange = slowingFactorOnDataChange; } -} \ No newline at end of file +} diff --git a/src/processing/AudioInputToBuffer.java b/src/processing/AudioInputToBuffer.java index 2d86063..a99a041 100644 --- a/src/processing/AudioInputToBuffer.java +++ b/src/processing/AudioInputToBuffer.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing; +*/ +package processing; import processing.buffer.Storage; import processing.buffer.TemporalBuffer; diff --git a/src/processing/BufferPlayer.java b/src/processing/BufferPlayer.java index 9b8dc0d..c6e9810 100644 --- a/src/processing/BufferPlayer.java +++ b/src/processing/BufferPlayer.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing; +*/ +package processing; import generictools.Instant; import gui.PlayerControl; diff --git a/src/processing/PostProcessScript.java b/src/processing/PostProcessScript.java index f52a920..bc0c11e 100644 --- a/src/processing/PostProcessScript.java +++ b/src/processing/PostProcessScript.java @@ -17,20 +17,16 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing; +*/ +package processing; -import conteneurs.Note; import generictools.Instant; -import generictools.Strings; import processing.buffer.NoteBuffer; -import processing.properties.FloatProperty; import javax.swing.*; -import javax.swing.filechooser.FileNameExtensionFilter; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.lang.reflect.Array; import java.util.ArrayList; /**Created by gaby on 03/06/14. diff --git a/src/processing/ProcessControl.java b/src/processing/ProcessControl.java index f15f76c..ba5ddb1 100644 --- a/src/processing/ProcessControl.java +++ b/src/processing/ProcessControl.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing; +*/ +package processing; import conteneurs.NoteEventList; @@ -31,7 +32,6 @@ import processing.buffer.Buffer; import processing.buffer.NoteBuffer; import processing.buffer.TemporalBuffer; import processing.processes.*; -import processing.processes.FreqEdgeDetector; import processing.processes.Process; import java.util.ArrayList; diff --git a/src/processing/SpectreFilter.java b/src/processing/SpectreFilter.java index 54ea12c..600ce2a 100644 --- a/src/processing/SpectreFilter.java +++ b/src/processing/SpectreFilter.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing; +*/ +package processing; import conteneurs.Gamme; import conteneurs.Spectre; diff --git a/src/processing/SpectreFilterFactory.java b/src/processing/SpectreFilterFactory.java index f9abfaf..e921493 100644 --- a/src/processing/SpectreFilterFactory.java +++ b/src/processing/SpectreFilterFactory.java @@ -17,7 +17,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing; +*/ + +package processing; import conteneurs.Spectre; diff --git a/src/processing/buffer/Buffer.java b/src/processing/buffer/Buffer.java index 349b420..ac1336b 100644 --- a/src/processing/buffer/Buffer.java +++ b/src/processing/buffer/Buffer.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.buffer; +*/ +package processing.buffer; import conteneurs.ObservableObject; import conteneurs.ObservableObjectEvent; @@ -365,4 +366,4 @@ public class Buffer { public void setProcessingOrder(Process.ProcessingOrder processingOrder) { this.processingOrder = processingOrder; } -} \ No newline at end of file +} diff --git a/src/processing/buffer/BufferEvent.java b/src/processing/buffer/BufferEvent.java index 03e589a..6219bc9 100644 --- a/src/processing/buffer/BufferEvent.java +++ b/src/processing/buffer/BufferEvent.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.buffer; +*/ +package processing.buffer; /** diff --git a/src/processing/buffer/BufferEventListener.java b/src/processing/buffer/BufferEventListener.java index 7b8e192..ed2aaac 100644 --- a/src/processing/buffer/BufferEventListener.java +++ b/src/processing/buffer/BufferEventListener.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.buffer; +*/ +package processing.buffer; /** * Created by gaby on 02/04/14. diff --git a/src/processing/buffer/NoteBuffer.java b/src/processing/buffer/NoteBuffer.java index a97dc62..2be16de 100644 --- a/src/processing/buffer/NoteBuffer.java +++ b/src/processing/buffer/NoteBuffer.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.buffer; +*/ +package processing.buffer; import conteneurs.*; import generictools.Instant; @@ -123,4 +124,4 @@ public class NoteBuffer extends TemporalBuffer implements ObservableOb public int getNotesNbr(){ return notes.size(); } -} \ No newline at end of file +} diff --git a/src/processing/buffer/Storage.java b/src/processing/buffer/Storage.java index 995db9a..b129306 100644 --- a/src/processing/buffer/Storage.java +++ b/src/processing/buffer/Storage.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.buffer; +*/ +package processing.buffer; import java.util.ArrayList; diff --git a/src/processing/buffer/StorageArrayList.java b/src/processing/buffer/StorageArrayList.java index 5111fe7..59e60e1 100644 --- a/src/processing/buffer/StorageArrayList.java +++ b/src/processing/buffer/StorageArrayList.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.buffer; +*/ +package processing.buffer; import java.util.ArrayList; diff --git a/src/processing/buffer/StorageIterator.java b/src/processing/buffer/StorageIterator.java index 632e241..b0e2a05 100644 --- a/src/processing/buffer/StorageIterator.java +++ b/src/processing/buffer/StorageIterator.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.buffer; +*/ +package processing.buffer; /** * Created by gaby on 31/03/14. diff --git a/src/processing/buffer/TemporalBuffer.java b/src/processing/buffer/TemporalBuffer.java index 22a29ab..5dd0071 100644 --- a/src/processing/buffer/TemporalBuffer.java +++ b/src/processing/buffer/TemporalBuffer.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.buffer; +*/ +package processing.buffer; import generictools.Instant; diff --git a/src/processing/processes/EventToNote.java b/src/processing/processes/EventToNote.java index 38f814a..942d10c 100644 --- a/src/processing/processes/EventToNote.java +++ b/src/processing/processes/EventToNote.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.processes; +*/ +package processing.processes; import conteneurs.Note; import conteneurs.NoteEvent; @@ -157,4 +158,4 @@ public class EventToNote extends IndexedProcess{ stillAlive.clear(); super.clean(); } -} \ No newline at end of file +} diff --git a/src/processing/processes/FFT.java b/src/processing/processes/FFT.java index 9a0587c..f3a6f2c 100644 --- a/src/processing/processes/FFT.java +++ b/src/processing/processes/FFT.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.processes; +*/ +package processing.processes; import conteneurs.NoteGamme; import conteneurs.RegularGamme; diff --git a/src/processing/processes/FreqEdgeDetector.java b/src/processing/processes/FreqEdgeDetector.java index 3d50e15..f862b9a 100644 --- a/src/processing/processes/FreqEdgeDetector.java +++ b/src/processing/processes/FreqEdgeDetector.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.processes; +*/ +package processing.processes; import conteneurs.Spectre; import generictools.Instant; diff --git a/src/processing/processes/FreqEdgeToEvent.java b/src/processing/processes/FreqEdgeToEvent.java index fd92cb1..9d6d719 100644 --- a/src/processing/processes/FreqEdgeToEvent.java +++ b/src/processing/processes/FreqEdgeToEvent.java @@ -1,30 +1,31 @@ -/* -Reversound is used to get the music sheet of a piece from a music file. -Copyright (C) 2014 Gabriel AUGENDRE -Copyright (C) 2014 Gabriel DIENY -Copyright (C) 2014 Arthur GAUCHER -Copyright (C) 2014 Gabriel LEPETIT-AIMON - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/package processing.processes; +/* +Reversound is used to get the music sheet of a piece from a music file. +Copyright (C) 2014 Gabriel AUGENDRE +Copyright (C) 2014 Gabriel DIENY +Copyright (C) 2014 Arthur GAUCHER +Copyright (C) 2014 Gabriel LEPETIT-AIMON + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package processing.processes; import conteneurs.*; import generictools.Instant; -import javafx.collections.ObservableList; import processing.buffer.Storage; import processing.buffer.TemporalBuffer; -import processing.properties.FloatProperty;import processing.properties.IntProperty; +import processing.properties.FloatProperty; +import processing.properties.IntProperty; import java.util.ArrayList; @@ -179,4 +180,4 @@ public class FreqEdgeToEvent extends IndexedProcess { protected ProcessingOrder getProcessingOrder() { return ProcessingOrder.ASCENDING_ORDER; } -} \ No newline at end of file +} diff --git a/src/processing/processes/IndexedProcess.java b/src/processing/processes/IndexedProcess.java index 83815ee..43950c1 100644 --- a/src/processing/processes/IndexedProcess.java +++ b/src/processing/processes/IndexedProcess.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.processes; +*/ +package processing.processes; import generictools.Instant; import processing.buffer.Buffer; @@ -151,4 +152,4 @@ public abstract class IndexedProcess extends Process { } -} \ No newline at end of file +} diff --git a/src/processing/processes/Process.java b/src/processing/processes/Process.java index 9627b16..6d0cd76 100644 --- a/src/processing/processes/Process.java +++ b/src/processing/processes/Process.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.processes; +*/ +package processing.processes; import generictools.Pair; @@ -510,4 +511,4 @@ public abstract class Process implements Runnable { public void setBoxDisplayed(boolean boxDisplayed) { this.boxDisplayed = boxDisplayed; } -} \ No newline at end of file +} diff --git a/src/processing/processes/ProcessEvent.java b/src/processing/processes/ProcessEvent.java index a78f28f..19375bd 100644 --- a/src/processing/processes/ProcessEvent.java +++ b/src/processing/processes/ProcessEvent.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.processes; +*/ +package processing.processes; /** * Created by gaby on 25/05/14. diff --git a/src/processing/properties/BooleanProperty.java b/src/processing/properties/BooleanProperty.java index 8d75aa6..c0edcb7 100644 --- a/src/processing/properties/BooleanProperty.java +++ b/src/processing/properties/BooleanProperty.java @@ -17,10 +17,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.properties; +*/ +package processing.properties; -import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.scene.control.CheckBox; import javafx.scene.control.Control; diff --git a/src/processing/properties/ChoiceProperty.java b/src/processing/properties/ChoiceProperty.java index 6bf84f4..d18694b 100644 --- a/src/processing/properties/ChoiceProperty.java +++ b/src/processing/properties/ChoiceProperty.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.properties; +*/ +package processing.properties; import generictools.Pair; import javafx.application.Platform; @@ -26,7 +27,6 @@ import javafx.event.EventHandler; import javafx.scene.control.ComboBox; import javafx.scene.control.Control; -import java.awt.image.ComponentColorModel; import java.util.ArrayList; /** diff --git a/src/processing/properties/FloatProperty.java b/src/processing/properties/FloatProperty.java index 08bb6e5..74073af 100644 --- a/src/processing/properties/FloatProperty.java +++ b/src/processing/properties/FloatProperty.java @@ -17,9 +17,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.properties; +*/ +package processing.properties; -import com.sun.org.apache.bcel.internal.generic.FLOAD; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.scene.control.Control; diff --git a/src/processing/properties/IntProperty.java b/src/processing/properties/IntProperty.java index 7a30545..3b9c0c8 100644 --- a/src/processing/properties/IntProperty.java +++ b/src/processing/properties/IntProperty.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.properties; +*/ +package processing.properties; import javafx.event.ActionEvent; import javafx.event.EventHandler; diff --git a/src/processing/properties/PropertiesManager.java b/src/processing/properties/PropertiesManager.java index 5a92640..0e921f9 100644 --- a/src/processing/properties/PropertiesManager.java +++ b/src/processing/properties/PropertiesManager.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.properties; +*/ +package processing.properties; import java.util.ArrayList; diff --git a/src/processing/properties/Property.java b/src/processing/properties/Property.java index 6b87278..0bf4b5f 100644 --- a/src/processing/properties/Property.java +++ b/src/processing/properties/Property.java @@ -17,7 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.properties; +*/ +package processing.properties; import javafx.application.Platform; import javafx.scene.control.Control; diff --git a/src/processing/properties/StringProperty.java b/src/processing/properties/StringProperty.java index cae62a2..5970cf9 100644 --- a/src/processing/properties/StringProperty.java +++ b/src/processing/properties/StringProperty.java @@ -17,15 +17,13 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/package processing.properties; +*/ +package processing.properties; -import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.event.EventHandler; -import javafx.scene.Node; import javafx.scene.control.Control; import javafx.scene.control.TextField; -import javafx.scene.text.Text; import java.util.ArrayList; @@ -72,4 +70,4 @@ public class StringProperty extends Property { for(TextField t:textFields) t.setText(getApparentValue()); } -} \ No newline at end of file +}