]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
improve line-logarithmic sample
authorVille Hämäläinen <hamalainen.ville.p@gmail.com>
Sun, 28 Feb 2016 05:57:02 +0000 (07:57 +0200)
committerVille Hämäläinen <hamalainen.ville.p@gmail.com>
Sun, 28 Feb 2016 05:57:02 +0000 (07:57 +0200)
- set title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
- remove logs

samples/line-logarithmic.html

index bd10d41b801ffbd12cf3c153fc1911c251e456e2..fa17a4b6e509bc3a6935fe76e964e3e40e4c9fab 100644 (file)
@@ -7,29 +7,25 @@
     <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
     <style>
     canvas {
-        -webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, .5);
+        -moz-user-select: none;
+        -webkit-user-select: none;
+        -ms-user-select: none;
     }
     </style>
 </head>
 
 <body>
-    <div style="width:50%;">
-        <canvas id="canvas" style="width:100%;height:100%"></canvas>
+    <div style="width:75%;">
+        <canvas id="canvas"></canvas>
     </div>
-    <br>
-    <br>
     <button id="randomizeData">Randomize Data</button>
     <button id="addDataset">Add Dataset</button>
     <button id="removeDataset">Remove Dataset</button>
     <button id="addData">Add Data</button>
     <button id="removeData">Remove Data</button>
-    <div>
-        <h3>Legend</h3>
-        <div id="legendContainer">
-            
-        </div>
-    </div>
     <script>
+    var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+
     var randomScalingFactor = function() {
         return Math.ceil(Math.random() * 10.0) * Math.pow(10, Math.ceil(Math.random() * 5));
     };
         },
         options: {
             responsive: true,
+            title:{
+                display:true,
+                text:'Chart.js Line Chart - Logarithmic'
+            },
             scales: {
                 xAxes: [{
                     display: true,
         dataset.pointBorderWidth = 1;
     });
 
-    console.log(config.data);
-
     window.onload = function() {
         var ctx = document.getElementById("canvas").getContext("2d");
         window.myLine = new Chart(ctx, config);
-
-        updateLegend();
     };
 
-    function updateLegend() {
-        $legendContainer = $('#legendContainer');
-        $legendContainer.empty();
-        $legendContainer.append(window.myLine.generateLegend());
-    }
-
     $('#randomizeData').click(function() {
         $.each(config.data.datasets, function(i, dataset) {
             dataset.data = dataset.data.map(function() {
         });
 
         window.myLine.update();
-        updateLegend();
     });
 
     $('#addDataset').click(function() {
 
         config.data.datasets.push(newDataset);
         window.myLine.update();
-        updateLegend();
     });
 
     $('#addData').click(function() {
         if (config.data.datasets.length > 0) {
-            config.data.labels.push('dataset #' + config.data.labels.length);
+            var month = MONTHS[config.data.labels.length % MONTHS.length];
+            config.data.labels.push(month);
 
             for (var index = 0; index < config.data.datasets.length; ++index) {
                 config.data.datasets[index].data.push(randomScalingFactor());
             }
 
             window.myLine.update();
-            updateLegend();
         }
     });
 
     $('#removeDataset').click(function() {
         config.data.datasets.splice(0, 1);
         window.myLine.update();
-        updateLegend();
     });
 
     $('#removeData').click(function() {
         });
 
         window.myLine.update();
-        updateLegend();
     });
     </script>
 </body>