Merge branch 'development' into auxchanbtn

Author: mspacek

Builds/VisualStudio2013/Plugins/IntanRecordingController/IntanRecordingController.vcxproj.filters

@@ -60,7 +60,7 @@
       <Filter>Source Files\rhythm-api</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\USBThread.h">
-      <Filter>Header Files</Filter>
+      <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>

Source/Audio/AudioComponent.cpp

@@ -27,37 +27,41 @@
 
 AudioComponent::AudioComponent() : isPlaying(false)
 {
-    // if this is nonempty, we got an error
-    String error = deviceManager.initialise(0,  // numInputChannelsNeeded
-                                            2,  // numOutputChannelsNeeded
-                                            0,  // *savedState (XmlElement)
-                                            true, // selectDefaultDeviceOnFailure
-                                            String::empty, // preferred device
-                                            0); // preferred device setup options
-    if (error != String::empty)
+    bool initialized = false;
+    while (!initialized)
     {
-        String titleMessage = String("Audio device initialization error");
-        String contentMessage = String("There was a problem initializing the audio device:\n" + error);
-        // this uses a bool since there are only two options
-        // also, omitting parameters works fine, even though the docs don't show defaults
-        bool retryButtonClicked = AlertWindow::showOkCancelBox(AlertWindow::QuestionIcon,
-                                                               titleMessage,
-                                                               contentMessage,
-                                                               String("Retry"),
-                                                               String("Quit"));
-
-        if (retryButtonClicked)
+        // if this is nonempty, we got an error
+        String error = deviceManager.initialise(0,  // numInputChannelsNeeded
+            2,  // numOutputChannelsNeeded
+            0,  // *savedState (XmlElement)
+            true, // selectDefaultDeviceOnFailure
+            String::empty, // preferred device
+            0); // preferred device setup options
+
+        if (error == String::empty)
         {
-            // as above
-            error = deviceManager.initialise(0, 2, 0, true, String::empty, 0);
+            initialized = true;
         }
-        else     // quit button clicked
+        else
         {
-            JUCEApplication::quit();
+            String titleMessage = String("Audio device initialization error");
+            String contentMessage = String("There was a problem initializing the audio device:\n" + error);
+            // this uses a bool since there are only two options
+            // also, omitting parameters works fine, even though the docs don't show defaults
+            bool retryButtonClicked = AlertWindow::showOkCancelBox(AlertWindow::QuestionIcon,
+                titleMessage,
+                contentMessage,
+                String("Retry"),
+                String("Quit"));
+
+            if (!retryButtonClicked) // quit button clicked
+            {
+                JUCEApplication::quit();
+                break;
+            }
         }
     }
 
-
     AudioIODevice* aIOd = deviceManager.getCurrentAudioDevice();
 
     // the error string doesn't tell you if there's no audio device found...

Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayCanvas.cpp

@@ -123,22 +123,22 @@ void SpikeDisplayCanvas::refreshState()
 
 void SpikeDisplayCanvas::resized()
 {
-    viewport->setBounds(0,0,getWidth(),getHeight()-90);
+    viewport->setBounds(0, 0, getWidth(), getHeight()-30); // leave space at bottom for buttons
 
     spikeDisplay->setBounds(0,0,getWidth()-scrollBarThickness, spikeDisplay->getTotalHeight());
 
-    clearButton->setBounds(10, getHeight()-40, 100,20);
+    clearButton->setBounds(10, getHeight()-25, 130, 20);
 
-    lockThresholdsButton->setBounds(130, getHeight()-40, 130,20);
+    lockThresholdsButton->setBounds(10+130+10, getHeight()-25, 130, 20);
 
-    invertSpikesButton->setBounds(270, getHeight()-40, 130,20);
+    invertSpikesButton->setBounds(10+130+10+130+10, getHeight()-25, 130, 20);
 
 }
 
 void SpikeDisplayCanvas::paint(Graphics& g)
 {
 
-    g.fillAll(Colours::darkgrey);
+    g.fillAll(Colours::black);
 
 }
 
@@ -423,7 +423,7 @@ void SpikeDisplay::resized()
 
         }
 
-        totalHeight = (int) maxHeight + 50;
+        totalHeight = (int) maxHeight;
 
         // std::cout << "New height = " << totalHeight << std::endl;
 

Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp

@@ -228,9 +228,13 @@ void ChannelMappingEditor::refreshButtonLocations()
         button->setBounds(column*width, row*height, width, height);
         totalWidth =  jmax(totalWidth, ++column*width);
 
-        if (column % 16 == 0)
+        if (column == 1)
         {
-            totalHeight =  jmax(totalHeight, ++row*height);
+            totalHeight = jmax(totalHeight, (row + 1)*height);
+        }
+        else if (column == 16)
+        {
+            row++;
             column = 0;            
         }
     }

Source/Plugins/IntanRecordingController/OpenEphysLib.cpp

@@ -49,7 +49,7 @@ extern "C" EXPORT int getPluginInfo(int index, Plugin::PluginInfo* info)
 	case 0:
 		info->type = Plugin::PLUGIN_TYPE_DATA_THREAD;
 		info->dataThread.name = "Intan Rec. Controller";
-		info->dataThread.creator = &createDataThread<RHD2000Thread>;
+		info->dataThread.creator = &createDataThread<IntanRecordingController::RHD2000Thread>;
 		break;
 	default:
 		return -1;

Source/Plugins/IntanRecordingController/RHD2000Editor.cpp

@@ -25,6 +25,7 @@
 #include <cmath>
 
 #include "RHD2000Thread.h"
+using namespace IntanRecordingController;
 
 #ifdef WIN32
 #if (_MSC_VER < 1800) //round doesn't exist on MSVC prior to 2013 version