Changeset 0337b74 in orbit

Timestamp:

07/27/13 01:20:31 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, RawEEG, Servo, Tab_Interface, pyramid

Children:

0e5d193

Parents:

4f3fd92

Message:

• eegRawHistoryPlot added

Location:

android

Files:

• res/layout-large/activity_main.xml (modified) (1 diff)
• res/layout-small/activity_main.xml (modified) (1 diff)
• res/layout-xlarge/activity_main.xml (modified) (1 diff)
• res/layout/activity_main.xml (modified) (1 diff)
• src/info/puzzlebox/orbit/OrbitActivity.java (modified) (8 diffs)

android/res/layout-large/activity_main.xml

@@ -125 +125 @@
     </LinearLayout>
 
+    <com.androidplot.xy.XYPlot
+        android:id="@+id/eegRawHistoryPlot"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_weight="1"
+        title="EEG Raw Wave" />
+
     <LinearLayout
         android:id="@+id/layoutAudioService"

android/res/layout-small/activity_main.xml

@@ -128 +128 @@
     </LinearLayout>
 
+    <com.androidplot.xy.XYPlot
+        android:id="@+id/eegRawHistoryPlot"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_weight="1"
+        title="EEG Raw Wave" />
+
     <LinearLayout
         android:id="@+id/layoutAudioService"

android/res/layout-xlarge/activity_main.xml

@@ -125 +125 @@
     </LinearLayout>
 
+    <com.androidplot.xy.XYPlot
+        android:id="@+id/eegRawHistoryPlot"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_weight="1"
+        title="EEG Raw Wave" />
+
     <LinearLayout
         android:id="@+id/layoutAudioService"

android/res/layout/activity_main.xml

@@ -128 +128 @@
     </LinearLayout>
 
+    <com.androidplot.xy.XYPlot
+        android:id="@+id/eegRawHistoryPlot"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_weight="1"
+        title="EEG Raw Wave" />
+
     <LinearLayout
         android:id="@+id/layoutAudioService"

android/src/info/puzzlebox/orbit/OrbitActivity.java

@@ -36 +36 @@
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.RoundRectShape;
+import android.hardware.SensorEvent;
 import android.util.Log;
 import android.view.Gravity;
@@ -55 +56 @@
 import com.neurosky.thinkgear.TGDevice;
 
+//import com.androidplot.util.PlotStatistics;
+import com.androidplot.util.PlotStatistics;
+import com.androidplot.xy.*;
+
 
 public class OrbitActivity extends Activity implements SeekBar.OnSeekBarChangeListener {
@@ -68 +73 @@
         boolean eegConnecting = false;
         boolean demoFlightMode = false;
+        //      int[]rawEEG = {};
 
 
@@ -97 +103 @@
         int viewSpaceGenerateAudioWidth = 120;
 
+        private static final int EEG_RAW_HISTORY_SIZE = 512;            // number of points to plot in EEG history
+        private XYPlot eegRawHistoryPlot = null;
+        private SimpleXYSeries eegRawHistorySeries = null;
+
+
         LinearLayout layoutControl;
         LinearLayout layoutAudioService;
@@ -227 +238 @@
                 progressBarPower.setProgressDrawable(progressPower);   
                 progressBarPower.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal));
+
+
+                // setup the Raw EEG History plot:
+                eegRawHistoryPlot = (XYPlot) findViewById(R.id.eegRawHistoryPlot);
+                eegRawHistorySeries = new SimpleXYSeries("Raw EEG");
+                eegRawHistorySeries.useImplicitXVals();
+                eegRawHistoryPlot.setRangeBoundaries(-32767, 32767, BoundaryMode.FIXED);
+                eegRawHistoryPlot.setDomainBoundaries(0, EEG_RAW_HISTORY_SIZE, BoundaryMode.FIXED);
+                eegRawHistoryPlot.addSeries(eegRawHistorySeries, new LineAndPointFormatter(Color.rgb(200, 100, 100), Color.BLACK, null, null));
+                eegRawHistoryPlot.setDomainStepValue(5);
+                eegRawHistoryPlot.setTicksPerRangeLabel(3);
+                eegRawHistoryPlot.getDomainLabelWidget().pack();
+                //              eegRawHistoryPlot.setRangeLabel("Amplitude");
+                eegRawHistoryPlot.getRangeLabelWidget().pack();
+
+                final PlotStatistics histStats = new PlotStatistics(1000, false);
+
+                eegRawHistoryPlot.addListener(histStats);
+
 
                 seekBarAttention = (SeekBar)findViewById(R.id.seekBarAttention);
@@ -691 +721 @@
                                 //raw1 = msg.arg1;
                                 //tv.append("Got raw: " + msg.arg1 + "\n");
+
+                                //                              rawEEG[rawEEG.length] = msg.arg1;
+
+                                eegRawHistorySeries.addLast(null, msg.arg1);
+
+                                if (eegRawHistorySeries.size() == EEG_RAW_HISTORY_SIZE) {
+                                        updateEEGRawHistory();
+                                }
+
                                 break;
                         case TGDevice.MSG_HEART_RATE:
@@ -938 +977 @@
                  * which is used to fly the helicopter
                  */
-                
-        // Set Attention and Meditation to zero if we've lost signal
-        if (eegSignal < 100) {
-                eegAttention = 0;
-                eegMeditation = 0;
-                progressBarAttention.setProgress(eegAttention);
-                progressBarMeditation.setProgress(eegMeditation);
-        }
+
+                // Set Attention and Meditation to zero if we've lost signal
+                if (eegSignal < 100) {
+                        eegAttention = 0;
+                        eegMeditation = 0;
+                        progressBarAttention.setProgress(eegAttention);
+                        progressBarMeditation.setProgress(eegMeditation);
+                }
 
                 eegPower = calculateSpeed();
@@ -976 +1015 @@
 
         } // updatePower
+
+
+        // ################################################################
+
+        public void updateEEGRawHistory() {
+
+                // add the latest history sample:
+                //              eegRawHistorySeries.addLast(null, sensorEvent.values[0]);
+
+                // update the plot with the updated history Lists:
+                //        eegRawHistorySeries.setModel(eegRawHistory, SimpleXYSeries.ArrayFormat.Y_VALS_ONLY);
+
+                // redraw the Plots:
+                eegRawHistoryPlot.redraw();
+
+                // get rid the oldest sample in history:
+                if (eegRawHistorySeries.size() > EEG_RAW_HISTORY_SIZE) {
+                        //                      eegRawHistorySeries.removeFirst();
+                        eegRawHistorySeries = new SimpleXYSeries("Raw EEG");
+                        eegRawHistorySeries.useImplicitXVals();
+                }
+
+
+        }