diff --git a/src/shared/Modules/RefuelingVisualizer/111.png b/src/shared/Modules/RefuelingVisualizer/111.png
new file mode 100644
index 0000000000000000000000000000000000000000..31deb6afe3fd2a570c510013724094ac2986cdc0
Binary files /dev/null and b/src/shared/Modules/RefuelingVisualizer/111.png differ
diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
index f997443655f6a666484ef41fa128d614a46e09c8..f4ba2d5ac9808d981fdb8a5a21ccad580128780b 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
@@ -56,41 +56,37 @@ void RefuelingVisualizer::fromXmlObject(const XmlObject& xmlObject)
void RefuelingVisualizer::setupUi()
{
outerLayout = new QGridLayout;
- outerLayout->setContentsMargins(0, 0, 0, 0);
+ outerLayout->setContentsMargins(0, 0, -10, 0);
outerLayout->setSpacing(0);
- // BACKGROUND IMAGES
+ // BACKGROUND IMAGE
QLabel* background = new QLabel;
background->setStyleSheet(
"border-image:url(../skywardhub/src/shared/Modules/RefuelingVisualizer/"
- "background.png) 0 0 0 0;");
- outerLayout->addWidget(background, 0, 0, 460, 555);
+ "111.png);border:0px;");
- // VALVES VISUALIZERS
- QLabel* fillingValveIm = new QLabel;
- fillingValveIm->setStyleSheet(
- "border-image:url(../skywardhub/src/shared/Modules/RefuelingVisualizer/"
- "valve_horiz_closed.png) 0 0 0 0;");
- outerLayout->addWidget(fillingValveIm, 355, 330, 25, 55);
-
- QLabel* releaseValveIm = new QLabel;
- releaseValveIm->setStyleSheet(
- "border-image:url(../skywardhub/src/shared/Modules/RefuelingVisualizer/"
- "valve_vert_closed.png) 0 0 0 0;");
- outerLayout->addWidget(releaseValveIm, 290, 285, 55, 25);
+ outerLayout->addWidget(background, 0, 0, 5000, 5000);
- QLabel* ventingValveIm = new QLabel;
- ventingValveIm->setStyleSheet(
- "border-image:url(../skywardhub/src/shared/Modules/RefuelingVisualizer/"
- "valve_vert_closed.png) 0 0 0 0;");
- outerLayout->addWidget(ventingValveIm, 100, 104, 55, 25);
+ // VALVE LABELS STYLE
+ QString valveLabelStyleCompleted =
+ "border-width: 1px; border-style: solid; border-radius: 1px; "
+ "border-color: white; background-color: rgb(82, 142, 56)";
// TARS STATE
QLabel* labelTars = new QLabel;
labelTars->setText(RefuelingVisualizerCommandList::commandLabels[0]);
labelTars->setAlignment(Qt::AlignCenter);
labelTars->setContentsMargins(4, 4, 4, 4);
- outerLayout->addWidget(labelTars, 460, 0, 20, 555);
+ labelTars->setStyleSheet(valveLabelStyleCompleted);
+ outerLayout->addWidget(labelTars, 5570, 0, 70, 5000);
+
+ // MAIN VALVE
+ QLabel* labelMain = new QLabel;
+ labelMain->setText(RefuelingVisualizerCommandList::commandLabels[4]);
+ labelMain->setAlignment(Qt::AlignCenter);
+ labelMain->setContentsMargins(4, 4, 4, 4);
+ labelMain->setStyleSheet(valveLabelStyleCompleted);
+ outerLayout->addWidget(labelMain, 5640, 0, 70, 5000);
// VALVES STATES
for (int i = 1; i < 4; i++)
@@ -99,10 +95,29 @@ void RefuelingVisualizer::setupUi()
labelValve->setText(RefuelingVisualizerCommandList::commandLabels[i]);
labelValve->setAlignment(Qt::AlignCenter);
labelValve->setContentsMargins(4, 4, 4, 4);
- outerLayout->addWidget(labelValve, 480, (i - 1) * 185, 20, 185);
+ labelValve->setStyleSheet(valveLabelStyleCompleted);
+ outerLayout->addWidget(labelValve, 5499, (i - 1) * 1666, 70, 1666);
}
+ // topTankPressureLabelIm = new QLabel;
+ // topTankPressureLabelIm->setAlignment(Qt::AlignCenter);
+ // topTankPressureLabelIm->setContentsMargins(4, 4, 4, 4);
+ // outerLayout->addWidget(topTankPressureLabelIm, 50, 50, 15, 20);
+
+ // loadcellTank = new QLabel;
+ // loadcellTank->setAlignment(Qt::AlignCenter);
+ // loadcellTank->setContentsMargins(4, 4, 4, 4);
+ // outerLayout->addWidget(loadcellTank, 50, 77, 15, 20);
+
+ // QFrame* line = new QFrame();
+ // line->setGeometry(QRect(50, 150, 100, 50));
+ // line->setFrameShape(QFrame::HLine);
+ // line->setStyleSheet("background-color:rgb(255,255,255)");
+ // outerLayout->addWidget(line, 50, 150, 1, 50);
setLayout(outerLayout);
+
+ // QPainter* painter = QPainter(outerLayout);
+ // painter->drawLine(50, 50, 200, 200);
}
void RefuelingVisualizer::addCustomActionsToMenu()
@@ -133,81 +148,96 @@ void RefuelingVisualizer::setFilter(const Filter& newFilter)
void RefuelingVisualizer::onMsgReceived(const Message& msg)
{
uint64_t tarsState = msg.getField("tars_state").getUnsignedInteger();
- uint64_t release = msg.getField("release_vlave_state").getUnsignedInteger();
+ uint64_t release = msg.getField("release_valve_state").getUnsignedInteger();
uint64_t filling = msg.getField("filling_valve_state").getUnsignedInteger();
uint64_t venting = msg.getField("venting_valve_state").getUnsignedInteger();
QString baseStyle =
- "border-bottom-width:1px;border-left-width:1px;border-top-width:"
- "1px;border-radius:0;font:bold-large;font-size:16px";
- QString completedStyle = "background-color:rgb(51,117,17);" + baseStyle;
- QString errorStyle = "background-color:rgb(212,6,6);" + baseStyle;
-
- if (tarsState == 1)
- {
- 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;");
- }
- 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;");
- }
-
- 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;");
- }
- 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;");
- }
-
- 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;");
- }
- 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-width: 1px; border-style: solid; border-radius: 1px; "
+ "border-color: white; background-color: rgb(82, 142, 56)";
+
+ // 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;");
+ // }
}
diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
index 3f5506e1e13204c873108478083ed417567bcaa0..c82e14461e4997c63775985849f543c25d05781c 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
@@ -48,6 +48,8 @@ private:
void onMsgReceived(const Message& msg);
QGridLayout* outerLayout;
+ // QLabel* topTankPressureLabelIm;
+ // QLabel* loadcellTank;
Filter filter;
RefuelingVisualizerCommandList::Valve currentState;
diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizerCommandList.h b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizerCommandList.h
index d2877f832a4ea4e0b4cfc0baaea123ae1a472af7..c8cc60a40e34f13298496cfebbdd73932a77ecd5 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizerCommandList.h
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizerCommandList.h
@@ -35,10 +35,7 @@ enum class Valve : int
// Groundstation labels
static const QList<QString> commandLabels{
- "TARS",
- "FILLING",
- "RELEASE",
- "VENTING",
+ "TARS", "FILLING", "RELEASE", "VENTING", "MAIN",
};
// Map from rocket states to groundstation labels
diff --git a/src/shared/Modules/RefuelingVisualizer/background.png b/src/shared/Modules/RefuelingVisualizer/background.png
deleted file mode 100644
index b873ba1c332172f9388890b27c7255de6a897f3a..0000000000000000000000000000000000000000
Binary files a/src/shared/Modules/RefuelingVisualizer/background.png and /dev/null differ
diff --git a/src/shared/Modules/RefuelingVisualizer/valve_horiz_closed.png b/src/shared/Modules/RefuelingVisualizer/valve_horiz_closed.png
deleted file mode 100644
index cba34f96ddbd09e4da7bd8dc157860aea2094dec..0000000000000000000000000000000000000000
Binary files a/src/shared/Modules/RefuelingVisualizer/valve_horiz_closed.png and /dev/null differ
diff --git a/src/shared/Modules/RefuelingVisualizer/valve_horiz_opened.png b/src/shared/Modules/RefuelingVisualizer/valve_horiz_opened.png
deleted file mode 100644
index 65695bf639ba44471010d4afc6e8a3fbe77f0e83..0000000000000000000000000000000000000000
Binary files a/src/shared/Modules/RefuelingVisualizer/valve_horiz_opened.png and /dev/null differ
diff --git a/src/shared/Modules/RefuelingVisualizer/valve_vert_closed.png b/src/shared/Modules/RefuelingVisualizer/valve_vert_closed.png
deleted file mode 100644
index 3b92763bb65419717c97ff64320088bb6e9a6aa5..0000000000000000000000000000000000000000
Binary files a/src/shared/Modules/RefuelingVisualizer/valve_vert_closed.png and /dev/null differ
diff --git a/src/shared/Modules/RefuelingVisualizer/valve_vert_opened.png b/src/shared/Modules/RefuelingVisualizer/valve_vert_opened.png
deleted file mode 100644
index 7bc121633d072ca30753b9d597c377cb7c0d6c40..0000000000000000000000000000000000000000
Binary files a/src/shared/Modules/RefuelingVisualizer/valve_vert_opened.png and /dev/null differ