modebar now able to switch projection type

Author: archmoj

src/components/modebar/buttons.js

@@ -338,6 +338,8 @@ modeBarButtons.resetCameraLastSave3d = {
 function handleCamera3d(gd, ev) {
     var button = ev.currentTarget;
     var attr = button.getAttribute('data-attr');
+    if(attr !== 'resetLastSave' && attr !== 'resetDefault') return;
+
     var fullLayout = gd._fullLayout;
     var sceneIds = fullLayout._subplots.gl3d;
     var aobj = {};
@@ -351,12 +353,18 @@ function handleCamera3d(gd, ev) {
             aobj[key + '.up'] = scene.viewInitial.up;
             aobj[key + '.eye'] = scene.viewInitial.eye;
             aobj[key + '.center'] = scene.viewInitial.center;
-
         } else if(attr === 'resetDefault') {
             aobj[key + '.up'] = null;
             aobj[key + '.eye'] = null;
             aobj[key + '.center'] = null;
         }
+
+        var newOrtho = (scene.viewInitial.projection.type === 'orthographic');
+        var oldOrtho = scene.camera._ortho;
+
+        if(newOrtho !== oldOrtho) {
+            aobj[key + '.projection'] = scene.viewInitial.projection;
+        }
     }
 
     Registry.call('_guiRelayout', gd, aobj);

src/plots/gl3d/index.js

@@ -70,6 +70,9 @@ exports.plot = function plotGl3d(gd) {
         // save 'initial' camera view settings for modebar button
         if(!scene.viewInitial) {
             scene.viewInitial = {
+                projection: {
+                    type: camera.projection.type
+                },
                 up: {
                     x: camera.up.x,
                     y: camera.up.y,

test/jasmine/tests/gl3d_plot_interact_test.js

@@ -1490,7 +1490,7 @@ describe('Test gl3d relayout calls', function() {
         .then(done);
     });
 
-    it('@gl should maintain projection type when resetCamera buttons clicked after switching projection type from perspective to orthographic', function(done) {
+    it('@gl resetCamera buttons should be able to reset projection type after switching projection type from perspective to orthographic', function(done) {
         Plotly.plot(gd, {
             data: [{
                 type: 'surface',
@@ -1525,19 +1525,19 @@ describe('Test gl3d relayout calls', function() {
             return selectButton(gd._fullLayout._modeBar, 'resetCameraLastSave3d').click();
         })
         .then(function() {
-            expect(gd._fullLayout.scene._scene.camera._ortho).toEqual(true, 'orthographic');
+            expect(gd._fullLayout.scene._scene.camera._ortho).toEqual(false, 'perspective');
         })
         .then(function() {
             return selectButton(gd._fullLayout._modeBar, 'resetCameraDefault3d').click();
         })
         .then(function() {
-            expect(gd._fullLayout.scene._scene.camera._ortho).toEqual(true, 'orthographic');
+            expect(gd._fullLayout.scene._scene.camera._ortho).toEqual(false, 'perspective');
         })
         .catch(failTest)
         .then(done);
     });
 
-    it('@gl should maintain projection type when resetCamera buttons clicked after switching projection type from orthographic to perspective', function(done) {
+    it('@gl resetCamera buttons should be able to reset projection type after switching projection type from orthographic to perspective', function(done) {
         Plotly.plot(gd, {
             data: [{
                 type: 'surface',
@@ -1575,13 +1575,13 @@ describe('Test gl3d relayout calls', function() {
             return selectButton(gd._fullLayout._modeBar, 'resetCameraLastSave3d').click();
         })
         .then(function() {
-            expect(gd._fullLayout.scene._scene.camera._ortho).toEqual(false, 'perspective');
+            expect(gd._fullLayout.scene._scene.camera._ortho).toEqual(true, 'orthographic');
         })
         .then(function() {
             return selectButton(gd._fullLayout._modeBar, 'resetCameraDefault3d').click();
         })
         .then(function() {
-            expect(gd._fullLayout.scene._scene.camera._ortho).toEqual(false, 'perspective');
+            expect(gd._fullLayout.scene._scene.camera._ortho).toEqual(true, 'orthographic');
         })
         .catch(failTest)
         .then(done);