Index: sources/view/dg/data/VDGValvesStatesData.cpp =================================================================== diff -u -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/view/dg/data/VDGValvesStatesData.cpp (.../VDGValvesStatesData.cpp) (revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3) +++ sources/view/dg/data/VDGValvesStatesData.cpp (.../VDGValvesStatesData.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -21,19 +21,19 @@ void VDGValvesStates::onActionReceive(const DGValvesStatesData &vData) { - valveStates_01 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_01 )); - valveStates_02 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_02 )); - valveStates_03 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_03 )); - valveStates_04 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_04 )); - valveStates_05 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_05 )); - valveStates_06 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_06 )); - valveStates_07 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_07 )); - valveStates_08 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_08 )); - valveStates_09 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_09 )); - valveStates_10 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_10 )); - valveStates_11 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_11 )); - valveStates_12 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_12 )); - valveStates_13 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_13 )); + valveStates_VRF ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRF )); + valveStates_VRI ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRI )); + valveStates_VRD ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRD )); + valveStates_VRO ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRO )); + valveStates_VPO ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPO )); + valveStates_VBF ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VBF )); + valveStates_VRC ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRC )); + valveStates_VDR ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VDR )); + valveStates_VPI ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPI )); + valveStates_VSP ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VSP )); + valveStates_VR1 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VR1 )); + valveStates_VR2 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VR2 )); + valveStates_VPD ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPD )); // Trigger should be the last refresh(true); @@ -43,18 +43,18 @@ { // order changed in reverse by request. QString text = QString() + - (valveStates_13() ? "1" : "0" ) + "" + - (valveStates_12() ? "1" : "0" ) + "" + - (valveStates_11() ? "1" : "0" ) + "" + - (valveStates_10() ? "1" : "0" ) + "" + - (valveStates_09() ? "1" : "0" ) + "" + - (valveStates_08() ? "1" : "0" ) + "" + - (valveStates_07() ? "1" : "0" ) + "" + - (valveStates_06() ? "1" : "0" ) + "" + - (valveStates_05() ? "1" : "0" ) + "" + - (valveStates_04() ? "1" : "0" ) + "" + - (valveStates_03() ? "1" : "0" ) + "" + - (valveStates_02() ? "1" : "0" ) + "" + - (valveStates_01() ? "1" : "0" ); + (valveStates_VRF () ? "1" : "0" ) + "" + + (valveStates_VRI () ? "1" : "0" ) + "" + + (valveStates_VRD () ? "1" : "0" ) + "" + + (valveStates_VRO () ? "1" : "0" ) + "" + + (valveStates_VPO () ? "1" : "0" ) + "" + + (valveStates_VBF () ? "1" : "0" ) + "" + + (valveStates_VRC () ? "1" : "0" ) + "" + + (valveStates_VDR () ? "1" : "0" ) + "" + + (valveStates_VPI () ? "1" : "0" ) + "" + + (valveStates_VSP () ? "1" : "0" ) + "" + + (valveStates_VR1 () ? "1" : "0" ) + "" + + (valveStates_VR2 () ? "1" : "0" ) + "" + + (valveStates_VPD () ? "1" : "0" ); return text; }