krzysu · kenirwin · Jul 6, 2015 · Jul 16, 2015 · Jul 16, 2015 · Jul 16, 2015
diff --git a/examples/curved-lines.html b/examples/curved-lines.html
@@ -26,7 +26,7 @@
       grid: { hoverable: true }, //important! flot.tooltip requires this
       tooltip: {
       show: true,
-      content: "%s | x: %x; y: %y"
+      content: "%s | x: %x; y: %y",
       },
       yaxes: [{ min:10, max: 90}, {position: 'right'}]
       };
@@ -45,14 +45,58 @@
       points: { show: true }
       }
       ], options);
+
+
+      var d1 = []; var last = 0;
+      for (var i = 0; i <= 40; i += (2 + parseInt(Math.random() * 5))) {
+			   last = last + ((Math.random() * 3) - 1.5)
+			   d1.push([i, parseInt(last)]);
+			   }
+			   //flot options
+			   var options = {
+			   grid: { hoverable: true },
+			   tooltip: {
+			   show: true,
+			   //			   content: "%x, %y",
+			   content: "%s | x: %x; y: %y",
+			   showRealVsInterpolatedData: true,
+			   },
+			   series: {
+			   curvedLines: {
+			   active: true,
+			   nrSplinePoints: 20 // <- control nr of helper points
+						    }                                // between two poins
+						    }
+						    };
+						    //plotting
+						    $.plot($("#flotContainer2"),[
+						    { //curved line
+						    data: d1,
+						    lines: {show: true, lineWidth: 3},
+						    curvedLines: {apply: true } // <- curve line
+										      }, { //original data points
+										      data: d1,
+										      points: {show: true}
+										      }
+										      ], options);
+
       });
-                                 </script>
+
+
+
+
+    </script>
   </head>
 
   <body>
 
     <h4>CurvedLines Example</h4>
     <div id="flotContainer" class="chart-style"></div>
+
+    <h4>CurvedLines: random data points, displaying Interpolated vs. Real Data Points</h4>
+    <div id="flotContainer2" class="chart-style"></div>
+
+
     <a href="index.html">Return to examples list</a>
 
     </body>

diff --git a/js/jquery.flot.tooltip.js b/js/jquery.flot.tooltip.js
@@ -6,7 +6,7 @@
  * authors: Krzysztof Urbas @krzysu [myviews.pl],Evan Steinkerchner @Roundaround
  * website: https://github.com/krzysu/flot.tooltip
  * 
- * build on 2015-06-12
+ * build on 2015-07-16
  * released under MIT License, 2012
 */ 
 (function ($) {
@@ -37,7 +37,8 @@
             defaultTheme: true,
             snap: true,
             lines: false,
-
+	    showRealVsInterpolatedData: false, // used with curvedLines plugin
+
             // callbacks
             onHover: function (flotItem, $tooltipEl) {},
 
@@ -351,6 +352,21 @@
 	    else if (typeof item.series.curvedLines !== "undefined") {
 		x = item.datapoint[0];
 		y = item.datapoint[1];
+
+		// differentiate between real and interpolated data points
+		if(this.tooltipOptions.showRealVsInterpolatedData){
+		    pointStr = x +'-' +y;
+		    var pointsArr = [];
+		    for (var i=0; i<item.series.data.length; i++ ) {
+			pointsArr.push(item.series.data[i][0] + '-' + item.series.data[i][1]);
+		    }
+		    if (pointsArr.indexOf(pointStr)<0) {
+			content = content + " (Interpolated Point)";
+		    }
+		    else {
+			content = content + " (Real Data Point)";
+		    }
+		}
 	    }
 
         else if (typeof item.series.lines !== "undefined" && item.series.lines.steps) {

diff --git a/js/jquery.flot.tooltip.min.js b/js/jquery.flot.tooltip.min.js