Finished initial implementation of Stats

Signed-off-by: Mike Centola <mcentola@appliedengdesign.com>

Author: mikecentola

package.json

@@ -141,7 +141,7 @@
                 },
                 "gcode.treeAutoRefresh": {
                     "type": "boolean",
-                    "default": false,
+                    "default": true,
                     "description": "Enable G-Code Tree Auto Refresh",
                     "scope": "window"
                 },
@@ -150,6 +150,12 @@
                     "default": false,
                     "description": "Enable G-Code Statistics Panel",
                     "scope": "window"
+                },
+                "gcode.statsAutoRefresh": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Enable G-Code Stats Auto Refresh",
+                    "scope": "window"
                 }
             }
         },
@@ -173,6 +179,7 @@
                 {
                     "id": "gcode.gcodeStats",
                     "name": "G-Code Stats",
+                    "when": "config.gcode.statsEnable",
                     "contextualTitle": "G-Code",
                     "type": "tree"
                 }
@@ -182,12 +189,12 @@
             {
                 "view": "gcode.gcodeTree",
                 "contents": "Tree only available when viewing G-Code",
-                "when": "!gcodeViewEnabled"
+                "when": "!gcodeTreeViewEnabled"
             },
             {
                 "view": "gcode.gcodeStats",
-                "contents": "G-Code Stats are disabled\n[Enable Stats](command:gcode.gcodeStats.enable)\n",
-                "when": "!config.gcode.statsEnable"
+                "contents": "G-Code Stats only available when viewing G-Code",
+                "when": "!gcodeStatsViewEnabled && config.gcode.statsEnable"
             }
         ],
         "menus": {

src/extension.ts

@@ -37,7 +37,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
     vscode.commands.registerCommand('gcode.gcodeTree.refresh', () => {
         if (vscode.window.activeTextEditor?.document.languageId === constants.langId) {
-            vscode.commands.executeCommand('setContext', 'gcodeViewEnabled', true);
+            vscode.commands.executeCommand('setContext', 'gcodeTreeViewEnabled', true);
         }
         gcodeTree.refresh();        
     });
@@ -52,7 +52,10 @@ export async function activate(context: vscode.ExtensionContext) {
     vscode.window.registerTreeDataProvider('gcode.gcodeStats', gcodeStats);
 
     vscode.commands.registerCommand('gcode.gcodeStats.refresh', () => {
-        //gcodeStats.refresh();
+        if (vscode.window.activeTextEditor?.document.languageId === constants.langId) {
+            vscode.commands.executeCommand('setContext', 'gcodeStatsViewEnabled', true);
+        }
+        gcodeStats.refresh();
     });
     vscode.commands.registerCommand('gcode.gcodeStats.enable', () => {
         Logger.log('Enabling Stats...');
@@ -136,4 +139,5 @@ export function deactivate() {
     // Clean up
     Logger.close();
     StatusBar.dispose();
+    
 }

src/providers/gcodeStats.ts

@@ -3,25 +3,40 @@
  *  Licensed under the MIT License. See License.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 'use strict';
-import * as vscode from 'vscode';
-
-
-export class GCodeStatsProvider implements vscode.TreeDataProvider<GCodeStatsNode> {
-
-    private _onDidChangeTreeData: vscode.EventEmitter<GCodeStatsNode | undefined> = new vscode.EventEmitter<GCodeStatsNode | undefined>();
-    readonly onDidChangeTreeData: vscode.Event<GCodeStatsNode | undefined> = this._onDidChangeTreeData.event;
+import { 
+    commands,
+    Event,
+    EventEmitter,
+    ExtensionContext,
+    TextDocumentChangeEvent,
+    TextEditor,
+    TreeDataProvider,
+    TreeItem,
+    TreeItemCollapsibleState,
+    window,
+    workspace 
+} from 'vscode';
+import { configuration } from '../util/config';
+
+
+export class GCodeStatsProvider implements TreeDataProvider<GCodeStatsNode> {
+
+    private _onDidChangeTreeData: EventEmitter<GCodeStatsNode | undefined> = new EventEmitter<GCodeStatsNode | undefined>();
+    readonly onDidChangeTreeData: Event<GCodeStatsNode | undefined> = this._onDidChangeTreeData.event;
 
     private text = '';
     private tree: Array<GCodeStatsNode>;
-    private editor: vscode.TextEditor | undefined;
+    private editor: TextEditor | undefined;
     private autoRefresh = false;
 
-    constructor(private context: vscode.ExtensionContext) {
+    constructor(private context: ExtensionContext) {
 
         this.tree = [];
-        this.editor = vscode.window.activeTextEditor;
-        vscode.window.onDidChangeActiveTextEditor(() => this.onActiveEditorChanged());
-        vscode.workspace.onDidChangeTextDocument(e => this.onDocumentChanged(e));
+        this.editor = window.activeTextEditor;
+        window.onDidChangeActiveTextEditor(() => this.onActiveEditorChanged());
+        workspace.onDidChangeTextDocument(e => this.onDocumentChanged(e));
+
+        this.autoRefresh = configuration.getParam('statsAutoRefresh');
 
     }
 
@@ -33,39 +48,43 @@ export class GCodeStatsProvider implements vscode.TreeDataProvider<GCodeStatsNod
     }
 
     private onActiveEditorChanged(): void {
-        if (vscode.window.activeTextEditor) {
-            if (vscode.window.activeTextEditor.document.uri.scheme === 'file') {
-                const enabled = vscode.window.activeTextEditor.document.languageId === 'gcode';
-                vscode.commands.executeCommand('setContext', 'gcodeViewEnabled', enabled);
+        if (window.activeTextEditor) {
+            if (window.activeTextEditor.document.uri.scheme === 'file') {
+                const enabled = window.activeTextEditor.document.languageId === 'gcode';
+                commands.executeCommand('setContext', 'gcodeStatsViewEnabled', enabled);
 
                 if (enabled) {
-                    this.editor = vscode.window.activeTextEditor;
-                    this.refresh();
+                    this.editor = window.activeTextEditor;
+                    this.autoRefresh = configuration.getParam('statsAutoRefresh');
+                    if (this.autoRefresh) this.refresh();
                 }
             }
         } else {
-            vscode.commands.executeCommand('setContext', 'gcodeViewEnabled', false);
+            commands.executeCommand('setContext', 'gcodeStatsViewEnabled', false);
+            this.refresh();
         }
     }
 
-    private onDocumentChanged(changeEvent: vscode.TextDocumentChangeEvent): void {
-        if (vscode.window.activeTextEditor) {
-            if (vscode.window.activeTextEditor.document.uri.scheme === 'file') {
-                const enabled = vscode.window.activeTextEditor.document.languageId === 'gcode';
-                vscode.commands.executeCommand('setContext', 'gcodeViewEnabled', enabled);
+    private onDocumentChanged(changeEvent: TextDocumentChangeEvent): void {
+        if (window.activeTextEditor) {
+            if (window.activeTextEditor.document.uri.scheme === 'file') {
+                const enabled = window.activeTextEditor.document.languageId === 'gcode';
+                commands.executeCommand('setContext', 'gcodeStatsViewEnabled', enabled);
 
                 if (enabled) {
-                    this.editor = vscode.window.activeTextEditor;
-                    this.refresh();
+                    this.editor = window.activeTextEditor;
+                    this.autoRefresh = configuration.getParam('statsAutoRefresh');
+                    if(this.autoRefresh) this.refresh();
                 }
             }
         } else {
-            vscode.commands.executeCommand('setContext', 'gcodeViewEnabled', false);
+            commands.executeCommand('setContext', 'gcodeStatsViewEnabled', false);
+            this.refresh();
         }
     }
 
-    getTreeItem(element: any): vscode.TreeItem {
-        return element[0];
+    getTreeItem(element: any): TreeItem {
+        return element;
     }
 
     getChildren(element?: GCodeStatsNode): Thenable<GCodeStatsNode[]> {
@@ -79,7 +98,7 @@ export class GCodeStatsProvider implements vscode.TreeDataProvider<GCodeStatsNod
 
         this.text = '';
         this.tree = [];
-        const editor = vscode.window.activeTextEditor;
+        const editor = window.activeTextEditor;
 
         if (editor && editor.document) {
             this.text = editor.document.getText();
@@ -95,17 +114,34 @@ export class GCodeStatsProvider implements vscode.TreeDataProvider<GCodeStatsNod
 
     private genStats(text: string): Array<GCodeStatsNode> {
 
+        const stats: Array<GCodeStatsNode> = []; 
+        
+        // Tool Changes
+        stats.push(this.getToolChanges(text));
+
+
+
+        return stats;
+    }
+
+    private getToolChanges(text: string):GCodeStatsNode {
+        const re = /(M0?6)/igm;
+        const num = text.match(re)?.length || 0;
 
+        const node: GCodeStatsNode = new GCodeStatsNode(
+            'Tool Changes: ' + num,
+            TreeItemCollapsibleState.None,
+        );
 
-        return [];
+        return node;
     }
 }
 
-export class GCodeStatsNode extends vscode.TreeItem {
+export class GCodeStatsNode extends TreeItem {
 
     constructor(
         public readonly label: string,
-        public readonly collapsibleState: vscode.TreeItemCollapsibleState,
+        public readonly collapsibleState: TreeItemCollapsibleState,
     ) {
         super (label, collapsibleState);
     }