#583 only show highlights points of selected space&time in line chart

GeoDaCenter · Feb 25, 2017 · 77a093a · 77a093a
1 parent bce4c82
commit 77a093a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Explore/LineChartCanvas.cpp b/Explore/LineChartCanvas.cpp
@@ -492,7 +492,7 @@ void LineChartCanvas::PopulateCanvas()
 				double fracX = ((double) t)/((double) (tms-1));
 				double x = fracX * 100.0;
 				double y = (lcs.Y_excl_avg[t] - axis_scale_y.scale_min) * scaleY;
-				if (lcs.tms_subset0[t]) {
+				if (lcs.tms_subset0[t] && lcs.Y_excl_tm0_avg_valid) {
 					GdaCircle* c = new GdaCircle(wxRealPoint(x, y), ss_circ_rad);
 					if (lcs.compare_r_and_t) {
 						c->setPen(GdaConst::ln_cht_clr_tm1_light);
@@ -503,7 +503,7 @@ void LineChartCanvas::PopulateCanvas()
 					}
 					foreground_shps.push_back(c);
 				}
-				if (lcs.compare_r_and_t && lcs.tms_subset1[t]) {
+				if (lcs.compare_r_and_t && lcs.tms_subset1[t] &&lcs.Y_excl_tm1_avg_valid ) {
 					GdaCircle* c = new GdaCircle(wxRealPoint(x, y), ss_circ_rad);
 					c->setPen(GdaConst::ln_cht_clr_tm2_light);
 					c->setBrush(GdaConst::ln_cht_clr_tm2_light);
@@ -516,7 +516,7 @@ void LineChartCanvas::PopulateCanvas()
 				double fracX = ((double) t)/((double) (tms-1));
 				double x = fracX * 100.0;	
 				double y = (lcs.Y_sel_avg[t] - axis_scale_y.scale_min) * scaleY;
-				if (lcs.tms_subset0[t]) {
+				if (lcs.tms_subset0[t] && lcs.Y_sel_tm0_avg_valid) {
 					GdaCircle* c = new GdaCircle(wxRealPoint(x, y), ss_circ_rad);
 					if (lcs.compare_r_and_t) {
 						c->setPen(GdaConst::ln_cht_clr_tm1_light);
@@ -527,14 +527,15 @@ void LineChartCanvas::PopulateCanvas()
 					}
 					foreground_shps.push_back(c);
 				}
-				if (lcs.compare_r_and_t && lcs.tms_subset1[t]) {
+				if (lcs.compare_r_and_t && lcs.tms_subset1[t] && lcs.Y_sel_tm1_avg_valid) {
 					GdaCircle* c = new GdaCircle(wxRealPoint(x, y), ss_circ_rad);
 					c->setPen(GdaConst::ln_cht_clr_tm2_light);
 					c->setBrush(GdaConst::ln_cht_clr_tm2_light);
 					foreground_shps.push_back(c);
 				}
 			}
 		}
+        /*
 		if (lcs.Y_avg_valid && lcs.Y_excl_avg_valid == lcs.Y_sel_avg_valid) {
 			for (size_t t=0; t<tms; ++t) {
 				double fracX = ((double) t)/((double) (tms-1));
@@ -560,7 +561,7 @@ void LineChartCanvas::PopulateCanvas()
 				}
 			}
 		}
-		
+         */
 		// Draw everything else
         if (lcs.Y_avg_valid) {
 			for (size_t t=0; t<tms; ++t) {