Merge pull request #9 from gonski/feature/wekTraining

Feature/wek training

Author: pelinski

wekInputWrapper/FX.pde

@@ -4,42 +4,28 @@ void drawFXbtns() {
   float x1 = width/3;
   int y = 20;
 
-  btns[0] = cp5.addToggle("FX1")
+  FXBtns[0] = cp5.addToggle("FX1")
     .setValue(false)
     .setPosition(x1, y)
     .setSize(btnWidth, btnWidth);
 
-  btns[1] = cp5.addToggle("FX2")
+  FXBtns[1] = cp5.addToggle("FX2")
     .setValue(false)
     .setPosition(x1 + 2 + btnWidth, y)
     .setSize(btnWidth, btnWidth);
 
-  btns[2] = cp5.addToggle("FX3")
+  FXBtns[2] = cp5.addToggle("FX3")
     .setValue(false)
     .setPosition(x1 + 2*(2 + btnWidth), y)
     .setSize(btnWidth, btnWidth);
 
-  btns[3] = cp5.addToggle("FX4")
+  FXBtns[3] = cp5.addToggle("FX4")
     .setValue(false)
     .setPosition(x1+ 3*(2 + btnWidth), y)
     .setSize(btnWidth, btnWidth);
 
-  btns[4] = cp5.addToggle("FX5")
+  FXBtns[4] = cp5.addToggle("FX5")
     .setValue(false)
     .setPosition(x1+ 4*(2 + btnWidth), y)
     .setSize(btnWidth, btnWidth);
 }
-
-void noteOn(int channel, int pitch, int velocity) {
-
-  for (int i=0; i<midiFX.length; i++) {
-    if (midiFX[i] == pitch) {
-      if (btns[i].getState()) {
-        btns[i].setState(false);
-      } else {
-        btns[i].setState(true);
-      }
-      println("FXbtn " + btns[i].getState(), btns[i].getMode());
-    }
-  }
-}

wekInputWrapper/getMidi.pde

@@ -0,0 +1,28 @@
+void noteOn(int channel, int pitch, int velocity) {
+
+  // FX
+  for (int i=0; i<midiFX.length; i++) {
+    if (midiFX[i] == pitch) {
+      if (FXBtns[i].getState()) {
+        FXBtns[i].setState(false);
+      } else {
+        FXBtns[i].setState(true);
+      }
+      println("FX " + i + " " + FXBtns[i].getState());
+    }
+  }
+
+
+
+
+  //Training
+  for (int i=0; i<midiTraining.length; i++) {
+    if (midiTraining[i] == pitch) {
+      if (TrainingBtns[i].getState()) {
+        TrainingBtns[i].setState(false);
+      } else {
+        TrainingBtns[i].setState(true);
+      }
+    }
+  }
+}

wekInputWrapper/midiOSC.pde

@@ -1,4 +1,5 @@
 // OSC -> MIDI
