Skip to content

Commit 1d72cc6

Browse files
retiututretiutut
committed
Remove Filter Buttons from Networking and add TimeSeriesFilt and TimeSeriesRaw data types
1 parent f5e79d9 commit 1d72cc6

3 files changed

Lines changed: 275 additions & 515 deletions

File tree

‎OpenBCI_GUI/OpenBCI_GUI.pde‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import java.awt.AWTException;
5050
import netP5.*; // for OSC
5151
import oscP5.*; // for OSC
5252
import hypermedia.net.*; //for UDP
53-
import java.nio.ByteBuffer; //for UDP
53+
import java.nio.ByteBuffer; //for BDF file writing
5454
import edu.ucsd.sccn.LSL; //for LSL
5555
import com.fazecast.jSerialComm.*; //Helps distinguish serial ports on Windows
5656
import org.apache.commons.lang3.time.StopWatch;

‎OpenBCI_GUI/SessionSettings.pde‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -199,18 +199,14 @@ class SessionSettings {
199199
String nwOscIp1Load; String nwOscIp2Load; String nwOscIp3Load; String nwOscIp4Load;
200200
String nwOscPort1Load; String nwOscPort2Load; String nwOscPort3Load; String nwOscPort4Load;
201201
String nwOscAddress1Load; String nwOscAddress2Load; String nwOscAddress3Load; String nwOscAddress4Load;
202-
boolean nwOscFilter1Load, nwOscFilter2Load, nwOscFilter3Load, nwOscFilter4Load;
203202
//UDP load variables
204203
String nwUdpIp1Load; String nwUdpIp2Load; String nwUdpIp3Load;
205204
String nwUdpPort1Load; String nwUdpPort2Load; String nwUdpPort3Load;
206-
boolean nwUdpFilter1Load, nwUdpFilter2Load, nwUdpFilter3Load;
207205
//LSL load variables
208206
String nwLSLName1Load; String nwLSLName2Load; String nwLSLName3Load;
209207
String nwLSLType1Load; String nwLSLType2Load; String nwLSLType3Load;
210-
boolean nwLSLFilter1Load, nwLSLFilter2Load, nwLSLFilter3Load;
211208
//Serial load variables
212209
int nwSerialBaudRateLoad;
213-
boolean nwSerialFilter1Load;
214210

215211
//Primary JSON objects for saving and loading data
216212
private JSONObject saveSettingsJSONData;
@@ -402,29 +398,25 @@ class SessionSettings {
402398
saveNetworkingSettings.setString("OSC_ip"+i, (String) w_networking.getCP5Map().get("OSC_ip"+i));
403399
saveNetworkingSettings.setString("OSC_port"+i, (String) w_networking.getCP5Map().get("OSC_port"+i));
404400
saveNetworkingSettings.setString("OSC_address"+i, (String) w_networking.getCP5Map().get("OSC_address"+i));
405-
saveNetworkingSettings.setBoolean("OSC_filter"+i, (boolean) w_networking.getCP5Map().get("filter"+i));
406401
}
407402
break;
408403
case 2:
409404
for (int i = 1; i <= 3; i++) {
410405
saveNetworkingSettings.setInt("UDP_DataType"+i, (Integer) w_networking.getCP5Map().get(w_networking.dataTypeNames.get(i-1)));
411406
saveNetworkingSettings.setString("UDP_ip"+i, (String) w_networking.getCP5Map().get("UDP_ip"+i));
412407
saveNetworkingSettings.setString("UDP_port"+i, (String) w_networking.getCP5Map().get("UDP_port"+i));
413-
saveNetworkingSettings.setBoolean("UDP_filter"+i, (boolean) w_networking.getCP5Map().get("filter"+i));
414408
}
415409
break;
416410
case 1:
417411
for (int i = 1; i <= 3; i++) {
418412
saveNetworkingSettings.setInt("LSL_DataType"+i, (Integer) w_networking.getCP5Map().get(w_networking.dataTypeNames.get(i-1)));
419413
saveNetworkingSettings.setString("LSL_name"+i, (String) w_networking.getCP5Map().get("LSL_name"+i));
420414
saveNetworkingSettings.setString("LSL_type"+i, (String) w_networking.getCP5Map().get("LSL_type"+i));
421-
saveNetworkingSettings.setBoolean("LSL_filter"+i, (boolean) w_networking.getCP5Map().get("filter"+i));
422415
}
423416
break;
424417
case 0:
425418
saveNetworkingSettings.setInt("Serial_DataType1", (Integer) w_networking.getCP5Map().get("dataType1"));
426419
saveNetworkingSettings.setInt("Serial_baudrate", (Integer) w_networking.getCP5Map().get("baud_rate"));
427-
saveNetworkingSettings.setBoolean("Serial_filter1", (boolean) w_networking.getCP5Map().get("filter1"));
428420
saveNetworkingSettings.setString("Serial_portName", (String) w_networking.getCP5Map().get("port_name"));
429421
break;
430422
}//end of networking proctocol switch
@@ -605,10 +597,6 @@ class SessionSettings {
605597
nwOscAddress2Load = loadNetworkingSettings.getString("OSC_address2");
606598
nwOscAddress3Load = loadNetworkingSettings.getString("OSC_address3");
607599
nwOscAddress4Load = loadNetworkingSettings.getString("OSC_address4");
608-
nwOscFilter1Load = loadNetworkingSettings.getBoolean("OSC_filter1");
609-
nwOscFilter2Load = loadNetworkingSettings.getBoolean("OSC_filter2");
610-
nwOscFilter3Load = loadNetworkingSettings.getBoolean("OSC_filter3");
611-
nwOscFilter4Load = loadNetworkingSettings.getBoolean("OSC_filter4");
612600
break;
613601
case 2:
614602
nwDataType1 = loadNetworkingSettings.getInt("UDP_DataType1");
@@ -620,9 +608,6 @@ class SessionSettings {
620608
nwUdpPort1Load = loadNetworkingSettings.getString("UDP_port1");
621609
nwUdpPort2Load = loadNetworkingSettings.getString("UDP_port2");
622610
nwUdpPort3Load = loadNetworkingSettings.getString("UDP_port3");
623-
nwUdpFilter1Load = loadNetworkingSettings.getBoolean("UDP_filter1");
624-
nwUdpFilter2Load = loadNetworkingSettings.getBoolean("UDP_filter2");
625-
nwUdpFilter3Load = loadNetworkingSettings.getBoolean("UDP_filter3");
626611
break;
627612
case 1:
628613
nwDataType1 = loadNetworkingSettings.getInt("LSL_DataType1");
@@ -634,14 +619,10 @@ class SessionSettings {
634619
nwLSLType1Load = loadNetworkingSettings.getString("LSL_type1");
635620
nwLSLType2Load = loadNetworkingSettings.getString("LSL_type2");
636621
nwLSLType3Load = loadNetworkingSettings.getString("LSL_type3");
637-
nwLSLFilter1Load = loadNetworkingSettings.getBoolean("LSL_filter1");
638-
nwLSLFilter2Load = loadNetworkingSettings.getBoolean("LSL_filter2");
639-
nwLSLFilter3Load = loadNetworkingSettings.getBoolean("LSL_filter3");
640622
break;
641623
case 0:
642624
nwDataType1 = loadNetworkingSettings.getInt("Serial_DataType1");
643625
nwSerialBaudRateLoad = loadNetworkingSettings.getInt("Serial_baudrate");
644-
nwSerialFilter1Load = loadNetworkingSettings.getBoolean("Serial_filter1");
645626
nwSerialPort = loadNetworkingSettings.getString("Serial_portName");
646627
break;
647628
} //end switch case for all networking types
@@ -864,10 +845,6 @@ class SessionSettings {
864845
Protocol(nwProtocolLoad);
865846
//Update dropdowns and textfields in the Networking widget with loaded values
866847
w_networking.cp5_widget.getController("Protocol").getCaptionLabel().setText(w_networking.protocols.get(nwProtocolLoad)); //Reference the dropdown from the appropriate widget
867-
w_networking.cp5_networking.get(Toggle.class, "filter1").setState(false);
868-
w_networking.cp5_networking.get(Toggle.class, "filter2").setState(false);
869-
w_networking.cp5_networking.get(Toggle.class, "filter3").setState(false);
870-
w_networking.cp5_networking.get(Toggle.class, "filter4").setState(false);
871848
switch (nwProtocolLoad) {
872849
case 3: //Apply OSC if loaded
873850
println("Apply OSC Networking Mode");
@@ -891,10 +868,6 @@ class SessionSettings {
891868
w_networking.cp5_networking.get(Textfield.class, "OSC_address2").setText(nwOscAddress2Load);
892869
w_networking.cp5_networking.get(Textfield.class, "OSC_address3").setText(nwOscAddress3Load);
893870
w_networking.cp5_networking.get(Textfield.class, "OSC_address4").setText(nwOscAddress4Load);
894-
w_networking.cp5_networking.get(Toggle.class, "filter1").setState(nwOscFilter1Load);
895-
w_networking.cp5_networking.get(Toggle.class, "filter2").setState(nwOscFilter2Load);
896-
w_networking.cp5_networking.get(Toggle.class, "filter3").setState(nwOscFilter3Load);
897-
w_networking.cp5_networking.get(Toggle.class, "filter4").setState(nwOscFilter4Load);
898871
break;
899872
case 2: //Apply UDP if loaded
900873
println("Apply UDP Networking Mode");
@@ -910,9 +883,6 @@ class SessionSettings {
910883
w_networking.cp5_networking.get(Textfield.class, "UDP_port1").setText(nwUdpPort1Load);
911884
w_networking.cp5_networking.get(Textfield.class, "UDP_port2").setText(nwUdpPort2Load);
912885
w_networking.cp5_networking.get(Textfield.class, "UDP_port3").setText(nwUdpPort3Load);
913-
w_networking.cp5_networking.get(Toggle.class, "filter1").setState(nwUdpFilter1Load);
914-
w_networking.cp5_networking.get(Toggle.class, "filter2").setState(nwUdpFilter2Load);
915-
w_networking.cp5_networking.get(Toggle.class, "filter3").setState(nwUdpFilter3Load);
916886
break;
917887
case 1: //Apply LSL if loaded
918888
println("Apply LSL Networking Mode");
@@ -928,17 +898,13 @@ class SessionSettings {
928898
w_networking.cp5_networking.get(Textfield.class, "LSL_type1").setText(nwLSLType1Load);
929899
w_networking.cp5_networking.get(Textfield.class, "LSL_type2").setText(nwLSLType2Load);
930900
w_networking.cp5_networking.get(Textfield.class, "LSL_type3").setText(nwLSLType3Load);
931-
w_networking.cp5_networking.get(Toggle.class, "filter1").setState(nwLSLFilter1Load);
932-
w_networking.cp5_networking.get(Toggle.class, "filter2").setState(nwLSLFilter2Load);
933-
w_networking.cp5_networking.get(Toggle.class, "filter3").setState(nwLSLFilter3Load);
934901
break;
935902
case 0: //Apply Serial if loaded
936903
println("Apply Serial Networking Mode");
937904
w_networking.cp5_networking_dropdowns.getController("dataType1").getCaptionLabel().setText(w_networking.dataTypes.get(nwDataType1)); //Set text on frontend
938905
w_networking.cp5_networking_dropdowns.get(ScrollableList.class, "dataType1").setValue(nwDataType1); //Set value in backend
939906
w_networking.cp5_networking_baudRate.getController("baud_rate").getCaptionLabel().setText(w_networking.baudRates.get(nwSerialBaudRateLoad)); //Set text
940907
w_networking.cp5_networking_baudRate.get(ScrollableList.class, "baud_rate").setValue(nwSerialBaudRateLoad); //Set value in backend
941-
w_networking.cp5_networking.get(Toggle.class, "filter1").setState(nwSerialFilter1Load);
942908

943909
//Look for the portName in the dropdown list
944910
int listSize = w_networking.cp5_networking_portName.get(ScrollableList.class, "port_name").getItems().size();

0 commit comments

Comments
 (0)