Commit 72db8d34 authored by Jussi Lindgren's avatar Jussi Lindgren

Drivers: Various fixes to the gNautilus driver

- Error messages are now printed to the LogManager
- Added handling of additional error cases
- Added support for channel units
- Miscellaneous small fixes and code cleanup

Patch contributed by g.tec medical engineering GmbH
parent 331d62d5
......@@ -3575,6 +3575,19 @@
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button_change_channel_names">
<property name="label" translatable="yes">Change channel names...</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_channel_settings">
<property name="visible">True</property>
......@@ -3584,7 +3597,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">7</property>
<property name="position">8</property>
</packing>
</child>
<child>
......@@ -3595,7 +3608,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">8</property>
<property name="position">9</property>
</packing>
</child>
<child>
......@@ -3632,7 +3645,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">9</property>
<property name="position">10</property>
</packing>
</child>
<child>
......@@ -3643,7 +3656,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">10</property>
<property name="position">11</property>
</packing>
</child>
</object>
......
......@@ -51,7 +51,7 @@ namespace OpenViBEAcquisitionServer
OpenViBE::boolean& rBatteryLevelEnabled,
OpenViBE::boolean& rValidationIndicatorEnabled,
vector<OpenViBE::uint16>& rSelectedChannels,
vector<OpenViBE::uint16>& rBipolarChannels,
vector<OpenViBE::int32>& rBipolarChannels,
vector<OpenViBE::boolean>& rCAR,
vector<OpenViBE::boolean>& rNoiseReduction
);
......@@ -90,7 +90,7 @@ namespace OpenViBEAcquisitionServer
OpenViBE::boolean& m_rBatteryLevelEnabled;
OpenViBE::boolean& m_rValidationIndicatorEnabled;
vector<OpenViBE::uint16>& m_vSelectedChannels;
vector<OpenViBE::uint16>& m_vBipolarChannels;
vector<OpenViBE::int32>& m_vBipolarChannels;
vector<OpenViBE::boolean>& m_vCAR;
vector<OpenViBE::boolean>& m_vNoiseReduction;
vector<OpenViBE::int32> m_vComboBoxBandpassFilterIndex;
......
......@@ -89,7 +89,7 @@ namespace OpenViBEAcquisitionServer
OpenViBE::boolean m_bBatteryLevelEnabled;
OpenViBE::boolean m_bValidationIndicatorEnabled;
vector<OpenViBE::uint16> m_vSelectedChannels;
vector<OpenViBE::uint16> m_vBipolarChannels;
vector<OpenViBE::int32> m_vBipolarChannels;
vector<OpenViBE::boolean> m_vNoiseReduction;
vector<OpenViBE::boolean> m_vCAR;
OpenViBE::uint32 m_ui32AcquiredChannelCount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment