Merge pull request #2 from Superalgos/develop

Develop

Client/client.js

@@ -132,7 +132,7 @@ try {
     console.log("What's new? The following was implemented here:")
     console.log('')
     console.log('Task Server Upgraded ............... This allow us to integrate crypto projects into the Task Server, opening the door to new types of bots defined at other projects.')
-    console.log('In-App Documentation Improved ...... This allow users to improve the docs and also to document other integrated projects.')
+    console.log('In-App Documentation Improved ...... This allow users to improve the docs / tutorials, correcting, expanding and translating pages.')
     console.log('')
     console.log("What's next? At the development pipeline we have:")
     console.log('')

Client/httpInterface.js

@@ -723,7 +723,7 @@ exports.newHttpInterface = function newHttpInterface(WEB_SERVER, DATA_FILE_SERVE
 
                                 let message
                                 try {
-                                    message = await git.pull('upstream', currentBranch)
+                                    message = await git.pull('https://github.com/Superalgos/Superalgos', currentBranch)
                                     return message
                                 } catch (err) {
                                     console.log('[ERROR] Error updating ' + currentBranch)

Projects/Superalgos/Bots-Plotters-Code/Masters/plotters/Plotters-Bollinger-Bands/BollingerBands.js

@@ -636,7 +636,7 @@
                     }
 
                     browserCanvasContext.lineWidth = 0.2;
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                     browserCanvasContext.stroke();
 
 
@@ -662,7 +662,7 @@
                     }
 
                     browserCanvasContext.lineWidth = 0.2;
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                     browserCanvasContext.stroke();
 
                     /* Contributing to Auto-Scale*/

Projects/Superalgos/Bots-Plotters-Code/Masters/plotters/Plotters-Bollinger-Bands/PercentageBandwidth.js

@@ -861,7 +861,7 @@
                     browserCanvasContext.setLineDash([1, 4])
                     browserCanvasContext.lineWidth = 1
                     browserCanvasContext.stroke()
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                 }
             }
 

Projects/Superalgos/Bots-Plotters-Code/Masters/plotters/Plotters-Candles-Volumes/Candles.js

@@ -644,7 +644,7 @@
 
                     browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.LIGHT + ', 1)';
                     browserCanvasContext.lineWidth = 1;
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                     browserCanvasContext.stroke();
 
                 }
@@ -669,7 +669,7 @@
 
                     browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)';
                     browserCanvasContext.lineWidth = 1;
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                     browserCanvasContext.stroke();
                 }
 
@@ -714,7 +714,7 @@
                     if (direction === 'side') { browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.DARK + ', 1)'; }
 
                     browserCanvasContext.lineWidth = 1;
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                     browserCanvasContext.stroke();
 
                 }

Projects/Superalgos/Bots-Plotters-Code/Masters/plotters/Plotters-Candles-Volumes/Volumes.js

@@ -658,7 +658,7 @@
 
                         browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 0.40)';
                         browserCanvasContext.lineWidth = 1;
-                        browserCanvasContext.setLineDash([0, 0])
+                        browserCanvasContext.setLineDash([]) // Resets Line Dash
                         browserCanvasContext.stroke();
 
                         browserCanvasContext.beginPath();
@@ -683,7 +683,7 @@
                         browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RED + ', 0.40)';
 
                         browserCanvasContext.lineWidth = 1;