+// from https://github.com/msfeldstein/MidiToOSCBridge/blob/master/MidiOSC.pde
 
 public void oscToMidiNote(int note, int value) {
   log("Got OSC Note: " + note + " Velocity: " + value);
@@ -17,29 +18,13 @@ void drawMidiOSCMenu() {
 
   int menuWidth = 100;
 
-  /*
-  cp5.addTextfield("inputPort")
-   .setPosition(20, nextY())
-   .setSize(menuWidth, 20)
-   .setValue("8000")
-   .setAutoClear(false);
-   
-   cp5.addTextfield("outputPort")
-   .setPosition(20, nextY())
-   .setSize(menuWidth, 20)
-   .setValue("8001")
-   .setAutoClear(false);
-   */
-
-
   midiInDropdown = cp5.addDropdownList("midiIn")
     .setPosition(20, nextY())
     .setSize(menuWidth, 50);
 
-  
   midiOutDropdown = cp5.addDropdownList("midiOut")
-   .setPosition(20, nextY())
-   .setSize(menuWidth, 50);
+    .setPosition(20, nextY())
+    .setSize(menuWidth, 50);
 
   String[] inputs = MidiBus.availableInputs();
   for (int i = 0; i < inputs.length; i++) {

wekInputWrapper/wekInputWrapper.pde

@@ -1,6 +1,3 @@
-// using code from  RunwayML PoseNetFull Example and
-// from https://github.com/msfeldstein/MidiToOSCBridge/blob/master/MidiOSC.pde
-
 import oscP5.*;
 import netP5.*;
 import themidibus.*;
@@ -14,15 +11,19 @@ OscP5 osc;
 NetAddress loc;
 
 // FX btns
-Toggle[] btns = new Toggle[5];
-int[] midiFX = {0, 1, 2, 3, 4};
+Toggle[] FXBtns = new Toggle[5];
+int[] midiFX = {0, 1, 2, 3, 4}; // pitch idx
+
+//wek training btns
+Toggle[] TrainingBtns = new Toggle[6];
+int[] midiTraining = {5, 6, 7}; // pitch idx
+
 
 //handPose
 float[][] points = new float[21][3];
 float[] origin = new float[3];
 float[] dist = new float [20];
-
-// This array will hold all the humans detected
+boolean[] lastTrainingBtnValue = {false, false, false};
 
 int inputPort = 8008;
 int outputPort = 8000;
@@ -43,6 +44,7 @@ void setup() {
 
   drawMidiOSCMenu();
   drawFXbtns();
+  drawTrainingBtns();
 }
 
 void draw() {
@@ -51,5 +53,6 @@ void draw() {
 
   computeOutputs();
   drawPoints();
-  sendOscToWekinator();
+  sendInputOscToWekinator();
+  sendTrainingOscToWekinator();
 }

wekInputWrapper/wekTraining.pde

@@ -0,0 +1,21 @@
+void drawTrainingBtns() {
+
+  int btnWidth = 50;
+  float x1 = width/3;
+  int y = height- btnWidth - 20;
+
+  TrainingBtns[0] = cp5.addToggle("rec")
+    .setValue(false)
+    .setPosition(x1, y)
+    .setSize(btnWidth, btnWidth);
+
+  TrainingBtns[1] = cp5.addToggle("train")
+    .setValue(false)
+    .setPosition(x1+(2 + btnWidth), y)
+    .setSize(btnWidth, btnWidth);
+
+  TrainingBtns[2] = cp5.addToggle("run")
+    .setValue(false)
+    .setPosition(x1 +2*(2 + btnWidth), y)
+    .setSize(btnWidth, btnWidth);
+}

wekInputWrapper/wekinatorOSC.pde

@@ -1,20 +1,57 @@
-void sendOscToWekinator() {
+void sendInputOscToWekinator() {
   OscMessage msg = new OscMessage("/wek/inputs");
 
- // only x, y
-    msg.add((float)round(origin[0]));
-    msg.add((float)round(origin[1]));
+  // only x, y
+  msg.add((float)round(origin[0]));
+  msg.add((float)round(origin[1]));
 
 
   for (int i=0; i<dist.length; i++) {
     msg.add((float)round(dist[i]));
   }
 
   for (int i=0; i<midiFX.length; i++) {
-    float state = btns[i].getState() ? 1 : 0;
+    float state = FXBtns[i].getState() ? 1 : 0; // send in order
     msg.add((float)state);
   }
 
+  osc.send(msg, loc); // total 5 FX  + 20 dist + 2 xy origin = 27
+}
+
+
 
-  osc.send(msg, loc); // total 5 + 20 + 2 = 27
+void sendTrainingOscToWekinator() {
+  OscMessage msg = new OscMessage("/");
+  for (int i=0; i<midiTraining.length; i++) {
+    if (lastTrainingBtnValue[i] != TrainingBtns[i].getState()) {
+      if (TrainingBtns[i].getState()) {    
+        switch(i) {
+        case 0:
+          msg.setAddrPattern("/wekinator/control/startRecording");
+          break;
+        case 1:
+          msg.setAddrPattern("/wekinator/control/train");
+          break;
+        case 2:
+          msg.setAddrPattern("/wekinator/control/startRunning");
+          break;
+        }
+      } else {
+        switch(i) {
+        case 0:
+          msg.setAddrPattern("/wekinator/control/stopRecording");
+          break;
+        case 1:
+          msg.setAddrPattern("/wekinator/control/cancelTrain");
+          break;
+        case 2:
+          msg.setAddrPattern("/wekinator/control/stopRunning");
+          break;
+        }
+      }
+    }
+
+    lastTrainingBtnValue[i]= TrainingBtns[i].getState();
+    osc.send(msg, loc);
+  }
 }