Commit 57f9916a authored by Abdelali Elaazzouzi's avatar Abdelali Elaazzouzi

Correct some GUI views for humidity chamber v4

parent 2549a6da
......@@ -118,6 +118,7 @@
<property_switcher role="lss_sample_settings" property="enable_pump" switcher_key="enable_pumpSwitcher"/>
<property_switcher role="lss_sample_settings" property="enable_density_cells" switcher_key="enable_density_cellsSwitcher"/>
<property_switcher role="lss_sample_settings" property="enable_temp_cells" switcher_key="enable_temp_cellsSwitcher"/>
<property_switcher role="lss_sample_settings" property="main_id" switcher_key="main_idSwitcher"/>
<newLine/> <!-- Necessary for controller_name -->
<controller_name role="lss_sample_settings" font_style="BOLD" font_size="12"/>
......@@ -134,15 +135,17 @@
<simple_label prefix="lss_sample_settings.main_idPrefix"/>
<property_combo role="lss_sample_settings" property="main_id"/>
</switchable_composite>
<switchable_composite switcher_key="enable_first_bathSwitcher" switch_values="true">
<simple_label prefix="lss_sample_settings.first_bath_typePrefix"/>
<property_combo role="lss_sample_settings" property="first_bath_type"/>
<simple_label prefix="lss_sample_settings.first_bath_namePrefix"/>
<property_combo role="lss_sample_settings" property="first_bath_name"/>
<switchable_composite switcher_key="enable_first_external_tempSwitcher" switch_values="true">
<check role="lss_sample_settings" property="use_first_external_temp" prefix="lss_sample_settings.use_first_external_tempPrefix" checkBoxValues="lss_sample_settings.use_first_external_temp"/>
<switchable_composite switcher_key="use_first_external_tempSwitcher" switch_values="true">
<property_combo role="lss_sample_settings" property="first_external_temp"/>
<switchable_composite switcher_key="main_idSwitcher" switch_values="V1,V2,V3">
<switchable_composite switcher_key="enable_first_bathSwitcher" switch_values="true">
<simple_label prefix="lss_sample_settings.first_bath_typePrefix"/>
<property_combo role="lss_sample_settings" property="first_bath_type"/>
<simple_label prefix="lss_sample_settings.first_bath_namePrefix"/>
<property_combo role="lss_sample_settings" property="first_bath_name"/>
<switchable_composite switcher_key="enable_first_external_tempSwitcher" switch_values="true">
<check role="lss_sample_settings" property="use_first_external_temp" prefix="lss_sample_settings.use_first_external_tempPrefix" checkBoxValues="lss_sample_settings.use_first_external_temp"/>
<switchable_composite switcher_key="use_first_external_tempSwitcher" switch_values="true">
<property_combo role="lss_sample_settings" property="first_external_temp"/>
</switchable_composite>
</switchable_composite>
</switchable_composite>
</switchable_composite>
......@@ -154,15 +157,17 @@
<simple_label prefix="lss_sample_settings.main_idPrefix"/>
<label role="lss_sample_settings" property="main_id" font_style="BOLD"/>
</switchable_composite>
<switchable_composite switcher_key="enable_first_bathSwitcher" switch_values="true">
<simple_label prefix="lss_sample_settings.first_bath_typePrefix"/>
<label role="lss_sample_settings" property="first_bath_type"/>
<simple_label prefix="lss_sample_settings.first_bath_namePrefix"/>
<label role="lss_sample_settings" property="first_bath_name"/>
<switchable_composite switcher_key="enable_first_external_tempSwitcher" switch_values="true">
<switchable_composite switcher_key="use_first_external_tempSwitcher" switch_values="true">
<simple_label prefix="lss_sample_settings.use_first_external_tempPrefix"/>
<label role="lss_sample_settings" property="first_external_temp"/>
<switchable_composite switcher_key="main_idSwitcher" switch_values="V1,V2,V3">
<switchable_composite switcher_key="enable_first_bathSwitcher" switch_values="true">
<simple_label prefix="lss_sample_settings.first_bath_typePrefix"/>
<label role="lss_sample_settings" property="first_bath_type"/>
<simple_label prefix="lss_sample_settings.first_bath_namePrefix"/>
<label role="lss_sample_settings" property="first_bath_name"/>
<switchable_composite switcher_key="enable_first_external_tempSwitcher" switch_values="true">
<switchable_composite switcher_key="use_first_external_tempSwitcher" switch_values="true">
<simple_label prefix="lss_sample_settings.use_first_external_tempPrefix"/>
<label role="lss_sample_settings" property="first_external_temp"/>
</switchable_composite>
</switchable_composite>
</switchable_composite>
</switchable_composite>
......@@ -173,6 +178,7 @@
<newLine/>
<switchable_composite switcher_key="enable_first_bathSwitcher" switch_values="false">
<switchable_composite switcher_key="use_tempSwitcher" switch_values="false">
<check role="lss_sample_settings" property="use_insert" prefix="lss_sample_settings.use_insertPrefix" checkBoxValues="lss_sample_settings.use_insert"/>
......
......@@ -277,6 +277,8 @@ void LSSSampleSettings::refreshMainControllerTypeProperty(const std::string& val
else {
enableFirstBath = false;
enableSecondBath = false;
enableFirstExternalTemp = false;
enableSecondExternalTemp = false;
}
// if (value == HUMIDITY_CHAMBER_TYPE) {
// if (mainTempControllerId() == HUMIDITY_CHAMBER_V1_TYPE) {
......@@ -294,6 +296,8 @@ void LSSSampleSettings::refreshMainControllerTypeProperty(const std::string& val
} else {
enableFirstBath = false;
enableSecondBath = false;
enableFirstExternalTemp = false;
enableSecondExternalTemp = false;
}
SampleSettings::refreshMainControllerTypeProperty(value);
}
......@@ -309,6 +313,14 @@ void LSSSampleSettings::refreshMainControllerIdProperty(const std::string& value
m_V1HumidityController->bathReservoirDeviceName = firstBathName();
m_V1HumidityController->bathSampleDeviceType = secondBathType();
m_V1HumidityController->bathSampleDeviceName = secondBathName();
enableFirstBath = true;
if (m_Bath2Controller != NULL) {
insertControllerType = BATH_TYPE;
enableSecondBath = true;
if (m_BathSelector != NULL) {
enableBathSelector = true;
}
}
}
} else if (value == HUMIDITY_CHAMBER_V2_TYPE) {
if (m_V2HumidityController != NULL) {
......@@ -323,9 +335,21 @@ void LSSSampleSettings::refreshMainControllerIdProperty(const std::string& value
m_V3HumidityController->bathReservoirDeviceName = firstBathName();
m_V3HumidityController->bathSampleDeviceType = secondBathType();
m_V3HumidityController->bathSampleDeviceName = secondBathName();
enableFirstBath = true;
if (m_Bath2Controller != NULL) {
insertControllerType = BATH_TYPE;
enableSecondBath = true;
if (m_BathSelector != NULL) {
enableBathSelector = true;
}
}
}
} else if (value == HUMIDITY_CHAMBER_V4_TYPE) {
// No bath connected
enableFirstBath = false;
enableSecondBath = false;
enableFirstExternalTemp = false;
enableSecondExternalTemp = false;
}
}
SampleSettings::refreshMainControllerIdProperty(value);
......
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