New layout

.clang-tidy

@@ -0,0 +1,20 @@
+Checks: "readability-identifier-naming"
+HeaderFileExtensions: ["hpp"]
+ImplementationFileExtensions: ["cpp"]
+HeaderFilterRegex: "(src)"
+ExcludeHeaderFilterRegex: "(_deps)"
+CheckOptions:
+  readability-identifier-naming.ClassCase: CamelCase
+  readability-identifier-naming.StructCase: CamelCase
+  readability-identifier-naming.FunctionCase: CamelCase
+  readability-identifier-naming.MethodCase: CamelCase
+  readability-identifier-naming.MemberCase: CamelCase
+  readability-identifier-naming.EnumCase: CamelCase
+  readability-identifier-naming.ScopedEnumCase: CamelCase
+
+  readability-identifier-naming.ParameterCase: lower_case
+  readability-identifier-naming.MacroDefinitionCase: UPPER_CASE
+  readability-identifier-naming.GlobalConstantCase: UPPER_CASE
+  readability-identifier-naming.GlobalConstantPointerCase: UPPER_CASE
+  readability-identifier-naming.EnumConstantCase: UPPER_CASE
+  readability-identifier-naming.ScopedEnumConstantCase: UPPER_CASE

.clangd

@@ -1,4 +1,4 @@
 CompileFlags:
-  Add: [-xc++, -Wall]
+  Add: [-xc++, -Wall, -std=c++20]
   Remove: [-mno-direct-extern-access, -fmodules-ts, -fmodule-mapper*, -fdeps-format*]
   CompilationDatabase: build

cmake/cpp.cmake

