diff --git a/OpenEphys.Onix1/UclaMiniscopeV4CameraData.cs b/OpenEphys.Onix1/UclaMiniscopeV4CameraData.cs
index 32d20c9..7d861b5 100644
--- a/OpenEphys.Onix1/UclaMiniscopeV4CameraData.cs
+++ b/OpenEphys.Onix1/UclaMiniscopeV4CameraData.cs
@@ -10,10 +10,10 @@
namespace OpenEphys.Onix1
{
///
- /// Produces a sequence of s from the Python-480 image sensor on a
+ /// Produces a sequence of s from the Python-480 image sensor on a
/// UCLA Miniscope V4.
///
- public class UclaMiniscopeV4CameraData : Source
+ public class UclaMiniscopeV4CameraData : Source
{
///
[TypeConverter(typeof(UclaMiniscopeV4.NameConverter))]
@@ -38,11 +38,11 @@ public class UclaMiniscopeV4CameraData : Source
public UclaMiniscopeV4ImageDepth DataType { get; set; } = UclaMiniscopeV4ImageDepth.U8;
///
- /// Generates a sequence of s at a rate determined by s at a rate determined by .
///
- /// A sequence of s
- public unsafe override IObservable Generate()
+ /// A sequence of s
+ public unsafe override IObservable Generate()
{
return DeviceManager.GetDevice(DeviceName).SelectMany(deviceInfo =>
{
@@ -51,7 +51,7 @@ public unsafe override IObservable Generate()
var scopeData = device.Context.GetDeviceFrames(passthrough.Address);
var dataType = DataType;
- return Observable.Create(observer =>
+ return Observable.Create(observer =>
{
var sampleIndex = 0;
var imageBuffer = new short[UclaMiniscopeV4.SensorRows * UclaMiniscopeV4.SensorColumns];
@@ -83,12 +83,12 @@ public unsafe override IObservable Generate()
{
var eightBitImageData = new Mat(imageData.Size, Depth.U8, 1);
CV.ConvertScale(imageData, eightBitImageData, 0.25);
- observer.OnNext(new UclaMiniscopeV4CameraFrame(clockBuffer, hubClockBuffer, eightBitImageData.GetImage()));
+ observer.OnNext(new UclaMiniscopeV4CameraDataFrame(clockBuffer, hubClockBuffer, eightBitImageData.GetImage()));
break;
}
case UclaMiniscopeV4ImageDepth.U10:
{
- observer.OnNext(new UclaMiniscopeV4CameraFrame(clockBuffer, hubClockBuffer, imageData.GetImage()));
+ observer.OnNext(new UclaMiniscopeV4CameraDataFrame(clockBuffer, hubClockBuffer, imageData.GetImage()));
break;
}
}
diff --git a/OpenEphys.Onix1/UclaMiniscopeV4CameraFrame.cs b/OpenEphys.Onix1/UclaMiniscopeV4CameraDataFrame.cs
similarity index 84%
rename from OpenEphys.Onix1/UclaMiniscopeV4CameraFrame.cs
rename to OpenEphys.Onix1/UclaMiniscopeV4CameraDataFrame.cs
index 5b3f2ca..6df4f9f 100644
--- a/OpenEphys.Onix1/UclaMiniscopeV4CameraFrame.cs
+++ b/OpenEphys.Onix1/UclaMiniscopeV4CameraDataFrame.cs
@@ -6,15 +6,15 @@ namespace OpenEphys.Onix1
///
/// Image data produced by the Python-480 CMOS image sensor on a UCLA Miniscope V4.
///
- public class UclaMiniscopeV4CameraFrame : BufferedDataFrame
+ public class UclaMiniscopeV4CameraDataFrame : BufferedDataFrame
{
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// An array of values.
/// An array of hub clock counter values.
/// A image produced by the Python-480 on a UCLA Miniscope V4.
- public UclaMiniscopeV4CameraFrame(ulong[] clock, ulong[] hubClock, IplImage image)
+ public UclaMiniscopeV4CameraDataFrame(ulong[] clock, ulong[] hubClock, IplImage image)
: base (clock, hubClock)
{
Image = image;