Add unit field to data channel objects

Author: aacuevas

Builds/VisualStudio2013/open-ephys.sln

@@ -1,21 +1,31 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
+		Debug|x64 = Debug|x64
+		Debug64|Win32 = Debug64|Win32
 		Debug64|x64 = Debug64|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		Release64|Win32 = Release64|Win32
 		Release64|x64 = Release64|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
-		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
-		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|Win32.ActiveCfg = Release64|x64
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
 	EndGlobalSection

Source/Processors/Channel/InfoObjects.cpp

@@ -179,6 +179,16 @@ float DataChannel::getBitVolts() const
 	return m_bitVolts;
 }
 
+void DataChannel::setDataUnits(String unit)
+{
+	m_unitName = unit;
+}
+
+String DataChannel::getDataUnits() const
+{
+	return m_unitName;
+}
+
 DataChannel::DataChannelTypes DataChannel::getChannelType() const
 {
 	return m_type;

Source/Processors/Channel/InfoObjects.h

@@ -201,6 +201,12 @@ class PLUGIN_API DataChannel
 	/** Returns the bitVolts value for this channel. */
 	float getBitVolts() const;
 
+	/** Sets the unit string */
+	void setDataUnits(String unit);
+	
+	/** Gets the data units*/
+	String getDataUnits() const;
+
 	DataChannelTypes getChannelType() const;
 
 	//--------- STATUS METHODS ----------//
@@ -235,6 +241,7 @@ class PLUGIN_API DataChannel
 	bool m_isEnabled{ true };
 	bool m_isMonitored{ false };
 	bool m_isRecording{ false };
+	String m_unitName{ "uV" };
 
 	JUCE_LEAK_DETECTOR(DataChannel);
 };

Source/Processors/DataThreads/DataThread.cpp

@@ -141,4 +141,9 @@ void DataThread::createExtraEvents(Array<EventChannel*>&)
 {}
 
 void DataThread::resizeBuffers()
-{}
+{}
+
+String DataThread::getChannelUnits(int chanIndex) const
+{
+	return String::empty;
+}

Source/Processors/DataThreads/DataThread.h

@@ -137,6 +137,8 @@ class PLUGIN_API DataThread : public Thread
 
 	void createTTLChannels();
 
+	virtual String getChannelUnits(int chanIndex) const;
+
 protected:
     virtual void setDefaultChannelNames();
 

Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp

@@ -929,6 +929,19 @@ int RHD2000Thread::getNumDataOutputs(DataChannel::DataChannelTypes type, int sub
 	}
 }
 
+String RHD2000Thread::getChannelUnits(int chanIndex) const
+{
+	switch (sn->getDataChannel(chanIndex)->getChannelType())
+	{
+	case DataChannel::AUX_CHANNEL:
+		return "mV";
+	case DataChannel::ADC_CHANNEL:
+		return "V";
+	default:
+		return "uV";
+	}
+}
+
 
 int RHD2000Thread::getNumTTLOutputs(int subproc) const
 {

Source/Processors/DataThreads/RhythmNode/RHD2000Thread.h

@@ -126,6 +126,8 @@ class RHD2000Thread : public DataThread
     String getChannelName (int ch) const;
     void setNumChannels (int hsNum, int nChannels);
 
+	String getChannelUnits(int chanIndex) const override;
+
     int getHeadstageChannels         (int hsNum) const;
     int getActiveChannelsInHeadstage (int hsNum) const;
 

Source/Processors/SourceNode/SourceNode.cpp

@@ -109,6 +109,13 @@ void SourceNode::updateSettings()
 	{
 		dataThread->updateChannels();
 		resizeBuffers();
+		int nChans = dataChannelArray.size();
+		for (int i = 0; i < nChans; i++)
+		{
+			String unit = dataThread->getChannelUnits(i);
+			if (unit.isNotEmpty())
+				dataChannelArray[i]->setDataUnits(unit);
+		}
 	}
 }