From 89a70afb693c62f9d00599a0610e27384192048b Mon Sep 17 00:00:00 2001 From: Damien Date: Mon, 4 Feb 2013 22:37:46 +0100 Subject: [PATCH] BlankState : ScatterWindow Blank state only if no ride or no data point --- src/ScatterWindow.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/ScatterWindow.cpp b/src/ScatterWindow.cpp index 78696268c..33cc254e0 100644 --- a/src/ScatterWindow.cpp +++ b/src/ScatterWindow.cpp @@ -177,7 +177,14 @@ ScatterWindow::rideSelected() ride = myRideItem; - if (!ride || !ride->ride() || ride == current) return; + if (ride == current) return; + + if (!ride || !ride->ride() || !ride->ride()->dataPoints().count()) { + current = NULL; + setIsBlank(true); + return; + } else + setIsBlank(false); current = ride; @@ -272,6 +279,19 @@ ScatterWindow::setData() settings.gridlines = grid->isChecked(); settings.frame = frame->isChecked(); + /* Not a blank state ? Just no data and we can change series ? + if ((setting.x == MODEL_POWER || setting.y == MODEL_POWER ) && !ride->ride()->isDataPresent(RideFile::watts)) + setIsBlank(true); + else if ((setting.x == MODEL_CADENCE || setting.y == MODEL_CADENCE ) && !ride->ride()->isDataPresent(RideFile::cad)) + setIsBlank(true); + else if ((setting.x == MODEL_HEARTRATE || setting.y == MODEL_HEARTRATE ) && !ride->ride()->isDataPresent(RideFile::hr)) + setIsBlank(true); + else if ((setting.x == MODEL_SPEED || setting.y == MODEL_SPEED ) && !ride->ride()->isDataPresent(RideFile::kph)) + setIsBlank(true); + else + setIsBlank(false); + */ + // any intervals to plot? settings.intervals.clear(); for (int i=0; iallIntervalItems()->childCount(); i++) {