Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[glass] Plot: Fix weight and marker settings (#8805)

Browse Source 
Line weight needed to default to 1.0.
Marker added an "auto" setting and now starts at -2.

Fixes #8802.
This commit is contained in:
Peter Johnson
2026-04-24 09:03:16 -06:00
committed by GitHub
parent a8b827af54
commit 40188d9cc6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
glass/src/lib/native/cpp/other/Plot.cpp
View File

@@ -209,9 +209,9 @@ PlotSeries::PlotSeries(Storage& storage)
m_color{storage.GetFloatArray("color", kDefaultColor)},
m_marker{storage.GetString("marker"),
0,
{"None", "Circle", "Square", "Diamond", "Up", "Down", "Left",
"Right", "Cross", "Plus", "Asterisk"}},
m_weight{storage.GetFloat("weight", IMPLOT_AUTO)},
{"None", "Auto", "Circle", "Square", "Diamond", "Up", "Down",
"Left", "Right", "Cross", "Plus", "Asterisk"}},
m_weight{storage.GetFloat("weight", 1.0f)},
m_digital{
storage.GetString("digital"), kAuto, {"Auto", "Digital", "Analog"}},
m_digitalBitHeight{storage.GetInt("digitalBitHeight", 8)},
@@ -397,7 +397,7 @@ PlotSeries::Action PlotSeries::EmitPlot(PlotView& view, double now, size_t i,
} else {
ImPlot::SetAxis(ImAxis_Y1);
}
spec.SetProp(ImPlotProp_Marker, m_marker.GetValue() - 1);
spec.SetProp(ImPlotProp_Marker, m_marker.GetValue() - 2);
ImPlot::PlotLineG(label, getter, &getterData, size + 1, spec);
}