@@ -29,7 +29,8 @@ set(DISPLAYER_SOURCES
 	"${WIDGETS_SRC_DIR}/Displays/QuantitiesRatesDisplay.cpp"
 	"${WIDGETS_SRC_DIR}/Displays/QuantitiesRatesRow.cpp"
 	"${WIDGETS_SRC_DIR}/Displays/RateLabel.cpp"
-	"${WIDGETS_SRC_DIR}/Displays/MultiPlotContainer.cpp")
+	"${WIDGETS_SRC_DIR}/Displays/MultiPlotContainer.cpp"
+	"${WIDGETS_SRC_DIR}/Displays/StatusCollector.cpp")
 
 set(WIDGET_SOURCES
 	${WINDOWING_SOURCES}

src/Plotting/Appearance.hpp

@@ -10,15 +10,15 @@ namespace VSCL::Plot {
 // Normalized in RGB space.
 typedef std::array<double, 3> ColorRGB;
 
-static const std::map<std::string, ColorRGB> StandardColor = {
+static const std::map<std::string, ColorRGB> STANDARD_COLOR = {
 	{ "Red",	ColorRGB{ 1.0, 0.0, 0.0 } },
 	{ "Green",	ColorRGB{ 0.0, 1.0, 0.0 } },
 	{ "Blue",	ColorRGB{ 0.0, 0.0, 1.0 } },
 };
 
 enum class LineStyle : uint8_t {
-	Solid = 1,
-	Dashed = 2,
-	Dotted = 3,
+	SOLID = 1,
+	DASHED = 2,
+	DOTTED = 3,
 };
 } // namespace VSCL::Plot

src/Plotting/Axes.hpp

@@ -7,20 +7,20 @@
 namespace VSCL::Plot {
 
 enum class Axis : std::uint8_t {
-	Time = 0,
-	Quantity = 1,
+	TIME = 0,
+	QUANTITY = 1,
 };
 
 enum class AxisScaling : std::uint8_t {
-	Linear = 0,
-	Log10 = 1,
-	Ln = 2,
-	Inverted = 3
+	LINEAR = 0,
+	LOG10 = 1,
+	LN = 2,
+	INVERTED = 3
 };
 
 struct AxisInfo {
 	Axis InfoOf;
-	AxisScaling Scaling = AxisScaling::Linear;
+	AxisScaling Scaling = AxisScaling::LINEAR;
 
 	std::array<double, 2> Range = { 0.0, 1.0 };
 	double MajorSpacing = 1;

src/Plotting/Backend/CoreQChart.cpp

@@ -20,7 +20,7 @@ PlotQChart::PlotQChart(QWidget* parent)
 	LogTimeAxisQt->setLinePenColor(QColorConstants::Black);
 	LogTimeAxisQt->setLabelFormat("%g");
 	LogTimeAxisQt->setGridLineVisible(false);
-	SetAxis(Axis::Time, GetAxisInfoView(Axis::Time));
+	SetAxis(Axis::TIME, GetAxisInfoView(Axis::TIME));
 
 	PlotChart->addAxis(QuantityAxisQt, Qt::AlignLeft);
 	QuantityAxisQt->setLinePenColor(QColorConstants::Black);
@@ -30,7 +30,7 @@ PlotQChart::PlotQChart(QWidget* parent)
 	LogQuantityAxisQt->setLinePenColor(QColorConstants::Black);
 	LogQuantityAxisQt->setLabelFormat("%g");
 	LogQuantityAxisQt->setGridLineVisible(false);
-	SetAxis(Axis::Quantity, GetAxisInfoView(Axis::Quantity));
+	SetAxis(Axis::QUANTITY, GetAxisInfoView(Axis::QUANTITY));
 
 	PlotChart->legend()->setVisible(false);
 	PlotChart->setTheme(QChart::ChartThemeLight);
@@ -55,11 +55,11 @@ void PlotQChart::SetAxis(const Axis axis, const AxisInfo& info) {
 	double lobd = ax.Range[0];
 
 	switch (axis) {
-	case Axis::Time:
+	case Axis::TIME:
 		axlinqt = TimeAxisQt;
 		axlogqt = LogTimeAxisQt;
 		break;
-	case Axis::Quantity:
+	case Axis::QUANTITY:
 	default:
 		axlinqt = QuantityAxisQt;
 		axlogqt = LogQuantityAxisQt;
@@ -69,7 +69,7 @@ void PlotQChart::SetAxis(const Axis axis, const AxisInfo& info) {
 	if (!axlinqt || !axlogqt) { return; };
 
 	switch (ax.Scaling) {
-	case AxisScaling::Log10:
+	case AxisScaling::LOG10:
 		axlinqt->setVisible(false);
 		axlogqt->setVisible();
 
@@ -79,7 +79,7 @@ void PlotQChart::SetAxis(const Axis axis, const AxisInfo& info) {
 		axqt = axlogqt;
 		break;
 
-	case AxisScaling::Ln:
+	case AxisScaling::LN:
 		axlinqt->setVisible(false);
 		axlogqt->setVisible();
 
@@ -89,7 +89,7 @@ void PlotQChart::SetAxis(const Axis axis, const AxisInfo& info) {
 		axqt = axlogqt;
 		break;
 
-	case AxisScaling::Linear:
+	case AxisScaling::LINEAR:
 	default:
 		axlogqt->setVisible(false);
 		axlinqt->setVisible();
@@ -135,13 +135,13 @@ void PlotQChart::Plot() {
 		serie->setColor(QColor::fromRgbF(color[0], color[1], color[2], 1.0));
 
 		switch (sinfo.Style) {
-		case LineStyle::Dashed:
+		case LineStyle::DASHED:
 			std::cerr << "Dashed lines not implemented for Qt Charts.\n";
 			break;
-		case LineStyle::Dotted:
+		case LineStyle::DOTTED:
 			std::cerr << "Dotted lines not implemented for Qt Charts.\n";
 			break;
-		case LineStyle::Solid:
+		case LineStyle::SOLID:
 		default:
 			break;
 		}
@@ -160,8 +160,8 @@ void PlotQChart::AddSeries() {
 	AddSeries({ });
 }
 
-void PlotQChart::AddSeries(const SeriesInfo& newInfo) {
-	EmbeddablePlot2D::AddSeries(newInfo);
+void PlotQChart::AddSeries(const SeriesInfo& new_info) {
+	EmbeddablePlot2D::AddSeries(new_info);
 
 	QLineSeries* newSeries = new QLineSeries(PlotChart);
 	PlotChart->addSeries(newSeries);

src/Plotting/Backend/CoreQChart.hpp

@@ -23,7 +23,7 @@ class QCHART_BACKEND PlotQChart : virtual public EmbeddablePlot2D  {
 	virtual void EraseAllData() override;
 
 	virtual void AddSeries() override;
-	virtual void AddSeries(const SeriesInfo& newInfo) override;
+	virtual void AddSeries(const SeriesInfo& new_info) override;
 
 private:
 	QChart* PlotChart;

src/Plotting/Plot2D.cpp

@@ -12,11 +12,11 @@ void EmbeddablePlot2D::AddPoint(uint8_t idx, double time, double quantity, bool
 	oldTime.push_back(time);
 	oldQty.push_back(quantity);
 
-	Plot::AxisInfo axInfo = this->GetAxisInfoView(Plot::Axis::Time);
+	Plot::AxisInfo axInfo = this->GetAxisInfoView(Plot::Axis::TIME);
     double maxTime = oldTime.back();
     double minTime = std::max(0.0, maxTime - 10.0);
     axInfo.Range = { minTime, minTime + 10.0 };
-    SetAxis(Plot::Axis::Time, axInfo);
+    SetAxis(Plot::Axis::TIME, axInfo);
 
 	if (update) Plot();
 }
@@ -45,10 +45,10 @@ void EmbeddablePlot2D::AddPoints(
 
 void EmbeddablePlot2D::SetAxis(const Axis axis, const AxisInfo& info) {
 	switch (axis) {
-	case Axis::Time:
+	case Axis::TIME:
 		TimeAxis = info;
 		break;
-	case Axis::Quantity:
+	case Axis::QUANTITY:
 		QuantityAxis = info;
 		break;
 	}
@@ -71,10 +71,10 @@ void EmbeddablePlot2D::EraseAllData() {
 
 const AxisInfo& EmbeddablePlot2D::GetAxisInfoView(Axis axis) const {
 	switch (axis) {
-	case Axis::Time:
+	case Axis::TIME:
 		return TimeAxis;
 		break;
-	case Axis::Quantity:
+	case Axis::QUANTITY:
 	default:
 		return QuantityAxis;
 		break;
@@ -89,7 +89,7 @@ void EmbeddablePlot2D::AddSeries(std::string& name) {
 	Series.push_back(serie);
 	Plot();
 }
-void EmbeddablePlot2D::AddSeries(const SeriesInfo& newInfo) { Series.push_back(newInfo); Plot(); };
+void EmbeddablePlot2D::AddSeries(const SeriesInfo& new_info) { Series.push_back(new_info); Plot(); };
 
 SeriesInfo EmbeddablePlot2D::GetSeriesByName(std::string& name) {
 	for (const SeriesInfo& serie : Series) {
@@ -113,18 +113,18 @@ const SeriesInfo& EmbeddablePlot2D::GetSeriesViewByName(std::string& name) const
 	return Series[0];
 }
 
-void EmbeddablePlot2D::SetSeries(std::string& name, SeriesInfo& newInfo) {
+void EmbeddablePlot2D::SetSeries(std::string& name, SeriesInfo& new_info) {
 	for (SeriesInfo& serie : Series) {
 		if (serie.Name == name) {
-			serie = newInfo;
+			serie = new_info;
 			return;
 		}
 	}
 
 	std::cout << "Warning: Series of name " << name << " not found. Doing nothing.\n";
 }
 
-void EmbeddablePlot2D::SetSeries(uint8_t idx, SeriesInfo& newInfo) { Series[idx] = newInfo; }
+void EmbeddablePlot2D::SetSeries(uint8_t idx, SeriesInfo& new_info) { Series[idx] = new_info; }
 
 void EmbeddablePlot2D::RemoveSeries(uint8_t idx) { Series.erase(Series.begin() + idx); }
 void EmbeddablePlot2D::RemoveSeries(std::string& name) {

src/Plotting/Plot2D.hpp

@@ -49,13 +49,13 @@ class PLOT_API EmbeddablePlot2D : virtual public QWidget {
 	// Add a named series.
 	void AddSeries(std::string& name);
 	// Add a series using the following info.
-	virtual void AddSeries(const SeriesInfo& newInfo);
+	virtual void AddSeries(const SeriesInfo& new_info);
 
 	SeriesInfo GetSeriesByName(std::string& name);
 	const SeriesInfo& GetSeriesViewByName(std::string& name) const;
 
-	void SetSeries(std::string& name, SeriesInfo& newInfo);
-	void SetSeries(uint8_t idx, SeriesInfo& newInfo);
+	void SetSeries(std::string& name, SeriesInfo& new_info);
+	void SetSeries(uint8_t idx, SeriesInfo& new_info);
 
 	// Remove the series at the given index.
 	void RemoveSeries(uint8_t idx);
@@ -78,12 +78,12 @@ class PLOT_API EmbeddablePlot2D : virtual public QWidget {
 	virtual void SetColor(ColorRGB& color);
 
 	bool GetDrawGridState() { return DrawGrid; };
-	void SetDrawGridState(bool newState) { DrawGrid = newState; };
+	void SetDrawGridState(bool new_state) { DrawGrid = new_state; };
 
 private:	
 	std::string Title;
-	AxisInfo TimeAxis = { Axis::Time };
-	AxisInfo QuantityAxis = { Axis::Quantity };
+	AxisInfo TimeAxis = { .InfoOf = Axis::TIME };
+	AxisInfo QuantityAxis = { .InfoOf = Axis::QUANTITY };
 
 	std::vector<SeriesInfo> Series;
 	bool DrawGrid = false;

src/Plotting/Series.hpp

@@ -14,6 +14,6 @@ struct SeriesInfo {
 
 	ColorRGB Color = {1.0, 0.0, 0.0};
 	double Alpha = 1.0;
-	LineStyle Style = LineStyle::Solid;
+	LineStyle Style = LineStyle::SOLID;
 };
 } // namespace VSCL::Plot

src/Util/Filesystem/UserPaths.cpp

@@ -43,7 +43,7 @@ bool MakeStandardAppPaths() {
 	if (!fs::exists(app_dir)) { fs::create_directories(app_dir); }
 	bool all_success = true;
 
-	std::for_each(StandardPaths.begin(), StandardPaths.end(),
+	std::for_each(STANDARD_PATHS.begin(), STANDARD_PATHS.end(),
 		[&](const fs::path& subdir) {
 
 		fs::path full_path = app_dir / subdir;

src/Util/Filesystem/UserPaths.hpp

@@ -9,15 +9,15 @@
 namespace VSCL::FS {
 
 enum class UserPath : uint8_t {
-	Data, Config, Script
+	DATA, CONFIG, SCRIPT
 };
 
-static constexpr std::array<std::string_view, 3> StandardPaths = {
+static constexpr std::array<std::string_view, 3> STANDARD_PATHS = {
 	"data", "config", "script"
 };
 
 static constexpr std::string_view GetStandardPath(const std::string_view& path) {
-	return *std::ranges::find(StandardPaths, path);
+	return *std::ranges::find(STANDARD_PATHS, path);
 }
 
 std::filesystem::path GetUserAppData();

src/Util/Sizing.hpp

@@ -6,8 +6,8 @@
 
 namespace VSCL::Util {
 
-static constexpr uint32_t MinimumWidth = 720;
-static constexpr uint32_t MinimumHeight = 480;
+static constexpr uint32_t MINIMUM_WIDTH = 720;
+static constexpr uint32_t MINIMUM_HEIGHT = 480;
 
 struct FontAdjustment {
 	/*
@@ -21,12 +21,12 @@ struct FontAdjustment {
 	 */
 	bool AdjustToWidth = false;
 
-	static const uint32_t AdjustPxSize(uint32_t pxAtMin, QWidget* win, bool adjustToWidth=false) {
-		uint32_t dim = adjustToWidth ? win->width() : win->height();
-		uint32_t adj = adjustToWidth ? MinimumWidth : MinimumHeight;
+	static const uint32_t AdjustPxSize(uint32_t px_at_min, QWidget* win, bool adjust_to_width=false) {
+		uint32_t dim = adjust_to_width ? win->width() : win->height();
+		uint32_t adj = adjust_to_width ? MINIMUM_WIDTH : MINIMUM_HEIGHT;
 		float delta = (float)(dim - adj) / (float)adj;
 
-		return pxAtMin * (uint32_t)std::ceil(1 + delta);
+		return px_at_min * (uint32_t)std::ceil(1 + delta);
 	}
 
 	const uint32_t AdjustPxSize(QWidget* win) const {

src/Widgets/Dial/Attitude.cpp

@@ -46,14 +46,14 @@ QPoint AttitudeDial::HandEndingCenteredNominal() const {
 	return Origin + QPoint{ linex, liney };
 }
 
-void AttitudeDial::SetRangeType(RangeType newRangeType) {
-	RangeTypeMode = newRangeType;
+void AttitudeDial::SetRangeType(RangeType new_range_type) {
+	RangeTypeMode = new_range_type;
 
 	switch (RangeTypeMode) {
-	case RangeType::LowestNominal:
+	case RangeType::LOWEST_NOMINAL:
 		RangeHandlerFunction = std::bind(&AttitudeDial::HandEndingLowestNominal, this);
 		break;
-	case RangeType::CenteredNominal:
+	case RangeType::CENTERED_NOMINAL:
 	default:
 		RangeHandlerFunction = std::bind(&AttitudeDial::HandEndingCenteredNominal, this);
 		break;
@@ -85,12 +85,12 @@ void AttitudeDial::PaintTicks(QPainter* painter) {
 		case 3: // major
 			ticker[0] = 0.85;
 			tickcolor = Palette.MajorTick;
-			cossin = MajorTicks[i];
+			cossin = MAJOR_TICKS[i];
 			break;
 		default: // minor
 			ticker[0] = 0.95;
 			tickcolor = Palette.MinorTick;
-			cossin = MinorTicks[i - 4];
+			cossin = MINOR_TICKS[i - 4];
 			break;
 		}
 
@@ -127,7 +127,7 @@ void AttitudeDial::PaintCap(QPainter* painter) {
 	painter->drawEllipse(Origin, r, r);
 } // AttitudeDial::PaintCap()
 
-void AttitudeDial::SetPalette(AttitudeDialPalette& newPalette) { Palette = newPalette; }
+void AttitudeDial::SetPalette(AttitudeDialPalette& new_palette) { Palette = new_palette; }
 AttitudeDialPalette AttitudeDial::GetPalette() const { return Palette; }
 const AttitudeDialPalette& AttitudeDial::GetPaletteView() const { return Palette; }