diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
index fb5adc4fd1b6acd50e739c81ffe463f5f9b2ff00..7c5856474b3f2ab514199792b034347ebf037c8c 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
@@ -329,10 +329,10 @@ void RefuelingVisualizer::setFilter(const Filter& newFilter)
newFilter, this,
[this](const Message& message, const Filter& filter)
{ onMsgReceived(message); });
- // filter = newFilter;
+ filter = newFilter;
}
-void RefuelingVisualizer::backgroundValves(Message msg)
+void RefuelingVisualizer::backgroundTabs(Message msg)
{
uint64_t releaseValve =
msg.getField("release_valve_state").getUnsignedInteger();
@@ -340,11 +340,15 @@ void RefuelingVisualizer::backgroundValves(Message msg)
msg.getField("filling_valve_state").getUnsignedInteger();
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 labelTarsTab = outerLayout->itemAt(1)->widget();
+ auto labelMainValve = outerLayout->itemAt(2)->widget();
// VALVE STATE LABELS STYLE
QString valveLabelStyleON =
@@ -354,6 +358,24 @@ void RefuelingVisualizer::backgroundValves(Message msg)
"border-width: 1px; border-style: solid; border-radius: 1px; "
"border-color: white; background-color: rgb(255, 0, 0)";
+ if (tarsState > 0)
+ {
+ labelTarsTab->setStyleSheet(valveLabelStyleON);
+ }
+ else
+ {
+ labelTarsTab->setStyleSheet(valveLabelStyleOFF);
+ }
+
+ if (mainValve == 1)
+ {
+ labelMainValve->setStyleSheet(valveLabelStyleON);
+ }
+ else
+ {
+ labelMainValve->setStyleSheet(valveLabelStyleOFF);
+ }
+
if (fillingValve == 0 && releaseValve == 0 && ventingValve == 0)
{
background->setStyleSheet(
@@ -445,93 +467,23 @@ void RefuelingVisualizer::backgroundValves(Message msg)
void RefuelingVisualizer::onMsgReceived(const Message& msg)
{
- // uint64_t tarsState = msg.getField("tars_state").getUnsignedInteger();
-
- backgroundValves(msg);
-
-
- // auto ciao = outerLayout->itemAt(8)->widget();
- // topTankPressureLabelIm->setStyleSheet(
- // "border-image:url(../skywardhub/src/shared/Modules/"
- // "RefuelingVisualizer/massSymbol.svg) 0 0 0 0;border:0px;");
- // topTankPressureLabelIm->setText("KG");
-
- // loadcellTank->setStyleSheet(
- // "border-image:url(../skywardhub/src/shared/Modules/"
- // "RefuelingVisualizer/pressureSymbol.svg) 0 0 0 0;border:0px;");
- // loadcellTank->setText("Pa");
-
- // if (tarsState > 2)
- //{
- // auto labelTars = outerLayout->itemAt(4)->widget();
- // labelTars->setStyleSheet(completedStyle);
- // }
- // else
- //{
- // auto labelTars = outerLayout->itemAt(4)->widget();
- // labelTars->setStyleSheet(errorStyle);
- // }
-
- // if (filling == 1)
- //{
- // auto labelValve = outerLayout->itemAt(5)->widget();
- // labelValve->setStyleSheet(completedStyle);
- // auto fillingValveIm = outerLayout->itemAt(1)->widget();
- // fillingValveIm->setStyleSheet(
- // "border-image:url(../skywardhub/src/shared/Modules/"
- // "RefuelingVisualizer/valve_horiz_opened.png) 0 0 0
- // 0;border:0px;");
- // }
- // else
- //{
- // auto labelValve = outerLayout->itemAt(5)->widget();
- // labelValve->setStyleSheet(errorStyle);
- // auto fillingValveIm = outerLayout->itemAt(1)->widget();
- // fillingValveIm->setStyleSheet(
- // "border-image:url(../skywardhub/src/shared/Modules/"
- // "RefuelingVisualizer/valve_horiz_closed.png) 0 0 0
- // 0;border:0px;");
- // }
-
- // if (release == 1)
- //{
- // auto labelValve = outerLayout->itemAt(6)->widget();
- // labelValve->setStyleSheet(completedStyle);
- // auto releaseValveIm = outerLayout->itemAt(2)->widget();
- // releaseValveIm->setStyleSheet(
- // "border-image:url(../skywardhub/src/shared/Modules/"
- // "RefuelingVisualizer/valve_vert_opened.png) 0 0 0
- // 0;border:0px;");
- // }
- // else
- //{
- // auto labelValve = outerLayout->itemAt(6)->widget();
- // labelValve->setStyleSheet(errorStyle);
- // auto releaseValveIm = outerLayout->itemAt(2)->widget();
- // releaseValveIm->setStyleSheet(
- // "border-image:url(../skywardhub/src/shared/Modules/"
- // "RefuelingVisualizer/valve_vert_closed.png) 0 0 0
- // 0;border:0px;");
- // }
-
- // if (venting == 1)
- //{
- // auto labelValve = outerLayout->itemAt(7)->widget();
- // labelValve->setStyleSheet(completedStyle);
- // auto ventingValveIm = outerLayout->itemAt(3)->widget();
- // ventingValveIm->setStyleSheet(
- // "border-image:url(../skywardhub/src/shared/Modules/"
- // "RefuelingVisualizer/valve_vert_opened.png) 0 0 0
- // 0;border:0px;");
- // }
- // else
- //{
- // auto labelValve = outerLayout->itemAt(7)->widget();
- // labelValve->setStyleSheet(errorStyle);
- // auto ventingValveIm = outerLayout->itemAt(3)->widget();
- // ventingValveIm->setStyleSheet(
- // "border-image:url(../skywardhub/src/shared/Modules/"
- // "RefuelingVisualizer/valve_vert_closed.png) 0 0 0
- // 0;border:0px;");
- // }
+ // Change background and tabs
+ backgroundTabs(msg);
+
+ // GET DATA
+ // Vessel
+ float vesselLoadcell = msg.getField("loadcell_vessel").getDouble();
+ float vesselPressure = msg.getField("vessel_pressure").getDouble();
+ // Tank
+ //float tankLoadcell = msg.getField("loadcell_tank").getDouble();
+ //float tankTemperature = msg.getField("tank_temperature").getDouble();
+ //float tankTOPpres = msg.getField("top_tank_pressure").getDouble();
+ //float tankBOTpres = msg.getField("bottom_tank_pressure").getDouble();
+ //uint8_t tankFloatingLev = msg.getField("floating_level").getUnsignedInteger();
+
+ // Change data inside labels
+ loadcellVesselDataLabel->setText(QString::number(vesselLoadcell, 'f', 3) +
+ " KG");
+ vesselPressureDataLabel->setText(QString::number(vesselPressure, 'f', 3) +
+ " bar");
}
diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
index 85721c61316748e8e621aad4300dc02cd7ba4e99..649aa57fe83ea7753bed9f6ed7d5037f91cc51a3 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
@@ -46,7 +46,7 @@ private:
void onConfigureClicked();
void setFilter(const Filter& filter);
void onMsgReceived(const Message& msg);
- void backgroundValves(Message msg);
+ void backgroundTabs(Message msg);
QGridLayout* outerLayout;