v0.0.35

$P_GG[29] some bugs fixed
staniska · Apr 11, 2021 · ea14625 · ea14625
1 parent 1ee4d60
commit ea14625
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -87,4 +87,8 @@
     - WHILE - ENDWILE support
     - FOR - ENDFOR support only for R-vars
     - [A]MIRROR support
-    - select containing folder for program file via teletype
+    - select containing folder for program file via teletype
+
+#### v0.0.35
+    - $P_GG[29] - only for G group 29 (DIAMOF/DIAMON/DIAM90)
+    - fix some bugs
diff --git a/lib/interpretator.js b/lib/interpretator.js
@@ -280,7 +280,8 @@ function parseRows(programText, programName, variables, firstCall) {
                     element.blank = true
                 }
             })
-            if (View.sinumerikView.parseData.canvas[View.sinumerikView.parseData.canvas.length - 1].type === 'pause') {
+            if (View.sinumerikView.parseData.canvas.length &&
+                View.sinumerikView.parseData.canvas[View.sinumerikView.parseData.canvas.length - 1].type === 'pause') {
                 View.sinumerikView.parseData.canvas.pop()
             }
 
@@ -1032,15 +1033,29 @@ function checkCondition(expression, programName) {
         }
     }
 
+    //Активная функция DIAMON/DIAMOF
+    while (expression.match(/\$P_GG\[29\]/)) {
+        let replacer = 1
+        if (View.sinumerikView.parseData.diamon) {
+            replacer = 2
+        }
+        if (View.sinumerikView.parseData.diam90) {
+            replacer = 3
+        }
+        expression = expression.replace(/\$P_GG\[29\]/, replacer);
+        // console.log(expression);
+    }
+
+
     //Затычка для радиуса инструмента
     while (expression.match(/\$P_TOOLR/)) {
         expression = expression.replace(/\$P_TOOLR/, 0);
         // console.log(expression);
     }
 
     //Затычка для длины инструмента
-    while (expression.match(/\$P_TOOLL/)) {
-        expression = expression.replace(/\$P_TOOLL/, 0);
+    while (expression.match(/\$P_TOOLL\[\d\]/)) {
+        expression = expression.replace(/\$P_TOOLL\[\d\]/, 0);
         // console.log(expression);
     }
 
@@ -3089,9 +3104,18 @@ export function mathParse(expression, programName) {
         expression = expression.replace(/\$AA_IW\[[XYZ]\]/,`${AA_value}`);
     }
 
-    //region Затычка параметров инструмента
-    //
-    //TODO Убрать эту затычку и реализовать инструменты
+    //Активная функция DIAMON/DIAMOF
+    while (expression.match(/\$P_GG\[29\]/)) {
+        let replacer = 1
+        if (View.sinumerikView.parseData.diamon) {
+            replacer = 2
+        }
+        if (View.sinumerikView.parseData.diam90) {
+            replacer = 3
+        }
+        expression = expression.replace(/\$P_GG\[29\]/, replacer);
+        // console.log(expression);
+    }
 
     //Затычка для радиуса инструмента
     while (expression.match(/\$P_TOOLR/)) {
@@ -3100,8 +3124,8 @@ export function mathParse(expression, programName) {
     }
 
     //Затычка для длины инструмента
-    while (expression.match(/\$P_TOOLL/)) {
-        expression = expression.replace(/\$P_TOOLL/, 0);
+    while (expression.match(/\$P_TOOLL\[\d\]/)) {
+        expression = expression.replace(/\$P_TOOLL\[\d\]/, 0);
         // console.log(expression);
     }
 

diff --git a/lib/machine-manager.js b/lib/machine-manager.js
@@ -96,6 +96,9 @@ export function checkMachine() {
     }
 
     const Editor = atom.workspace.getActiveTextEditor();
+    if (Editor === undefined) {
+        return
+    }
     var filename = Editor.getTitle().replace(/\./g,'_').toUpperCase();
 
     if (Editor.getTitle().split('.')[1].toUpperCase().match("MPF|SPF")) {

diff --git a/lib/single-line-debug.js b/lib/single-line-debug.js
@@ -806,6 +806,10 @@ function displayCanvasElements(ctx) {
 
     //TODO сделать отрисовку вершины инструмента при включенном slow debug
 
+    if (!View.sinumerikView.parseData.canvas.length) {
+        return
+    }
+
     if (View.sinumerikView.parseData.canvas[0].blank !== undefined) {
         blank = []
 
@@ -830,6 +834,10 @@ function displayCanvasElements(ctx) {
         }
     }
 
+    if (!View.sinumerikView.parseData.canvas.length) {
+        return
+    }
+
     if (View.sinumerikView.parseData.canvas[0].contour !== undefined) {
         contour = []
 
@@ -961,6 +969,9 @@ function displayCanvasElements(ctx) {
     }
 
     function ctx_draw(element) {
+        if (element === undefined) {
+            return
+        }
         if (View.sinumerikView.singleLineDebugInfoDiv.slowDebugCheck.checked || View.sinumerikView.singleLineDebugInfoDiv.pauseCheck.level == 2) {
             var pause_level = 3;
             if (element.type == 'msg') {

diff --git a/lib/sinumerik-view.js b/lib/sinumerik-view.js
@@ -286,6 +286,9 @@ export default class SinumerikView {
         this.machineManagerNewMachineButton.style.width = `${buttonWidth}px`;
         this.machineManagerMachineSearchInput.style.width = `${editorWidth * widthFactor - Math.round((editorWidth * widthFactor)*0.7) - 5 - 2 * buttonWidth}px`;
         //endregion
+        if (!atom.workspace.getActiveTextEditor()) {
+            return
+        }
         if (atom.workspace.getActiveTextEditor().getTitle().split('.')[1].toUpperCase().match("MPF|SPF")) {
             //loadMachineData();
             loadDataFromComment();

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sinumerik-highlight",
   "main": "./lib/sinumerik",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "Sinumerik highlight",
   "keywords": [],
   "activationCommands": {