Commit Graph

975 Commits

Author SHA1 Message Date
Kartik K. Agaram e9e2ead1af esc to cancel a shape mid-click 2022-05-15 22:05:01 -07:00
Kartik K. Agaram 58ce23d843 fix a comment 2022-05-15 22:04:20 -07:00
Kartik K. Agaram 935f2a6215 autosave on keystrokes 2022-05-15 22:02:53 -07:00
Kartik K. Agaram 3be553031e bugfix: move mode 2022-05-15 21:27:00 -07:00
Kartik K. Agaram 5d74f9e9cd online contextual help 2022-05-15 15:55:21 -07:00
Kartik K. Agaram 2ee50507ff icons for current_mode 2022-05-15 15:02:35 -07:00
Kartik K. Agaram 8a6d3ce799 delete drawing using backspace
I solemnly swear that I am aware of the risk of data loss..
2022-05-15 14:47:26 -07:00
Kartik K. Agaram 4158eee7f6 experiment: only show drawing borders when they can be edited 2022-05-15 14:45:23 -07:00
Kartik K. Agaram 65cea736c3 bugfix: text sometimes getting colored like drawing borders 2022-05-15 14:42:10 -07:00
Kartik K. Agaram 6b6098593e delete an ancient, unused file 2022-05-15 14:38:11 -07:00
Kartik K. Agaram f98712c005 load/save remaining shapes 2022-05-15 14:37:22 -07:00
Kartik K. Agaram fd7f02e8ff forgot to add json.lua 2022-05-15 14:36:25 -07:00
Kartik K. Agaram 49c41e0124 load/save freehand strokes
Also found a couple of bugs in the process.
2022-05-15 14:20:33 -07:00
Kartik K. Agaram 64072bfdf4 starting to load/save 2022-05-15 14:00:49 -07:00
Kartik K. Agaram 87a3753796 more intuitive point delete from polygons 2022-05-15 00:03:31 -07:00
Kartik K. Agaram 3cb9dc3e0b delete points or shapes
Deleting a point deletes all shapes that use it (but not other points in those shapes).
2022-05-14 23:55:36 -07:00
Kartik K. Agaram 424dbadc85 slightly less strange now that we have the same two ways to move points as any other operation
1. hover over point, hit C-v
2. press mouse on point, hit v
2022-05-14 23:32:58 -07:00
Kartik K. Agaram 8bef861a66 slightly strange way to move points
Hover mouse on a point, hit a hotkey (C-v), then move mouse without
clicking, and click to finalize.

The hotkey is like a pointer tool, except you have to already be at the
thing you want to erase. And it's slightly inconvenient to move multiple
points one by one.

In the process I also fixed a bug: keychord clauses should always
specify the mouse button state.
2022-05-14 23:29:12 -07:00
Kartik K. Agaram 71fe2f28a7 changing your mind mid-shape
line->circle
circle->line
line->polygon
polygon->line
circle->polygon
polygon->circle
2022-05-14 22:41:21 -07:00
Kartik K. Agaram 8e2252db4c new mode: circle arc
We start out drawing a circle, but instead of releasing the mouse we hit
'a'.
2022-05-14 22:24:58 -07:00
Kartik K. Agaram 7cb9586204 new mode: circle 2022-05-14 22:23:02 -07:00
Kartik K. Agaram b5599f1ae7 new mode: polygon
Polygons are closed. Add vertices to them by pressing 'p' while holding
down the mouse.
2022-05-14 20:50:47 -07:00
Kartik K. Agaram cd133c170f . 2022-05-14 20:44:03 -07:00
Kartik K. Agaram 91f3aea0d9 bugfix: clipping in line and manhattan mode
Thanks Kiran and Ravi.
2022-05-14 18:40:11 -07:00
Kartik K. Agaram db1780d12a new mode: manhattan 2022-05-14 16:52:42 -07:00
Kartik K. Agaram 06daa49723 . 2022-05-14 16:52:13 -07:00
Kartik K. Agaram 89b6eda6b9 make points easier to acquire 2022-05-14 16:15:50 -07:00
Kartik K. Agaram 7d6eeed194 make point near focus 'pop' 2022-05-14 16:13:51 -07:00
Kartik K. Agaram a995e796ff snap lines to nearby points 2022-05-14 16:10:41 -07:00
Kartik K. Agaram 7d5a70379f add a level of indirection to vertices of shapes
This is like Sketchpad.
2022-05-14 16:00:21 -07:00
Kartik K. Agaram ece73b6683 . 2022-05-14 15:10:12 -07:00
Kartik K. Agaram 18bb4621c3 draw lines by default
Freehand strokes are a special case. Let's ignore them for a bit.
2022-05-14 15:09:49 -07:00
Kartik K. Agaram d55960ced0 bugfix: keep the click to create a new drawing from creating a new shape in the drawing
Easiest way to do this is to keep the screen areas for button and drawing disjoint.
2022-05-14 15:09:22 -07:00
Kartik K. Agaram d2d7e30c31 experimental approach to combining keyboard and mouse while drawing
Desired properties:
  - fluently draw lots of precise drawings
    - requires expressing lots of different kinds of constraints
  - always know what pressing a key is going to do
  - when typing, don't care where the mouse pointer is

