]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
projects / thirdparty / Chart.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f4cdd20)
Update sample files
authorEvert Timberg <evert.timberg@gmail.com>
Sun, 20 Sep 2015 23:25:17 +0000 (19:25 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Sun, 20 Sep 2015 23:25:17 +0000 (19:25 -0400)
samples/line-logarithmic.html patch | blob | blame | history
samples/line-time-scale.html patch | blob | blame | history
samples/line.html patch | blob | blame | history
samples/scatter-logX.html patch | blob | blame | history
samples/scatter.html patch | blob | blame | history

diff --git a/samples/line-logarithmic.html b/samples/line-logarithmic.html
index 8a249ba9682b228647c4ac61e4a997be86b3be6e..21159e6ee86a79d7389a5d82587c6977c5543dc6 100644 (file)
--- a/samples/line-logarithmic.html
+++ b/samples/line-logarithmic.html
@@ -58,11 +58,19 @@
             responsive: true,
             scales: {
                 xAxes: [{
-                    display: true
+                    display: true,
+                    scaleLabel: {
+                        show: true,
+                        labelString: 'x axis'
+                    }
                 }],
                 yAxes: [{
                     display: true,
-                    type: 'logarithmic'
+                    type: 'logarithmic',
+                    scaleLabel: {
+                        show: true,
+                        labelString: 'y axis'
+                    }
                 }]
             }
         }
diff --git a/samples/line-time-scale.html b/samples/line-time-scale.html
index b4b0f7edda8846661c2cdf89abcaf46529728549..3fc97b52be5fa280c4a43400479e950d8a12af60 100644 (file)
--- a/samples/line-time-scale.html
+++ b/samples/line-time-scale.html
@@ -73,10 +73,18 @@
                         tick: {
                             format: 'MM/DD/YYYY HH:mm',
                             // round: 'day'
+                        },
+                        scaleLabel: {
+                            show: true,
+                            labelString: 'Date'
                         }
                     }, ],
                     yAxes: [{
-                        display: true
+                        display: true,
+                        scaleLabel: {
+                            show: true,
+                            labelString: 'value'
+                        }
                     }]
                 },
                 elements: {
diff --git a/samples/line.html b/samples/line.html
index 28171cdea7448682b5732dcc4e662373d2758d28..19270288856e23cbacc7230df713b399889409d4 100644 (file)
--- a/samples/line.html
+++ b/samples/line.html
@@ -58,10 +58,18 @@
             responsive: true,
             scales: {
                 xAxes: [{
-                    display: true
+                    display: true,
+                    scaleLabel: {
+                        show: true,
+                        labelString: 'Month'
+                    }
                 }],
                 yAxes: [{
-                    display: true
+                    display: true,
+                    scaleLabel: {
+                        show: true,
+                        labelString: 'Value'
+                    }
                 }]
             }
         }
diff --git a/samples/scatter-logX.html b/samples/scatter-logX.html
index d8d00c85c71b3094f927ad57f4d4348d0adbefa7..fd1451768c072a51c3f644ecdf3c7f46417978f2 100644 (file)
--- a/samples/scatter-logX.html
+++ b/samples/scatter-logX.html
@@ -10,7 +10,7 @@
 <body>
     <div style="width:50%">
         <div>
-            <canvas id="canvas" height="450" width="600"></canvas>
+            <canvas id="canvas" height="450" width="600" style="border: 1px solid red;"></canvas>
         </div>
     </div>
     <script>
@@ -145,7 +145,11 @@
                                                        return tick.toString() + "Hz";
                                                }
                                                return '';
-                                       }
+                                       },
+                               },
+                               scaleLabel: {
+                                       labelString: 'Frequency',
+                                       show: true,
                                }
                        }],
                        yAxes: [{
@@ -154,6 +158,10 @@
                                        userCallback: function(tick) {
                                                return tick.toString() + "dB";
                                        }
+                               },
+                               scaleLabel: {
+                                       labelString: 'Voltage',
+                                       show: true
                                }
                        }]
                    }
diff --git a/samples/scatter.html b/samples/scatter.html
index c4c96fbf8dc379b87eb1f936b454fe9cf64fd8be..fa9f08c0eb8c8a4c0e0e220e8e05e1284907a44e 100644 (file)
--- a/samples/scatter.html
+++ b/samples/scatter.html
@@ -94,6 +94,17 @@
                                position: 'top',
                                gridLines: {
                                        zeroLineColor: "rgba(0,255,0,1)"
+                               },
+                               scaleLabel: {
+                                       show: true,
+                                       labelString: 'x axis'
+                               }
+                       }],
+                       yAxes: [{
+                               position: 'right',
+                               scaleLabel: {
+                                       show: true,
+                                       labelString: 'y axis'
                                }
                        }]
                    }
Mirror of https://github.com/chartjs/Chart.js.git