Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ GlossCode is a G-code editor that shows a gloss line in plain English above ever
Every code word sits in a fixed-width column, and its gloss word sits directly above it:

```
SEQ40 spindle.fwd set.rpm S6000rpm
N40 spindle.fwd set.rpm S6000rpm
N40 M03 G97 S6000

SEQ50 tlen.on LOFS01 Z1.0 cool.on
N50 tlen.on LOFS01 Z1.0 cool.on
N50 G43 H01 Z1.0 M08
```

Expand Down Expand Up @@ -72,7 +72,7 @@ The gloss words come from a dictionary of consistent abbreviations ([`data/gcode
- Menu bar (File, Edit, View, Insert, Program, Simulate), undo and redo, and Find that matches both code and gloss.
- Starts on a home page with recent programs, New program and Open. Each open program gets a tab, and each tab remembers its machine and the selected line and word.
- A new program asks which machine it's for. A file opened before reopens with the same machine; any other file uses the default machine for its extension (.nc, .MIN…) if one is set, and otherwise asks, with the controls the file looks written for (from its extension and its text: CALL and RTS mean Okuma, BEGIN PGM Klartext) suggested at the top.
- Edit either line. View › Edit in (or Caps Lock) switches between typing code and typing gloss, and clicking a word on the other line switches to it, with autocomplete from the dictionary (type `cool` to get `cool.on`, `cool.off`, `cool.thru` and the other coolant words the machine has).
- Edit either line. View › Edit in switches between typing code (the default) and typing gloss. Two options in the View menu, both off by default, also switch it: Caps Lock, and clicking a word on the other line. Typing has autocomplete from the dictionary (type `cool` to get `cool.on`, `cool.off`, `cool.thru` and the other coolant words the machine has).
- Keyboard editing by word: arrows move between words and lines, Enter edits and Enter again finishes, Space starts the next word, Shift+Enter breaks the line. Pasting a few lines or a whole program puts each line in its own row and each word in its own cell. Drag across lines (or Shift+↑↓) and right-click to copy, cut or duplicate them; Ctrl+D duplicates a section.
- Grey hint text after a code shows the words it still needs (`G02` shows `R## or I## J##`). Click one to fill it in; picking R hides I and J.
- A canned cycle guide (F1) with a sketch of each cycle, an example line, and what every word does.
Expand Down
2 changes: 1 addition & 1 deletion data/gcode-words.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"M99": { "words": "call.return", "short": "RET", "desc": "Return from subprogram" }
},
"address": {
"N": { "words": "SEQ", "short": "N", "desc": "Sequence number" },
"N": { "words": "N", "short": "N", "desc": "Sequence number" },
"O": { "words": "PROG", "short": "O", "desc": "Program number" },
"T": { "words": "TOOL", "short": "T", "desc": "Tool number" },
"H": { "words": "LOFS", "short": "H", "desc": "Tool length offset number" },
Expand Down
4 changes: 3 additions & 1 deletion docs/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ This list tracks what the mockup shows. Nothing is implemented yet.
- [ ] Shift+Enter breaks the line after the selected word, moving the rest to a new numbered line
- [ ] Paste (Ctrl+V or Edit › Paste) splits the text the way opening a file does. One line goes into the current line with each word in its own cell (`G01X1.Y2.` becomes three words). Several lines, or a whole program, go in as their own lines below the current one, or replace it when it's blank
- [ ] Select whole lines by dragging the mouse across them, Shift+↑↓ or Shift+click (Ctrl+A selects all). Right-click, or Ctrl+C / Ctrl+X, copies or cuts them as code text, the same as Save writes it, with no gloss. Ctrl+D duplicates them below; Ctrl+V pastes over them; Delete removes them
- [ ] Caps Lock switches between editing the code line and the gloss line (View › Caps Lock switches between them)
- [ ] View › Edit in picks the line typing goes to: code (the default) or gloss
- [ ] Caps Lock switches between editing the code line and the gloss line (View › Caps Lock switches between them, off by default)
- [ ] Clicking a word on the other line switches to editing that line (View › Clicking switches between editing code and editing gloss, off by default)
- [ ] Hint text after codes for the words they still need (`G02` shows `R## or I## J##`, `G83` shows `Z## R## Q##`). Clicking R## types the R and hides I and J; clicking I## hides R but keeps J
- [ ] Mode-clash warnings in the status bar
- [ ] Auto N numbering on new lines (step 10, midpoint when there's no room)
Expand Down
39 changes: 26 additions & 13 deletions src/ui/index.html

Large diffs are not rendered by default.

Loading