Less important:
  - discoverability, learnability. Provide a hotkey for help.

Current plan:
  - chorded keys to modify drawings while mouse button is not pressed
  - unchorded keys to modify drawings only while mouse button is pressed
  - make changes while drawing a shape by pressing a key while mouse
    button is pressed
  - make changes to a drawing by hovering mouse pointer at a shape and
    pressing a key (unary operators)
  - add constraints after drawing by hovering mouse pointer at a shape,
    pressing a key and moving mouse pointer to a second shape (binary
    operators)
  - almost any change can be made to a shape after it's drawn (inspired
    by Sketchpad)
  - keys pressed while drawing a shape act as abbreviations to
    performing the action after drawing

First example in this PR:
  - you press mouse button, start drawing freehand
  - you realize you want a simple line, not a freehand stroke
  - without releasing the mouse button, you press 'l'
  - now you're drawing a straight line

You could also release the mouse button and finish the stroke, then
press 'ctrl-l' while hovering the mouse pointer on the stroke to turn it
into a line.

There's an asymmetry here. Strokes require a lot more information, so
while you can turn a stroke into a line, you can't turn a line into a
stroke.

Strokes are an exception where you can't switch to freehand mode after
you start drawing. You have to press C-f before drawing.
2022-05-14 13:57:19 -07:00
Kartik K. Agaram 361d80b55f bugfix 2022-05-14 13:56:52 -07:00
Kartik K. Agaram eaa3820241 beginnings of support for multiple shapes 2022-05-14 13:08:33 -07:00
Kartik K. Agaram 422dd3c3b7 color close to drawing 2022-05-14 12:21:59 -07:00
Kartik K. Agaram a1893a44d0 Devine's suggestion to try to live with just freehand
https://merveilles.town/@neauoire/108301005736317873

Drawbacks:
  Smoothing eliminates high-frequency noise but not low-frequency bumps.
  Making a drawing end at the start point is very challenging.

Still perhaps a useful addition to the toolbox for now. I'm going to
need a cambrian explosion of tools in the toolbox for a while before I
prune.
2022-05-14 12:14:41 -07:00
Kartik K. Agaram 5e39aea97d revert: back to freehand 2022-05-14 11:59:54 -07:00
Kartik K. Agaram e3eac12f85 switch from freehand to just straight lines 2022-05-13 20:42:00 -07:00
Kartik K. Agaram 79bbda9e48 store device-independent coordinates inside drawings 2022-05-12 08:29:57 -07:00
Kartik K. Agaram 2e0929fab4 slightly tweak boundary between concerns 2022-05-12 08:29:00 -07:00
Kartik K. Agaram 07e2b7b897 fix a typo 2022-05-12 08:27:41 -07:00
Kartik K. Agaram eef22f4242 make space for multiple kinds of width 2022-05-12 07:55:14 -07:00
Kartik K. Agaram d42be8e613 fix 2 bugs in line selection 2022-05-11 22:48:53 -07:00
Kartik K. Agaram fbba31ff7a turn strokes into horizontal and vertical lines 2022-05-11 22:35:36 -07:00
Kartik K. Agaram ccf7ecc502 refactor 2022-05-11 22:29:21 -07:00
Kartik K. Agaram 61292c439b simplest possible way to straighten strokes 2022-05-11 22:27:47 -07:00
Kartik K. Agaram 91fe5cd980 more lightweight; select just the stroke at the mouse 2022-05-11 22:15:54 -07:00
Kartik K. Agaram 5011395bf1 selecting a stroke 2022-05-11 22:01:51 -07:00