Merge pull request #302 from vizzuhq/bugfixes

Bugfixes

Author: schaumb

src/chart/generator/selector.cpp

@@ -28,7 +28,8 @@ bool Selector::anySelected()
 	auto allCnt = 0U;
 	for (const auto &marker : plot.getMarkers()) {
 		if (static_cast<double>(marker.enabled) > 0) {
-			if (marker.selected) selectedCnt++;
+			if (static_cast<double>(marker.selected) > 0)
+				selectedCnt++;
 			allCnt++;
 		}
 	}

src/chart/ui/chart.cpp

@@ -174,7 +174,7 @@ void ChartWidget::trackMarker()
 			    {
 				    auto plot = chart.getPlot();
 				    auto *marker = chart.markerAt(pointerEvent.pos);
-				    if (marker
+				    if (marker && trackedMarkerId.has_value()
 				        && static_cast<uint64_t>(
 				               trackedMarkerId.value())
 				               == marker->idx) {

src/chart/ui/events.cpp

@@ -36,7 +36,7 @@ std::string PointerEvent::dataToJson() const
 		    position)("coords", coords);
 		if (!markerJson.empty()) { j.raw("marker", markerJson); }
 	}
-	return res;
+	return res.substr(1, res.size()-2);
 }
 
 WheelEvent::WheelEvent(double delta, Chart &chart) :