diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp index 4e9b11b4d077cda8ee8448fee5abb4dc1cf65a8c..246cf5c042b063b63f6465c3a8dcff2306c523cb 100644 --- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp +++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp @@ -326,13 +326,11 @@ void RefuelingVisualizer::backgroundTabs(Message msg) uint64_t ventingValve = msg.getField("venting_valve_state").getUnsignedInteger(); uint64_t tarsState = msg.getField("tars_state").getUnsignedInteger(); - uint64_t mainValve = msg.getField("main_valve_state").getUnsignedInteger(); auto background = outerLayout->itemAt(0)->widget(); auto labelFillingValve = outerLayout->itemAt(3)->widget(); auto labelReleaseValve = outerLayout->itemAt(4)->widget(); auto labelVentingValve = outerLayout->itemAt(5)->widget(); - auto labelMainValve = outerLayout->itemAt(2)->widget(); // VALVE STATE LABELS STYLE QString valveLabelStyleON = @@ -377,16 +375,6 @@ void RefuelingVisualizer::backgroundTabs(Message msg) ": REFUELING"); } - // MAIN TAB - if (mainValve == 1) - { - labelMainValve->setStyleSheet(valveLabelStyleON); - } - else - { - labelMainValve->setStyleSheet(valveLabelStyleOFF); - } - // VALVES TABS if (fillingValve == 0 && releaseValve == 0 && ventingValve == 0) { @@ -516,13 +504,32 @@ void RefuelingVisualizer::onMsgReceivedGSE(const Message& msg) void RefuelingVisualizer::onMsgReceivedMOT(const Message& msg) { + // RETRIEVE DATA // Tank float tankTemperature = msg.getField("tank_temperature").getDouble(); float tankTOPpressure = msg.getField("top_tank_pressure").getDouble(); float tankBOTpressure = msg.getField("bottom_tank_pressure").getDouble(); - // uint8_t floatingLevel = - // msg.getField("floating_level").getUnsignedInteger(); + uint64_t mainValve = msg.getField("main_valve_state").getUnsignedInteger(); + + // VALVE STATE LABELS STYLE + QString valveLabelStyleON = + "border-width: 1px; border-style: solid; border-radius: 1px; " + "border-color: white; background-color: rgb(82, 142, 56);"; + QString valveLabelStyleOFF = + "border-width: 1px; border-style: solid; border-radius: 1px; " + "border-color: white; background-color: rgb(255, 0, 0)"; + + // CHANGE MAIN VALVE TAB + auto labelMainValve = outerLayout->itemAt(2)->widget(); + if (mainValve == 1) + { + labelMainValve->setStyleSheet(valveLabelStyleON); + } + else + { + labelMainValve->setStyleSheet(valveLabelStyleOFF); + } // CHANGE LABELS // Tank