Merge pull request #4 from axelberndt/develop

Version 1.0.2
axelberndt · Sep 2, 2024 · 0f28911 · 0f28911
2 parents 0e4266a + 9af36b8
commit 0f28911
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ javafx {
 
 application {
     group = 'com.github.axelberndt'
-    version = '1.0.1'
+    version = '1.0.2'
     mainClass.set("arpeggiatorum.Launcher")
 }
 

diff --git a/src/main/java/arpeggiatorum/Arpeggiator.java b/src/main/java/arpeggiatorum/Arpeggiator.java
@@ -19,7 +19,7 @@
  * @author Axel Berndt
  */
 public class Arpeggiator implements Receiver, Transmitter {
-    public static final String version = "1.0.1";
+    public static final String version = "1.0.2";
     public static final int ARPEGGIO_CHANNEL_PRESET = 1;
     public static final int HELD_NOTES_CHANNEL_PRESET = 2;
     public static final int BASS_CHANNEL_PRESET = 0;

diff --git a/src/main/java/arpeggiatorum/Arpeggiatorum.java b/src/main/java/arpeggiatorum/Arpeggiatorum.java
@@ -5,6 +5,7 @@
 import arpeggiatorum.gui.LogGUIController;
 import arpeggiatorum.microphoneControl.*;
 import arpeggiatorum.supplementary.EventMaker;
+import arpeggiatorum.supplementary.TonalEnrichmentChooserItem;
 import arpeggiatorum.supplementary.Tools;
 import com.jsyn.JSyn;
 import com.jsyn.Synthesizer;
@@ -24,6 +25,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -74,6 +76,7 @@ public class Arpeggiatorum implements Receiver {
     public static Stage stagePerformance;
     private static int instancePerformance = 0;
 
+
     public Arpeggiatorum() {
         super();
         synchronized (Arpeggiatorum.class) {
@@ -652,6 +655,8 @@ public void Upload() {
                 Integer.parseInt(ArpeggiatorumGUI.controllerHandle.e15.getText()),
                 Integer.parseInt(ArpeggiatorumGUI.controllerHandle.e16.getText()),
         };
+
+        ArpeggiatorumGUI.controllerHandle.comboEnrichment.getItems().getLast().setValue(intervals);
         this.arpeggiator.setTonalEnrichment(intervals);
     }