End insert edit Asola AS on Personal Project

Author: Stefano Baggio

nbproject/project.properties

@@ -0,0 +1,20 @@
+auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
+auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
+auxiliary.org-netbeans-modules-javascript-nodejs.enabled=false
+auxiliary.org-netbeans-modules-javascript-nodejs.node_2e_default=true
+auxiliary.org-netbeans-modules-javascript-nodejs.run_2e_enabled=false
+auxiliary.org-netbeans-modules-javascript-nodejs.sync_2e_enabled=true
+auxiliary.org-netbeans-modules-javascript2-requirejs.enabled=true
+auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
+browser.autorefresh.Chromium.INTEGRATED=true
+browser.highlightselection.Chromium.INTEGRATED=true
+browser.run=true
+files.encoding=UTF-8
+site.root.folder=
+source.folder=
+start.file=index.html
+web.context.root=/plotly

nbproject/project.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.web.clientproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/clientside-project/1">
+            <name>plotly.js</name>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/cdnjs-libraries/1"/>
+    </configuration>
+</project>

src/components/modebar/buttons.js

@@ -46,24 +46,23 @@ var modeBarButtons = module.exports = {};
 
 modeBarButtons.toImage = {
     name: 'toImage',
-    title: 'Download plot as a png',
+    title: _lang.print_png,
     icon: Icons.camera,
     click: function(gd) {
         var format = 'png';
 
         if(Lib.isIE()) {
-            Lib.notifier('Snapshotting is unavailable in Internet Explorer. ' +
-                         'Consider exporting your images using the Plotly Cloud', 'long');
+            Lib.notifier(_lang.png_impossible, 'long');
             return;
         }
 
         if(gd._snapshotInProgress) {
-            Lib.notifier('Snapshotting is still in progress - please hold', 'long');
+            Lib.notifier(_lang.snapshot_inProgress, 'long');
             return;
         }
 
         gd._snapshotInProgress = true;
-        Lib.notifier('Taking snapshot - this may take a few seconds', 'long');
+        Lib.notifier(_lang.taking_snapshot, 'long');
 
         var ev = Snapshot.toImage(gd, {format: format});
 
@@ -87,7 +86,7 @@ modeBarButtons.toImage = {
         ev.once('error', function(err) {
             gd._snapshotInProgress = false;
 
-            Lib.notifier('Sorry there was a problem downloading your ' + format, 'long');
+            Lib.notifier(_lang.snapshot_error, 'long');
             console.error(err);
 
             ev.clean();
@@ -97,16 +96,16 @@ modeBarButtons.toImage = {
 
 modeBarButtons.sendDataToCloud = {
     name: 'sendDataToCloud',
-    title: 'Save and edit plot in cloud',
+    title: 'Save and edit',
     icon: Icons.disk,
     click: function(gd) {
-        Plotly.Plots.sendDataToCloud(gd);
+        //Plotly.Plots.sendDataToCloud(gd);
     }
 };
 
 modeBarButtons.zoom2d = {
     name: 'zoom2d',
-    title: 'Zoom',
+    title: _lang.zoom,
     attr: 'dragmode',
     val: 'zoom',
     icon: Icons.zoombox,
@@ -115,7 +114,7 @@ modeBarButtons.zoom2d = {
 
 modeBarButtons.pan2d = {
     name: 'pan2d',
-    title: 'Pan',
+    title: _lang.pan,
     attr: 'dragmode',
     val: 'pan',
     icon: Icons.pan,
@@ -124,7 +123,7 @@ modeBarButtons.pan2d = {
 
 modeBarButtons.select2d = {
     name: 'select2d',
-    title: 'Box Select',
+    title: _lang.box_selected,
     attr: 'dragmode',
     val: 'select',
     icon: Icons.selectbox,
@@ -133,7 +132,7 @@ modeBarButtons.select2d = {
 
 modeBarButtons.lasso2d = {
     name: 'lasso2d',
-    title: 'Lasso Select',
+    title: _lang.lasso_select,
     attr: 'dragmode',
     val: 'lasso',
     icon: Icons.lasso,
@@ -142,7 +141,7 @@ modeBarButtons.lasso2d = {
 
 modeBarButtons.zoomIn2d = {
     name: 'zoomIn2d',
-    title: 'Zoom in',
+    title: _lang.zoom_in,
     attr: 'zoom',
     val: 'in',
     icon: Icons.zoom_plus,
@@ -151,7 +150,7 @@ modeBarButtons.zoomIn2d = {
 
 modeBarButtons.zoomOut2d = {
     name: 'zoomOut2d',
-    title: 'Zoom out',
+    title: _lang.zoom_out,
     attr: 'zoom',
     val: 'out',
     icon: Icons.zoom_minus,
@@ -160,7 +159,7 @@ modeBarButtons.zoomOut2d = {
 
 modeBarButtons.autoScale2d = {
     name: 'autoScale2d',
-    title: 'Autoscale',
+    title: _lang.autoscale,
     attr: 'zoom',
     val: 'auto',
     icon: Icons.autoscale,
@@ -169,7 +168,7 @@ modeBarButtons.autoScale2d = {
 
 modeBarButtons.resetScale2d = {
     name: 'resetScale2d',
-    title: 'Reset axes',
+    title: _lang.reset_axes,
     attr: 'zoom',
     val: 'reset',
     icon: Icons.home,
@@ -178,7 +177,7 @@ modeBarButtons.resetScale2d = {
 
 modeBarButtons.hoverClosestCartesian = {
     name: 'hoverClosestCartesian',
-    title: 'Show closest data on hover',
+    title: _lang.show_closest_data_on_hover,
     attr: 'hovermode',
     val: 'closest',
     icon: Icons.tooltip_basic,
@@ -188,7 +187,7 @@ modeBarButtons.hoverClosestCartesian = {
 
 modeBarButtons.hoverCompareCartesian = {
     name: 'hoverCompareCartesian',
-    title: 'Compare data on hover',
+    title: _lang.compare_data_on_hover,
     attr: 'hovermode',
     val: function(gd) {
         return gd._fullLayout._isHoriz ? 'y' : 'x';

src/plots/cartesian/axes.js

@@ -1710,13 +1710,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
                 {_offset: gs.l + (ax.position || 0) * gs.w, _length: 0} :
                 axisIds.getFromId(gd, ax.anchor);
 
-            y = ax._offset + ax._length / 2;
+            y = ax._offset + ax._length / 2 + 10; //added +10 for shift the label downside
             x = counterAxis._offset + ((ax.side === 'right') ?
                 counterAxis._length + 10 +
                     fontSize * (offsetBase + (ax.showticklabels ? 1 : 0.5)) :
                 -10 - fontSize * (offsetBase + (ax.showticklabels ? 0.5 : 0)));
 
-            transform = {rotate: '-90', offset: 0};
+            transform = {rotate: '0', offset: 0}; //rotate changed from -90 to 0
             if(!avoid.side) avoid.side = 'left';
         }
 

src/plots/cartesian/dragbox.js

@@ -355,7 +355,7 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
         // deactivate mousewheel scrolling on embedded graphs
         // devs can override this with layout._enablescrollzoom,
         // but _ ensures this setting won't leave their page
-        if(!gd._context.scrollZoom && !fullLayout._enablescrollzoom) {
+        if(!gd._context.scrollZoom && !fullLayout._enablescrollzoom && !e.ctrlKey) { //added && !e.ctrlKey zoom only on cntrl+wheel
             return;
         }
         var pc = gd.querySelector('.plotly');