-                        browserCanvasContext.setLineDash([0, 0])
+                        browserCanvasContext.setLineDash([]) // Resets Line Dash
                         browserCanvasContext.stroke();
 
                         if (userPositionDate >= volume.begin && userPositionDate <= volume.end) {

Projects/Superalgos/Plugins/Data-Mines/Masters.json

@@ -1 +1 @@
-{"type":"Data Mine","name":"Masters","config":"{\n\"codeName\": \"Masters\"\n}","project":"Superalgos","sensorBots":[{"type":"Sensor Bot","name":"Exchange Raw Data","config":"{\n\"codeName\": \"Exchange-Raw-Data\"\n}","project":"Superalgos","processes":[{"type":"Process Definition","name":"Historic-OHLCVs","config":"{\n    \"codeName\": \"Historic-OHLCVs\",\n    \"description\": \"Retrieves and saves historical maket data\",\n    \"deadWaitTime\": 0,\n    \"normalWaitTime\": 60000,\n    \"retryWaitTime\": 10000,\n    \"botModule\": \"Exchange Raw Data Historic OHLCVs\"\n}","project":"Superalgos","processOutput":{"type":"Process Output","name":"New Process Output","project":"Superalgos","outputDatasets":[],"outputDatasetFolders":[],"id":"dfe2556e-a765-4e38-9d30-7f91090c0069","savedPayload":{"position":{"x":7542.108005075513,"y":17855.768569069416},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},"processDependencies":{"type":"Process Dependencies","name":"New Process Dependencies","project":"Superalgos","statusDependencies":[{"type":"Status Dependency","name":"Exchange Raw Data Historic-OHLCVs","config":"{\n    \"mainUtility\": \"Self Reference\"\n}","project":"Superalgos","id":"ea39c98b-18e2-44ce-9f7f-86a8a76a688a","savedPayload":{"position":{"x":7868.207004814731,"y":17677.190023306815},"targetPosition":{"x":7685.578576112114,"y":17915.196025394187},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":1,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Status Report","name":"New Status Report","id":"181c7c34-7243-497a-9ddb-1b0067c6d66e"}}}],"dataDependencies":[],"dataMineDataDependencies":[],"id":"5c7fae5a-6da6-4864-a167-f2f21d578c72","savedPayload":{"position":{"x":7685.578576112114,"y":17915.196025394187},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},"statusReport":{"type":"Status Report","name":"New Status Report","project":"Superalgos","id":"181c7c34-7243-497a-9ddb-1b0067c6d66e","savedPayload":{"position":{"x":7780.114007162883,"y":18038.396997772034},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{}}},"executionStartedEvent":{"type":"Execution Started Event","name":"","project":"Superalgos","id":"957e7e3a-b167-40be-93b5-9ba4ceff56e5","savedPayload":{"position":{"x":7800.383605821641,"y":18192.359885147573},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{}}},"executionFinishedEvent":{"type":"Execution Finished Event","name":"New Execution Finished Event","project":"Superalgos","id":"fe40a546-43ee-49df-908a-7e72f598f0cd","savedPayload":{"position":{"x":7740.956149496868,"y":18335.830456184176},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{}}},"id":"5eb11d6a-022e-4f60-97c4-d6cf90b249dc","savedPayload":{"position":{"x":7502.950147409498,"y":18153.20202748156},"targetPosition":{"x":7225.786287656112,"y":18268.007057191084},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":3,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}}],"products":[{"type":"Product Definition","name":"Candles","config":"{\n\"codeName\": \"Candles\"\n}","project":"Superalgos","datasets":[{"type":"Dataset Definition","name":"One-Min","config":"{\n\"codeName\": \"One-Min\"\n}","project":"Superalgos","id":"1c3696e4-c28e-4744-9100-706d6dce0c3c","savedPayload":{"position":{"x":7675.786287656112,"y":18268.007057191084},"targetPosition":{"x":7525.786287656112,"y":18268.007057191084},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":1,"distanceToParent":2,"arrangementStyle":0},"uiObject":{}}}],"id":"2443883b-6959-42a3-ae3b-ef3102ffcdcc","savedPayload":{"position":{"x":7525.786287656112,"y":18268.007057191084},"targetPosition":{"x":7225.786287656112,"y":18268.007057191084},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":3,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},{"type":"Product Definition","name":"Volumes","config":"{\n\"codeName\": \"Volumes\"\n}","project":"Superalgos","datasets":[{"type":"Dataset Definition","name":"One-Min","config":"{\n\"codeName\": \"One-Min\"\n}","proLine truncated
+{"type":"Data Mine","name":"Masters","config":"{\n\"codeName\": \"Masters\"\n}","project":"Superalgos","sensorBots":[{"type":"Sensor Bot","name":"Exchange Raw Data","config":"{\n\"codeName\": \"Exchange-Raw-Data\"\n}","project":"Superalgos","processes":[{"type":"Process Definition","name":"Historic-OHLCVs","config":"{\n    \"codeName\": \"Historic-OHLCVs\",\n    \"description\": \"Retrieves and saves historical maket data\",\n    \"deadWaitTime\": 0,\n    \"normalWaitTime\": 60000,\n    \"retryWaitTime\": 10000,\n    \"botModule\": \"Exchange Raw Data Historic OHLCVs\"\n}","project":"Superalgos","processOutput":{"type":"Process Output","name":"New Process Output","project":"Superalgos","outputDatasets":[],"outputDatasetFolders":[],"id":"dfe2556e-a765-4e38-9d30-7f91090c0069","savedPayload":{"position":{"x":7542.108005075513,"y":17855.768569069416},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},"processDependencies":{"type":"Process Dependencies","name":"New Process Dependencies","project":"Superalgos","statusDependencies":[{"type":"Status Dependency","name":"Exchange Raw Data Historic-OHLCVs","config":"{\n    \"mainUtility\": \"Self Reference\"\n}","project":"Superalgos","id":"ea39c98b-18e2-44ce-9f7f-86a8a76a688a","savedPayload":{"position":{"x":7868.207004814731,"y":17677.190023306815},"targetPosition":{"x":7685.578576112114,"y":17915.196025394187},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":1,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Status Report","name":"New Status Report","id":"181c7c34-7243-497a-9ddb-1b0067c6d66e"}}}],"dataDependencies":[],"dataMineDataDependencies":[],"id":"5c7fae5a-6da6-4864-a167-f2f21d578c72","savedPayload":{"position":{"x":7685.578576112114,"y":17915.196025394187},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},"statusReport":{"type":"Status Report","name":"New Status Report","project":"Superalgos","id":"181c7c34-7243-497a-9ddb-1b0067c6d66e","savedPayload":{"position":{"x":7780.114007162883,"y":18038.396997772034},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{}}},"executionStartedEvent":{"type":"Execution Started Event","name":"","project":"Superalgos","id":"957e7e3a-b167-40be-93b5-9ba4ceff56e5","savedPayload":{"position":{"x":7800.383605821641,"y":18192.359885147573},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{}}},"executionFinishedEvent":{"type":"Execution Finished Event","name":"New Execution Finished Event","project":"Superalgos","id":"fe40a546-43ee-49df-908a-7e72f598f0cd","savedPayload":{"position":{"x":7740.956149496868,"y":18335.830456184176},"targetPosition":{"x":7502.950147409498,"y":18153.20202748156},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{}}},"id":"5eb11d6a-022e-4f60-97c4-d6cf90b249dc","savedPayload":{"position":{"x":7502.950147409498,"y":18153.20202748156},"targetPosition":{"x":7225.786287656112,"y":18268.007057191084},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":3,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}}],"products":[{"type":"Product Definition","name":"Candles","config":"{\n\"codeName\": \"Candles\"\n}","project":"Superalgos","datasets":[{"type":"Dataset Definition","name":"One-Min","config":"{\n\"codeName\": \"One-Min\"\n}","project":"Superalgos","id":"1c3696e4-c28e-4744-9100-706d6dce0c3c","savedPayload":{"position":{"x":7675.786287656112,"y":18268.007057191084},"targetPosition":{"x":7525.786287656112,"y":18268.007057191084},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":1,"distanceToParent":2,"arrangementStyle":0},"uiObject":{}}}],"id":"2443883b-6959-42a3-ae3b-ef3102ffcdcc","savedPayload":{"position":{"x":7525.786287656112,"y":18268.007057191084},"targetPosition":{"x":7225.786287656112,"y":18268.007057191084},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":3,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},{"type":"Product Definition","name":"Volumes","config":"{\n\"codeName\": \"Volumes\"\n}","project":"Superalgos","datasets":[{"type":"Dataset Definition","name":"One-Min","config":"{\n\"codeName\": \"One-Min\"\n}","proLine truncated

Projects/Superalgos/UI/Function-Libraries/DependenciesFilter.js

@@ -21,7 +21,7 @@ function newSuperalgosFunctionLibraryDependenciesFilter() {
         return Array.from(filters.keys())
 
         function recursiveFilter(node) {
-            if (node.type === 'Javascript Code') {
+            if (node.type === 'Javascript Code' || node.type === 'Formula' ) {
                 filter(node.code)
             }            
 

Projects/Superalgos/UI/Spaces/Charting-Space/EdgeEditor.js

@@ -670,7 +670,7 @@ function newEdgeEditor() {
         pointB3 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoViewport(pointB3)
         pointB4 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoViewport(pointB4)
 
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
 
         browserCanvasContext.beginPath()
         browserCanvasContext.moveTo(pointA1.x, pointA1.y)

Projects/Superalgos/UI/Spaces/Charting-Space/Plotting/Plotter.js

@@ -721,6 +721,7 @@ function newPlotter() {
                             browserCanvasContext.setLineDash(strokeStyle.lineDash)
                             browserCanvasContext.strokeStyle = 'rgba(' + strokeStyle.paletteColor + ', ' + strokeStyle.opacity + ')'
                             browserCanvasContext.stroke()
+                            browserCanvasContext.setLineDash([]) // Resets Line Dash
                         }
                     }
                 }

Projects/Superalgos/UI/Spaces/Charting-Space/Scales/AutoScaleButton.js

@@ -92,13 +92,8 @@ function newAutoScaleButton() {
         }
     }
     function onMouseWheel(event) {
-         let delta = event.wheelDelta
-        if (delta < 0) {
-            delta = -1
-        } else {
-            delta = 1
-        }
-        currentStatus = currentStatus + delta
+        
+        currentStatus = currentStatus + event.delta
         if (currentStatus === 7) { currentStatus = 1 }
         if (currentStatus === 0) { currentStatus = 6 }
 

Projects/Superalgos/UI/Spaces/Charting-Space/Scales/RateScale.js

@@ -157,11 +157,11 @@ function newRateScale() {
     function onMouseWheel(event) {
         if (IS_MAC) {
             let sensitivity
-            if (event.wheelDelta < 0) {
+            if (event.delta < 0) {
                 if (event.shiftKey === true) {
-                    sensitivity = 20
+                    sensitivity = MAC_SCROLL_SENSITIVITY
                 } else {
-                    sensitivity = 5
+                    sensitivity = MAC_ZOOM_SENSITIVITY
                 }
                 if (wheelDeltaDirection === -1) {
                     wheelDeltaCounter++
@@ -177,9 +177,9 @@ function newRateScale() {
                 }
             } else {
                 if (event.shiftKey === true) {
-                    sensitivity = 20
+                    sensitivity = MAC_SCROLL_SENSITIVITY
                 } else {
-                    sensitivity = 5
+                    sensitivity = MAC_ZOOM_SENSITIVITY
                 }
                 if (wheelDeltaDirection === 1) {
                     wheelDeltaCounter++
@@ -205,8 +205,7 @@ function newRateScale() {
         let morePower = 10
         if (event.buttons === 4) { morePower = 1 } // Mouse wheel pressed.
 
-        let delta = event.wheelDelta
-        if (delta < 0) {
+        if (event.delta < 0) {
             factor = -0.01 * morePower
         } else {
             factor = 0.01 * morePower

Projects/Superalgos/UI/Spaces/Charting-Space/Scales/TimeFrameScale.js

@@ -241,11 +241,11 @@ function newTimeFrameScale() {
     function onMouseWheel(event) {
         if (IS_MAC) {
             let sensitivity
-            if (event.wheelDelta < 0) {
+            if (event.delta < 0) {
                 if (event.shiftKey === true) {
-                    sensitivity = 20
+                    sensitivity = MAC_ZOOM_SENSITIVITY
                 } else {
-                    sensitivity = 5
+                    sensitivity = MAC_SCROLL_SENSITIVITY
                 }
                 if (wheelDeltaDirection === -1) {
                     wheelDeltaCounter++
@@ -261,9 +261,9 @@ function newTimeFrameScale() {
                 }
             } else {
                 if (event.shiftKey === true) {
-                    sensitivity = 20
+                    sensitivity = MAC_ZOOM_SENSITIVITY
                 } else {
-                    sensitivity = 5
+                    sensitivity = MAC_SCROLL_SENSITIVITY
                 }
                 if (wheelDeltaDirection === 1) {
                     wheelDeltaCounter++
@@ -280,8 +280,7 @@ function newTimeFrameScale() {
             }
         }
 
-        let delta = event.wheelDelta
-        if (delta < 0) {
+        if (event.delta < 0) {
             timeFrameIndex--
             if (timeFrameIndex < 0) {
                 filePeriodIndex--

Projects/Superalgos/UI/Spaces/Charting-Space/Scales/TimeScale.js

@@ -108,11 +108,11 @@ function newTimeScale() {
     function onMouseWheel(event) {
         if (IS_MAC) {
             let sensitivity
-            if (event.wheelDelta < 0) {
+            if (event.delta < 0) {
                 if (event.shiftKey === true) {
-                    sensitivity = 20
+                    sensitivity = MAC_SCROLL_SENSITIVITY
                 } else {
-                    sensitivity = 5
+                    sensitivity = MAC_ZOOM_SENSITIVITY
                 }
                 if (wheelDeltaDirection === -1) {
                     wheelDeltaCounter++
@@ -128,9 +128,9 @@ function newTimeScale() {
                 }
             } else {
                 if (event.shiftKey === true) {
-                    sensitivity = 20
+                    sensitivity = MAC_SCROLL_SENSITIVITY
                 } else {
-                    sensitivity = 5
+                    sensitivity = MAC_ZOOM_SENSITIVITY
                 }
                 if (wheelDeltaDirection === 1) {
                     wheelDeltaCounter++
@@ -155,8 +155,7 @@ function newTimeScale() {
         let morePower = 10
         if (event.buttons === 4) { morePower = 1 } // Mouse wheel pressed.
 
-        let delta = event.wheelDelta
-        if (delta < 0) {
+        if (event.delta < 0) {
             factor = -0.01 * morePower
         } else {
             factor = 0.01 * morePower

Projects/Superalgos/UI/Spaces/Charting-Space/Viewport.js

@@ -68,6 +68,9 @@ function newViewport() {
 
     let overrideMousePositionCounter = 0
 
+    let wheelDeltaDirection
+    let wheelDeltaCounter = 0
+
     return thisObject
 
     function finalize() {
@@ -204,11 +207,48 @@ function newViewport() {
         let morePower = 1
 
         if (IS_MAC) {
-            event.delta = event.delta * MAC_AMOUNT_FACTOR
+            let sensitivity
+            if (event.delta < 0) {
+                if (event.shiftKey === true) {
+                    sensitivity = MAC_SCROLL_SENSITIVITY
+                } else {
+                    sensitivity = MAC_ZOOM_SENSITIVITY
+                }
+                if (wheelDeltaDirection === -1) {
+                    wheelDeltaCounter++
+                    if (wheelDeltaCounter < sensitivity) {
+                        return
+                    } else {
+                        wheelDeltaCounter = 0
+                    }
+                } else {
+                    wheelDeltaCounter = 0
+                    wheelDeltaDirection = -1
+                    return
+                }
+            } else {
+                if (event.shiftKey === true) {
+                    sensitivity = MAC_SCROLL_SENSITIVITY
+                } else {
+                    sensitivity = MAC_ZOOM_SENSITIVITY
+                }
+                if (wheelDeltaDirection === 1) {
+                    wheelDeltaCounter++
+                    if (wheelDeltaCounter < sensitivity) {
+                        return
+                    } else {
+                        wheelDeltaCounter = 0
+                    }
+                } else {
+                    wheelDeltaCounter = 0
+                    wheelDeltaDirection = 1
+                    return
+                }
+            }
         }
 
         let amount = event.delta
-
+        
         if (event.buttons === 4) { morePower = 2 } // Mouse wheel pressed.
         /* We adjust the sensitivity for Mac Users */
 

Projects/Superalgos/UI/Spaces/Chat-Space/ChatSpace.js

@@ -160,7 +160,7 @@ function newSuperalgosChatSpace() {
         point3 = thisObject.container.frame.frameThisPoint(point3)
         point4 = thisObject.container.frame.frameThisPoint(point4)
 
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
         browserCanvasContext.beginPath()
         browserCanvasContext.moveTo(point1.x, point1.y)
         browserCanvasContext.lineTo(point2.x, point2.y)
@@ -184,7 +184,7 @@ function newSuperalgosChatSpace() {
             for (let i = 0; i <= 30; i++) {
                 opacity = 1 - (i / 300) - 0.95
 
-                browserCanvasContext.setLineDash([0, 0])
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
                 browserCanvasContext.beginPath()
                 browserCanvasContext.moveTo(point2.x + i, point2.y)
                 browserCanvasContext.lineTo(point3.x + i, point3.y)

Projects/Superalgos/UI/Spaces/Cockpit-Space/CockpitSpace.js

@@ -347,7 +347,7 @@ function newSuperalgosCockpitSpace() {
         point5 = thisObject.container.frame.frameThisPoint(point5)
         point6 = thisObject.container.frame.frameThisPoint(point6)
 
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
 
         browserCanvasContext.beginPath()
 

Projects/Superalgos/UI/Spaces/Cockpit-Space/Speedometer.js

@@ -99,7 +99,7 @@ function newSpeedometer() {
             thisObject.params.ASSET_NAME === thisObject.params.BASE_ASSET &&
             thisObject.params.POSITION_TAKEN === false
         ) {
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
 
             browserCanvasContext.beginPath()
             browserCanvasContext.arc(centerPoint.x, centerPoint.y, BAR_RADIUS, BAR_START_ANGLE, MIN_VALUE_ANGLE)
@@ -160,6 +160,8 @@ function newSpeedometer() {
             browserCanvasContext.lineWidth = VALUE_THICKNESS
             browserCanvasContext.stroke()
             browserCanvasContext.closePath()
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
+
 
             if (PROFIT_VALUE_ANGLE > INIT_VALUE_ANGLE) {
                 browserCanvasContext.beginPath()

Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js

@@ -408,7 +408,7 @@ function newSuperalgosDocSpace() {
         point3 = thisObject.container.frame.frameThisPoint(point3)
         point4 = thisObject.container.frame.frameThisPoint(point4)
 
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
         browserCanvasContext.beginPath()
         browserCanvasContext.moveTo(point1.x, point1.y)
         browserCanvasContext.lineTo(point2.x, point2.y)
@@ -432,7 +432,7 @@ function newSuperalgosDocSpace() {
             for (let i = 0; i <= 30; i++) {
                 opacity = 1 - (i / 300) - 0.95
 
-                browserCanvasContext.setLineDash([0, 0])
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
                 browserCanvasContext.beginPath()
                 browserCanvasContext.moveTo(point2.x + i, point2.y)
                 browserCanvasContext.lineTo(point3.x + i, point3.y)

Projects/Superalgos/UI/Spaces/Floating-Space/BusyProgressBar.js

@@ -67,6 +67,8 @@ function newBusyProgressBar() {
         browserCanvasContext.lineWidth = 10
         browserCanvasContext.setLineDash([3, 4])
         browserCanvasContext.stroke()
+
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
     }
 }
 

Projects/Superalgos/UI/Spaces/Floating-Space/CircularProgressBar.js

@@ -142,6 +142,8 @@ function newCircularProgressBar() {
             browserCanvasContext.lineWidth = 0 + opacityCounters[i] / 100 / 4
             browserCanvasContext.setLineDash([2, 10])
             browserCanvasContext.stroke()
+
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
         }
     }
 }

Projects/Superalgos/UI/Spaces/Floating-Space/Picker.js

@@ -40,6 +40,9 @@ function newPicker() {
     let onMouseOverEventSubscriptionId
     let onMouseNotOverEventSubscriptionId
 
+    let wheelDeltaDirection
+    let wheelDeltaCounter = 0
+
     return thisObject
 
     function finalize() {
@@ -134,14 +137,50 @@ function newPicker() {
     }
 
     function onMouseWheel() {
-        delta = event.wheelDelta
-        if (delta > 0) {
-            delta = -1
-        } else {
-            delta = 1
+
+        if (IS_MAC) {
+            let sensitivity
+            if (event.delta < 0) {
+                if (event.shiftKey === true) {
+                    sensitivity = MAC_SCROLL_SENSITIVITY
+                } else {
+                    sensitivity = MAC_ZOOM_SENSITIVITY
+                }
+                if (wheelDeltaDirection === -1) {
+                    wheelDeltaCounter++
+                    if (wheelDeltaCounter < sensitivity) {
+                        return
+                    } else {
+                        wheelDeltaCounter = 0
+                    }
+                } else {
+                    wheelDeltaCounter = 0
+                    wheelDeltaDirection = -1
+                    return
+                }
+            } else {
+                if (event.shiftKey === true) {
+                    sensitivity = MAC_SCROLL_SENSITIVITY
+                } else {
+                    sensitivity = MAC_ZOOM_SENSITIVITY
+                }
+                if (wheelDeltaDirection === 1) {
+                    wheelDeltaCounter++
+                    if (wheelDeltaCounter < sensitivity) {
+                        return
+                    } else {
+                        wheelDeltaCounter = 0
+                    }
+                } else {
+                    wheelDeltaCounter = 0
+                    wheelDeltaDirection = 1
+                    return
+                }
+            }
+            event.delta = - event.delta 
         }
 
-        selected = selected + delta
+        selected = selected - event.delta
         if (selected < 0) { selected = 0 }
         if (selected > optionsList.length - 1) {
             selected = optionsList.length - 1

Projects/Superalgos/UI/Spaces/Floating-Space/UiObject.js

@@ -1541,7 +1541,7 @@ function newUiObject() {
             browserCanvasContext.setLineDash([0, chainLineCounter, 2, 3, 0, 500 - chainLineCounter])
             browserCanvasContext.lineWidth = 2
             browserCanvasContext.stroke()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
 
             browserCanvasContext.beginPath()
             browserCanvasContext.moveTo(position.x, position.y)
@@ -1550,7 +1550,7 @@ function newUiObject() {
             browserCanvasContext.setLineDash([3, 47])
             browserCanvasContext.lineWidth = 3
             browserCanvasContext.stroke()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
 
             browserCanvasContext.beginPath()
             browserCanvasContext.moveTo(position.x, position.y)
@@ -1559,7 +1559,7 @@ function newUiObject() {
             browserCanvasContext.setLineDash([1, 9])
             browserCanvasContext.lineWidth = 1
             browserCanvasContext.stroke()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
         }
 
         if (thisObject.payload.floatingObject.container.frame.radius > 0.5) {
@@ -1612,7 +1612,7 @@ function newUiObject() {
             browserCanvasContext.setLineDash([1, 9])
             browserCanvasContext.lineWidth = 0.75
             browserCanvasContext.stroke()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
 
             browserCanvasContext.beginPath()
             browserCanvasContext.moveTo(position.x, position.y)
@@ -1621,7 +1621,7 @@ function newUiObject() {
             browserCanvasContext.setLineDash([0, referenceLineCounter, 1, 9, 2, 8, 3, 7, 4, 6, 0, 500 - referenceLineCounter])
             browserCanvasContext.lineWidth = 4
             browserCanvasContext.stroke()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
         }
 
         if (thisObject.payload.floatingObject.container.frame.radius > 0.5) {
@@ -2088,7 +2088,7 @@ function newUiObject() {
                     browserCanvasContext.closePath()
                     browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.WHITE + ', ' + 1 + ')'
                     browserCanvasContext.lineWidth = 3
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                     browserCanvasContext.stroke()
 
                     browserCanvasContext.beginPath()
@@ -2096,7 +2096,7 @@ function newUiObject() {
                     browserCanvasContext.closePath()
                     browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.DARK_TURQUOISE + ', ' + 1 + ')'
                     browserCanvasContext.lineWidth = 2
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                     browserCanvasContext.stroke()
 
                 }
@@ -2124,11 +2124,12 @@ function newUiObject() {
                 browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.LIGHT_GREY + ', ' + OPACITY + ')'
                 browserCanvasContext.lineWidth = 1
                 if (thisObject.payload.node.isPlugin === true) {
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                 } else {
                     browserCanvasContext.setLineDash([10, 20])
                 }
                 browserCanvasContext.stroke()
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             /* Project Head Ring */
@@ -2146,13 +2147,14 @@ function newUiObject() {
 
                 if (thisObject.payload.floatingObject.isOnFocus === true) {
                     browserCanvasContext.lineWidth = 30
-                    browserCanvasContext.setLineDash([0, 0])
+                    browserCanvasContext.setLineDash([]) // Resets Line Dash
                 } else {
                     browserCanvasContext.lineWidth = 30
                     browserCanvasContext.setLineDash([1, 3])
 
                 }
                 browserCanvasContext.stroke()
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             /* Info Ring */
@@ -2169,6 +2171,7 @@ function newUiObject() {
                 browserCanvasContext.lineWidth = 5
                 browserCanvasContext.setLineDash([2 + infoRingAnimation, 14 - infoRingAnimation])
                 browserCanvasContext.stroke()
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             /* Warning Ring */
@@ -2185,6 +2188,7 @@ function newUiObject() {
                 browserCanvasContext.lineWidth = 5
                 browserCanvasContext.setLineDash([2 + warningRingAnimation, 14 - warningRingAnimation])
                 browserCanvasContext.stroke()
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             /* Error Ring */
@@ -2201,6 +2205,7 @@ function newUiObject() {
                 browserCanvasContext.lineWidth = 5
                 browserCanvasContext.setLineDash([2 + errorRingAnimation, 14 - errorRingAnimation])
                 browserCanvasContext.stroke()
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             if (isHighlighted === true) {
@@ -2216,6 +2221,7 @@ function newUiObject() {
                 browserCanvasContext.lineWidth = 10
                 browserCanvasContext.setLineDash([4, 20])
                 browserCanvasContext.stroke()
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             if (isReadyToChainAttach === true) {
@@ -2245,6 +2251,8 @@ function newUiObject() {
                 browserCanvasContext.lineWidth = 1
                 browserCanvasContext.setLineDash([2, 8])
                 browserCanvasContext.stroke()
+
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             if (isAvailableToChainAttach === true && isReadyToChainAttach === false) {
@@ -2266,6 +2274,8 @@ function newUiObject() {
                 browserCanvasContext.lineWidth = 2
                 browserCanvasContext.setLineDash([3, 5])
                 browserCanvasContext.stroke()
+
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             if (isReadyToReferenceAttach === true) {
@@ -2295,6 +2305,8 @@ function newUiObject() {
                 browserCanvasContext.lineWidth = 1
                 browserCanvasContext.setLineDash([2, 8])
                 browserCanvasContext.stroke()
+
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
 
             if (isAvailableToReferenceAttach === true && isReadyToReferenceAttach === false) {
@@ -2316,6 +2328,8 @@ function newUiObject() {
                 browserCanvasContext.lineWidth = 2
                 browserCanvasContext.setLineDash([3, 5])
                 browserCanvasContext.stroke()
+
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
             }
         }
 

Projects/Superalgos/UI/Spaces/Panel-Space/Layer.js

@@ -629,6 +629,7 @@ function newLayer() {
         browserCanvasContext.setLineDash([2, 4])
         browserCanvasContext.lineWidth = lineWidth
         browserCanvasContext.stroke()
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
     }
 
     function drawLayerDisplay() {

Projects/Superalgos/UI/Spaces/Panel-Space/LayersPanel.js

@@ -43,6 +43,10 @@ function newLayersPanel() {
     let onMouseNotOverEventSubscriptionId
 
     let isMouseOver
+
+    let wheelDeltaDirection
+    let wheelDeltaCounter = 0
+    
     return thisObject
 
     function finalize() {
@@ -207,19 +211,55 @@ function newLayersPanel() {
     }
 
     function onMouseWheel(event) {
-        delta = event.wheelDelta
-        if (delta > 0) {
-            delta = -1
-        } else {
-            delta = 1
+ 
+        if (IS_MAC) {
+            let sensitivity
+            if (event.delta < 0) {
+                if (event.shiftKey === true) {
+                    sensitivity = MAC_SCROLL_SENSITIVITY
+                } else {
+                    sensitivity = MAC_ZOOM_SENSITIVITY
+                }
+                if (wheelDeltaDirection === -1) {
+                    wheelDeltaCounter++
+                    if (wheelDeltaCounter < sensitivity) {
+                        return
+                    } else {
+                        wheelDeltaCounter = 0
+                    }
+                } else {
+                    wheelDeltaCounter = 0
+                    wheelDeltaDirection = -1
+                    return
+                }
+            } else {
+                if (event.shiftKey === true) {
+                    sensitivity = MAC_SCROLL_SENSITIVITY
+                } else {
+                    sensitivity = MAC_ZOOM_SENSITIVITY
+                }
+                if (wheelDeltaDirection === 1) {
+                    wheelDeltaCounter++
+                    if (wheelDeltaCounter < sensitivity) {
+                        return
+                    } else {
+                        wheelDeltaCounter = 0
+                    }
+                } else {
+                    wheelDeltaCounter = 0
+                    wheelDeltaDirection = 1
+                    return
+                }
+            }
+            event.delta = - event.delta 
         }
 
         if (event.y - thisObject.container.frame.position.y - CURRENT_TOP_MARGIN < headerHeight) { // Mouse wheel over the header, not a layer
-            desiredVisibleLayers = desiredVisibleLayers + delta
+            desiredVisibleLayers = desiredVisibleLayers - event.delta
             if (desiredVisibleLayers < 0) { desiredVisibleLayers = 0 }
             if (desiredVisibleLayers > thisObject.layers.length) { desiredVisibleLayers = thisObject.layers.length }
         } else {
-            firstVisibleLayer = firstVisibleLayer + delta
+            firstVisibleLayer = firstVisibleLayer - event.delta
         }
         desiredPanelHeight = (layerHeight + LAYER_SEPARATION) * desiredVisibleLayers + headerHeight + footerHeight
         calculateVisbleLayers()
@@ -504,7 +544,7 @@ function newLayersPanel() {
             browserCanvasContext.moveTo(barTopPoint.x, barTopPoint.y)
             browserCanvasContext.lineTo(barBottomPoint.x, barBottomPoint.y)
             browserCanvasContext.closePath()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
             browserCanvasContext.lineWidth = 1
             browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GREY + ', ' + 1 + ')'
             browserCanvasContext.stroke()
@@ -513,7 +553,7 @@ function newLayersPanel() {
             browserCanvasContext.moveTo(handleTopPoint.x, handleTopPoint.y)
             browserCanvasContext.lineTo(handleBottomPoint.x, handleBottomPoint.y)
             browserCanvasContext.closePath()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
             browserCanvasContext.lineWidth = 4
             browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', ' + 1 + ')'
             browserCanvasContext.stroke()

Projects/Superalgos/UI/Spaces/Side-Space/ListView.js

@@ -42,6 +42,9 @@ function newListView() {
 
     let onMouseWheelEventSuscriptionId
 
+    let wheelDeltaDirection
+    let wheelDeltaCounter = 0
+
     return thisObject
 
     function finalize() {
@@ -120,14 +123,50 @@ function newListView() {
     }
 
     function onMouseWheel(event) {
-        delta = event.wheelDelta
-        if (delta > 0) {
-            delta = -1
-        } else {
-            delta = 1
+
+        if (IS_MAC) {
+            let sensitivity
+            if (event.delta < 0) {
+                if (event.shiftKey === true) {
+                    sensitivity = MAC_SCROLL_SENSITIVITY
+                } else {
+                    sensitivity = MAC_ZOOM_SENSITIVITY
+                }
+                if (wheelDeltaDirection === -1) {
+                    wheelDeltaCounter++
+                    if (wheelDeltaCounter < sensitivity) {
+                        return
+                    } else {
+                        wheelDeltaCounter = 0
+                    }
+                } else {
+                    wheelDeltaCounter = 0
+                    wheelDeltaDirection = -1
+                    return
+                }
+            } else {
+                if (event.shiftKey === true) {
+                    sensitivity = MAC_SCROLL_SENSITIVITY
+                } else {
+                    sensitivity = MAC_ZOOM_SENSITIVITY
+                }
+                if (wheelDeltaDirection === 1) {
+                    wheelDeltaCounter++
+                    if (wheelDeltaCounter < sensitivity) {
+                        return
+                    } else {
+                        wheelDeltaCounter = 0
+                    }
+                } else {
+                    wheelDeltaCounter = 0
+                    wheelDeltaDirection = 1
+                    return
+                }
+            }
+            event.delta = - event.delta 
         }
 
-        firstVisibleListItem = firstVisibleListItem + delta
+        firstVisibleListItem = firstVisibleListItem - event.delta
 
         calculateVisbleListItems()
     }
@@ -252,7 +291,7 @@ function newListView() {
             browserCanvasContext.moveTo(barTopPoint.x, barTopPoint.y)
             browserCanvasContext.lineTo(barBottomPoint.x, barBottomPoint.y)
             browserCanvasContext.closePath()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
             browserCanvasContext.lineWidth = 1
             browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GREY + ', ' + 1 + ')'
             browserCanvasContext.stroke()
@@ -261,7 +300,7 @@ function newListView() {
             browserCanvasContext.moveTo(handleTopPoint.x, handleTopPoint.y)
             browserCanvasContext.lineTo(handleBottomPoint.x, handleBottomPoint.y)
             browserCanvasContext.closePath()
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
             browserCanvasContext.lineWidth = 4
             browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', ' + 1 + ')'
             browserCanvasContext.stroke()

Projects/Superalgos/UI/Spaces/Side-Space/SidePanelTab.js

@@ -318,12 +318,13 @@ function newSidePanelTab() {
 
             browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.BLACK + ', ' + opacity + ''
             browserCanvasContext.lineWidth = 1
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
             browserCanvasContext.stroke()
         }
 
         /* Background and Border */
 
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
         browserCanvasContext.beginPath()
         browserCanvasContext.moveTo(point1.x, point1.y)
         browserCanvasContext.lineTo(point2.x, point2.y)
@@ -339,6 +340,7 @@ function newSidePanelTab() {
 
         browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GREY + ', ' + opacity + ''
         browserCanvasContext.lineWidth = 0.3
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
         browserCanvasContext.stroke()
     }
 }

Projects/Superalgos/UI/Spaces/Side-Space/SideSpace.js

@@ -129,7 +129,7 @@ function newSuperalgosSideSpace() {
         point3 = thisObject.container.frame.frameThisPoint(point3)
         point4 = thisObject.container.frame.frameThisPoint(point4)
 
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
         browserCanvasContext.beginPath()
         browserCanvasContext.moveTo(point1.x, point1.y)
         browserCanvasContext.lineTo(point2.x, point2.y)
@@ -145,6 +145,7 @@ function newSuperalgosSideSpace() {
 
         browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GREY + ', ' + opacity + ''
         browserCanvasContext.lineWidth = 0.3
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
         browserCanvasContext.stroke()
 
         /* Shadow */
@@ -153,7 +154,7 @@ function newSuperalgosSideSpace() {
             for (let i = 0; i <= 30; i++) {
                 opacity = 1 - (i / 300) - 0.95
 
-                browserCanvasContext.setLineDash([0, 0])
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
                 browserCanvasContext.beginPath()
                 browserCanvasContext.moveTo(point2.x + i, point2.y)
                 browserCanvasContext.lineTo(point3.x + i, point3.y)
@@ -161,6 +162,7 @@ function newSuperalgosSideSpace() {
 
                 browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.BLACK + ', ' + opacity + ''
                 browserCanvasContext.lineWidth = 1
+                browserCanvasContext.setLineDash([]) // Resets Line Dash
                 browserCanvasContext.stroke()
             }
         }

Projects/Superalgos/UI/Utilities/DrawPrint.js

@@ -59,7 +59,7 @@ function newSuperalgosUtilitiesDrawPrint() {
             borderPoint4 = params.fitFunction(borderPoint4)
         }
 
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
 
         /* Shadow  */
 

UI/Canvas.js

@@ -967,9 +967,6 @@ function newCanvas() {
             // cross-browser wheel delta
             var event = window.event || event // old IE support
             event.delta = Math.max(-1, Math.min(1, event.wheelDelta || -event.detail))
-            if (IS_MAC) {
-                event.delta = event.delta / MAC_AMOUNT_FACTOR
-            }
 
             let point = {
                 x: event.pageX,

UI/Frame.js

@@ -329,7 +329,7 @@ function newFrame() {
 
         browserCanvasContext.lineWidth = 0.1
         browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.MANGANESE_PURPLE + ', 0.75)'
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
         browserCanvasContext.stroke()
 
         /* print the title */
@@ -413,8 +413,8 @@ function newFrame() {
         browserCanvasContext.lineWidth = style.lineWidth
         browserCanvasContext.setLineDash(style.lineDash)
         browserCanvasContext.stroke()
-
         browserCanvasContext.closePath()
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
     }
 
     function grid(fitFunction, smallLines) {
@@ -473,7 +473,7 @@ function newFrame() {
             browserCanvasContext.closePath()
             browserCanvasContext.strokeStyle = 'rgba(150, 150, 150, 0.1)'
             browserCanvasContext.lineWidth = 1
-            browserCanvasContext.setLineDash([0, 0])
+            browserCanvasContext.setLineDash([]) // Resets Line Dash
             browserCanvasContext.stroke()
         }
 
@@ -531,7 +531,7 @@ function newFrame() {
         browserCanvasContext.closePath()
         browserCanvasContext.strokeStyle = 'rgba(100, 100, 100, 0.2)'
         browserCanvasContext.lineWidth = 1
-        browserCanvasContext.setLineDash([0, 0])
+        browserCanvasContext.setLineDash([]) // Resets Line Dash
         browserCanvasContext.stroke()
     }
 }

UI/Globals.js

@@ -35,6 +35,8 @@ const UI_FONT = {
 
 const MAC_AMOUNT_FACTOR = 5
 const IS_MAC = navigator.platform.toUpperCase().indexOf('MAC') >= 0
+const MAC_ZOOM_SENSITIVITY = 5
+const MAC_SCROLL_SENSITIVITY = 20
 
 const DEBUG = {}