Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Machining Calculators #50

Merged
merged 80 commits into from
Nov 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
4f85fbf
Added preserveFocus to show
mikecentola Jul 26, 2022
ac25116
Working test side view for calculators
mikecentola Jul 26, 2022
44039d6
Added @vscode/webview-ui-toolkit to deps
mikecentola Jul 26, 2022
97a3b5d
Fixed typo in machineTypeController
mikecentola Jul 26, 2022
97daa13
Testing tabs & ui kit
mikecentola Jul 26, 2022
0575e02
updated vscodeignore
mikecentola Jul 26, 2022
b460cf7
Changed to eslint-webpack-plugin
mikecentola Jul 26, 2022
002c3ac
Added webview controller
mikecentola Jul 26, 2022
a239312
Added copy-webpack-plugin
mikecentola Jul 26, 2022
e3ad38c
Refactored configuration into categories
mikecentola Jul 26, 2022
9648b54
Working framework for calc sidebar view
mikecentola Jul 26, 2022
d1e5500
Added webview constants
mikecentola Jul 26, 2022
8b34dff
Changed scripts. Added css-loader,sass-loader,sass,mini-css-extract-p…
mikecentola Jul 27, 2022
41fa5a7
Moved css into src/webviews/apps/shared. Calc.ts placeholder
mikecentola Jul 27, 2022
26a0d6b
Changed name of calculator
mikecentola Jul 27, 2022
15391af
Working test side view for calculators
mikecentola Jul 26, 2022
df9cf07
Testing tabs & ui kit
mikecentola Jul 26, 2022
d928db3
Working framework for calc sidebar view
mikecentola Jul 26, 2022
2a257b8
Added webview constants
mikecentola Jul 26, 2022
39e5aa8
Changed name of calculator
mikecentola Jul 27, 2022
32c20e2
Updated launch and tasks
mikecentola Jul 28, 2022
ab454a5
Working webview bundling
mikecentola Jul 29, 2022
53ec772
Initial html framework
mikecentola Jul 29, 2022
30157cc
Moved getNonce functon to helpers
mikecentola Jul 29, 2022
f16773b
testing empty class added
mikecentola Jul 29, 2022
85dc97a
Added csp-html-webpack-plugin
mikecentola Jul 30, 2022
2d27cc7
Added config for csp-html-webpack-plugin
mikecentola Jul 30, 2022
174f647
Added webview apps to ignore
mikecentola Jul 30, 2022
2a97c94
Added html loading from webpack-emitted file
mikecentola Jul 30, 2022
119bcf9
Refactored to match gWebviewView
mikecentola Jul 30, 2022
bba75a8
Added logger
mikecentola Aug 1, 2022
ec68e88
Added csp-nonce meta property to head template for vscode-webview-ui-…
mikecentola Aug 1, 2022
c1e25db
Fixed finding input box within shadowRoot
mikecentola Aug 1, 2022
9b27032
Added run-only launches
mikecentola Aug 3, 2022
9a44fb4
Moved scss into subfolder. Added base.scss
mikecentola Aug 3, 2022
553d847
Added better typing. Finished 4 types of calculators
mikecentola Aug 3, 2022
d07bb15
Added framework and styling for calculators
mikecentola Aug 3, 2022
a539bca
Styling and flex model updated
mikecentola Aug 3, 2022
50636cb
Added clear fields functionality
mikecentola Aug 3, 2022
ca73ade
Add abstract class for webview apps
mikecentola Aug 4, 2022
44bef95
Move types to ext file; Add message event handler
mikecentola Aug 4, 2022
8bdefa2
Refactor units controller
mikecentola Aug 26, 2022
4abece1
Fixed clearFields to clear results
mikecentola Aug 26, 2022
4654d22
Moved webviewMsg file
mikecentola Aug 26, 2022
619f4a4
Added calcWebviewView getter; Renamed Units Controller
mikecentola Sep 1, 2022
6118dc9
Added GCodeUnits enum
mikecentola Sep 1, 2022
13be270
Changed location of GCodeUnits
mikecentola Sep 1, 2022
51a4e42
Fixed units HTML & SCSS
mikecentola Sep 1, 2022
3a39548
Changed Units type to enum
mikecentola Sep 1, 2022
6d25a5a
Added webviewMsg.types to includes
mikecentola Sep 1, 2022
6c16eed
Refactored Units Controller; Added Units change event
mikecentola Sep 1, 2022
daf025e
Added message passing
mikecentola Sep 1, 2022
bcaea06
Added register events to constructor
mikecentola Sep 1, 2022
e0f482f
Added units tracking & message passing
mikecentola Sep 1, 2022
75e02c9
Added units tracking
mikecentola Sep 1, 2022
426a2bd
Added html-loader
mikecentola Sep 26, 2022
4a1967b
Removed old calcWebviewView file
mikecentola Sep 26, 2022
66b5223
Fixed missing LineNumbererOptions from rebase
mikecentola Sep 26, 2022
50b21bc
Fixed a few typos
mikecentola Sep 26, 2022
9504317
Renamed MachineTypeControl -> MachineTypeController
mikecentola Sep 26, 2022
2321ee6
Added bootstrap & subscription to MachineType change
mikecentola Sep 27, 2022
cf859d5
Added subscribable MachineTypeChange
mikecentola Sep 27, 2022
4f4c289
Added bootstrapping of Units & MachineType
mikecentola Sep 27, 2022
91dfdfb
Renamed UnitsController and moved to Utils
mikecentola Sep 27, 2022
fc126cd
Typo for MachineType type
mikecentola Sep 27, 2022
9a8c131
Hardcoded MachineTypes to avoid loading additional module
mikecentola Sep 27, 2022
267ab0e
Added MRR calculator
mikecentola Sep 27, 2022
2a0ef46
Modified variable & field labels to be unit independent
mikecentola Sep 27, 2022
fd69232
Removed handleMessage
mikecentola Sep 27, 2022
99ca27d
Use MachineType from gcode-reference
mikecentola Sep 27, 2022
9753649
Added MRR title
mikecentola Sep 28, 2022
f3d9c7d
Fixed event not firing on machineType change
mikecentola Sep 28, 2022
11916d7
Fixed typo in MRR feedrate input
mikecentola Sep 28, 2022
6b67c89
Added MachineType response & Surface Finish calc
mikecentola Sep 28, 2022
9d0698c
Added onView:gcode.views.calc
mikecentola Sep 28, 2022
05778dc
Fixed layout issues
mikecentola Sep 29, 2022
7e1e583
Added screenshot of calculator
mikecentola Sep 29, 2022
d72a49e
Added dispose/visability event handlers
mikecentola Nov 10, 2022
1b8db02
Merge branch 'master' into calculator
mikecentola Nov 11, 2022
71bff5f
Refresh npm to fix package-lock.json
mikecentola Nov 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"amodio.tsl-problem-matcher",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode"
]
}
100 changes: 75 additions & 25 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// A launch configuration that launches the extension inside a new window
{
"version": "0.2.0",
"configurations": [
{
"name": "Run G-Code (Sandbox) - Samples",
"name": "Run G-Code (Sandbox)",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
Expand All @@ -23,39 +22,72 @@
],
"presentation": {
"hidden": false,
"group": "Launch Extension",
"group": "1_run",
"order": 1
},
"preLaunchTask": "npm: webpack",
"skipFiles": [
"<node_internals>/**",
"**/node_modules/**",
"**/resources/app/out/vs/**"
],
"smartStep": true,
"sourceMaps": true,
"trace": true,
"trace": true
},
{
"name": "Run G-Code (Sandbox)",
"name": "Run G-Code (Full)",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--trace-depreciation",
"--trace-warnings",
"--extensionDevelopmentPath=${workspaceFolder}",
"${workspaceFolder}/samplenc/sample-colors.nc",
"${workspaceFolder}/samplenc/sample-profile.nc",
"${workspaceFolder}/samplenc/sample-circular-pocket.nc"
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"presentation": {
"hidden": false,
"group": "1_run",
"order": 2
},
"skipFiles": [
"<node_internals>/**",
"**/node_modules/**",
"**/resources/app/out/vs/**"
],
"smartStep": true,
"sourceMaps": true,
"trace": true
},
{
"name": "Build & Run G-Code (Sandbox)",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--disable-extensions",
"--trace-warnings",
"--trace-depreciation",
"--extensionDevelopmentPath=${workspaceFolder}"
"--extensionDevelopmentPath=${workspaceFolder}",
"${workspaceFolder}/samplenc/sample-colors.nc",
"${workspaceFolder}/samplenc/sample-profile.nc",
"${workspaceFolder}/samplenc/sample-circular-pocket.nc"
],
"cwd": "${workspaceFolder}",
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"presentation": {
"hidden": false,
"group": "Launch Extension",
"order": 2
"group": "2_build_launch",
"order": 1
},
"preLaunchTask": "npm: webpack",
"preLaunchTask": "npm: build",
"skipFiles": [
"<node_internals>/**",
"**/node_modules/**",
Expand All @@ -66,49 +98,66 @@
"trace": true
},
{
"name": "Run G-Code (Full)",
"name": "Build & Run G-Code (Full)",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--trace-depreciation",
"--extensionDevelopmentPath=${workspaceFolder}"
"--trace-warnings",
"--extensionDevelopmentPath=${workspaceFolder}",
"${workspaceFolder}/samplenc/sample-colors.nc",
"${workspaceFolder}/samplenc/sample-profile.nc",
"${workspaceFolder}/samplenc/sample-circular-pocket.nc"
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"presentation": {
"hidden": false,
"group": "Launch Extension",
"order": 3
"group": "2_build_launch",
"order": 2
},
"preLaunchTask": "npm: webpack",
"preLaunchTask": "npm: build",
"skipFiles": [
"<node_internals>/**",
"**/node_modules/**"
"**/node_modules/**",
"**/resources/app/out/vs/**"
],
"smartStep": true,
"sourceMaps": true,
"trace": true
},
{
"name": "Run G-Code As Web Extension",
"name": "Build & Run G-Code (Full/Production)",
"type": "extensionHost",
"debugWebWorkerHost": true,
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--trace-depreciation",
"--trace-warnings",
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionDevelopmentKind=web"
"${workspaceFolder}/samplenc/sample-colors.nc",
"${workspaceFolder}/samplenc/sample-profile.nc",
"${workspaceFolder}/samplenc/sample-circular-pocket.nc"
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "npm: webpack",
"presentation": {
"hidden": false,
"group": "Web Extension",
"order": 1
}
"group": "2_build_launch",
"order": 3
},
"preLaunchTask": "npm: bundle",
"skipFiles": [
"<node_internals>/**",
"**/node_modules/**",
"**/resources/app/out/vs/**"
],
"smartStep": true,
"sourceMaps": true,
"trace": true
},
{
"name": "G-Code Mocha Unit Tests",
Expand All @@ -127,11 +176,12 @@
],
"skipFiles": [
"<node_internals>/**",
"**/node_modules/**"
"**/node_modules/**",
"**/resources/app/out/vs/**"
],
"presentation": {
"hidden": false,
"group": "Testing",
"group": "3_test",
"order": 1
},
"env": {
Expand Down
6 changes: 3 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"files.exclude": {
"out": false // set this to true to hide the "out" folder with the compiled JS files
"out": false
},
"search.exclude": {
"out": true // set this to false to include "out" folder in search results
"out": true,
"dist": true
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off",
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
Expand Down
39 changes: 12 additions & 27 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,24 @@
{
"version": "2.0.0",
"presentation": {
"echo": false,
"reveal": "always",
"focus": false,
"panel": "dedicated",
"showReuseMessage": false,
"clear": false
},
"tasks": [
{
"type": "npm",
"script": "watch",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"echo": true,
"reveal": "never",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": false
},
"script": "build",
"problemMatcher": [
"$ts-webpack",
],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"type": "npm",
"script": "webpack",
"problemMatcher": "$tsc-watch",
"label": "npm: webpack",
"detail": "webpack --mode development",
"isBackground": true,
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": false
}
}
]
}
6 changes: 5 additions & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.prettierignore
.prettierrc
.vscode-test/**
.vscode-test-web/**
.vscode/**
**/*.map
CODE_OF_CONDUCT.md
Expand All @@ -18,9 +19,12 @@ images/**/[^logo]*
out/test/**
package-lock.json
samplenc/**
scripts/**
src/**
test/**
out/**
node_modules/**
tsconfig**
tsconfig.tsbuildinfo
webpack.config.js
webpack.config*.js
.DS_Store
Binary file added images/calculator-screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading