V3 colorsets

.gitignore

@@ -19,6 +19,8 @@ npm-debug.log
 
 config.ini
 
+test_*
+
 .DS_Store
 /nbproject/*
 

.nvmrc

@@ -1 +1 @@
-12
+16

machine_types/watercolorbot.ini

@@ -53,6 +53,7 @@ height = 206.25
 [park]
 x = 0
 y = 0
+z = 0
 
 [workArea]
 ; Also measured in steps
@@ -93,182 +94,43 @@ max = 1023
 min = 0
 
 [tools]
+[tools.pan]
+x = 22
+y = -2.5
+width = 38.4
+height = 214
+position = topleft
+radius = 4
+type = swappable
+group = Placeholder
+
 [tools.water0]
-x = 0
-y = 0
-wiggleAxis = y
-wiggleTravel = 300
-wiggleIterations = 4
+x = -12.2
+y = 14.8
+width = 57.85
+height = 57.85
+position = center
+radius = 35
 group = Water
 
-[tools.water0dip]
-x = 0
-y = 0
-wiggleAxis = y
-wiggleTravel = 5
-wiggleIterations = 2
-group = Water Dip
-
 [tools.water1]
-x = 0
-y = 1650
-wiggleAxis = y
-wiggleTravel = 300
-wiggleIterations = 4
+x = -12.2
+y = 90
+width = 57.85
+height = 57.85
+position = center
+radius = 35
 group = Water
 
-[tools.water1dip]
-x = 0
-y = 1650
-wiggleAxis = y
-wiggleTravel = 5
-wiggleIterations = 2
-group = Water Dip
-
 [tools.water2]
-x = 0
-y = 3000
-wiggleAxis = y
-wiggleTravel = 300
-wiggleIterations = 4
+x = -12.2
+y = 168
+width = 57.85
+height = 57.85
+position = center
+radius = 35
 group = Water
 
-[tools.water2dip]
-x = 0
-y = 3000
-wiggleAxis = y
-wiggleTravel = 5
-wiggleIterations = 2
-group = Water Dip
-
-[tools.color0]
-x = 775
-y = 250
-wiggleAxis = xy
-wiggleTravel = 300
-wiggleIterations = 8
-group = Colors
-
-[tools.color1]
-x = 775
-y = 715
-wiggleAxis = xy
-wiggleTravel = 300
-wiggleIterations = 8
-group = Colors
-
-[tools.color2]
-x = 775
-y = 1135
-wiggleAxis = xy
-wiggleTravel = 300
-wiggleIterations = 8
-group = Colors
-
-[tools.color3]
-x = 775
-y = 1625
-wiggleAxis = xy
-wiggleTravel = 300
-wiggleIterations = 8
-group = Colors
-
-[tools.color4]
-x = 775
-y = 2035
-wiggleAxis = xy
-wiggleTravel = 300
-wiggleIterations = 8
-group = Colors
-
-[tools.color5]
-x = 775
-y = 2502
-wiggleAxis = xy
-wiggleTravel = 300
-wiggleIterations = 8
-group = Colors
-
-[tools.color6]
-x = 775
-y = 2955
-wiggleAxis = xy
-wiggleTravel = 300
-wiggleIterations = 8
-group = Colors
-
-[tools.color7]
-x = 775
-y = 3405
-wiggleAxis = xy
-wiggleTravel = 300
-wiggleIterations = 8
-group = Colors
-
-[tools.color0dip]
-x = 775
-y = 250
-wiggleAxis = xy
-wiggleTravel = 5
-wiggleIterations = 2
-group = Colors Dip
-
-[tools.color1dip]
-x = 775
-y = 715
-wiggleAxis = xy
-wiggleTravel = 5
-wiggleIterations = 2
-group = Colors Dip
-
-[tools.color2dip]
-x = 775
-y = 1135
-wiggleAxis = xy
-wiggleTravel = 5
-wiggleIterations = 2
-group = Colors Dip
-
-[tools.color3dip]
-x = 775
-y = 1625
-wiggleAxis = xy
-wiggleTravel = 5
-wiggleIterations = 2
-group = Colors Dip
-
-[tools.color4dip]
-x = 775
-y = 2035
-wiggleAxis = xy
-wiggleTravel = 5
-wiggleIterations = 2
-group = Colors Dip
-
-[tools.color5dip]
-x = 775
-y = 2502
-wiggleAxis = xy
-wiggleTravel = 5
-wiggleIterations = 2
-group = Colors Dip
-
-[tools.color6dip]
-x = 775
-y = 2955
-wiggleAxis = xy
-wiggleTravel = 5
-wiggleIterations = 2
-group = Colors Dip
-
-[tools.color7dip]
-x = 775
-y = 3405
-wiggleAxis = xy
-wiggleTravel = 5
-wiggleIterations = 2
-group = Colors Dip
-
 [tools.manualswap]
 x = 0
 y = 0

node.importmap

@@ -0,0 +1,73 @@
+{
+  "imports": {
+    "cs/unify": "./src/components/core/utils/cncserver.unify.js",
+    "cs/utils": "./src/components/core/utils/cncserver.utils.js",
+    "cs/binder": "./src/components/core/utils/cncserver.binder.js",
+    "cs/settings": "./src/components/core/utils/cncserver.settings.js",
+    "cs/i18n": "./src/components/core/utils/cncserver.i18n.js",
+    "cs/server": "./src/components/core/comms/cncserver.server.js",
+    "cs/rest": "./src/components/core/comms/cncserver.rest.js",
+    "cs/ipc": "./src/components/core/comms/cncserver.ipc.js",
+    "cs/serial": "./src/components/core/comms/cncserver.serial.js",
+    "cs/sockets": "./src/components/core/comms/cncserver.sockets.js",
+    "cs/pen": "./src/components/core/control/cncserver.pen.js",
+    "cs/actualPen": "./src/components/core/control/cncserver.actualpen.js",
+    "cs/control": "./src/components/core/control/cncserver.control.js",
+    "cs/tools": "./src/components/core/control/cncserver.tools.js",
+    "cs/buffer": "./src/components/core/utils/cncserver.buffer.js",
+    "cs/run": "./src/components/core/utils/cncserver.run.js",
+    "cs/scratch": "./src/components/third_party/scratch/cncserver.scratch.js",
+    "cs/drawing": "./src/components/core/drawing.js",
+    "cs/projects": "./src/components/core/control/cncserver.projects.js",
+    "cs/print": "./src/components/core/control/cncserver.print.js",
+    "cs/content": "./src/components/core/control/cncserver.content.js",
+    "cs/schemas": "./src/components/core/schemas/cncserver.schemas.js",
+    "cs/api": "./src/components/core/comms/cncserver.api.js",
+    "cs/api/handlers": "./src/components/core/comms/api/index.js",
+    "cs/api/handlers/settings": "./src/components/core/comms/api/cncserver.api.settings.js",
+    "cs/api/handlers/pen": "./src/components/core/comms/api/cncserver.api.pen.js",
+    "cs/api/handlers/motors": "./src/components/core/comms/api/cncserver.api.motors.js",
+    "cs/api/handlers/buffer": "./src/components/core/comms/api/cncserver.api.buffer.js",
+    "cs/api/handlers/tools": "./src/components/core/comms/api/cncserver.api.tools.js",
+    "cs/api/handlers/colors": "./src/components/core/comms/api/cncserver.api.colors.js",
+    "cs/api/handlers/implements": "./src/components/core/comms/api/cncserver.api.implements.js",
+    "cs/api/handlers/projects": "./src/components/core/comms/api/cncserver.api.projects.js",
+    "cs/api/handlers/content": "./src/components/core/comms/api/cncserver.api.content.js",
+    "cs/api/handlers/print": "./src/components/core/comms/api/cncserver.api.print.js",
+    "cs/api/handlers/serial": "./src/components/core/comms/api/cncserver.api.serial.js",
+    "cs/bots": "./src/components/machine_support/index.js",
+    "cs/bots/base": "./src/components/machine_support/cncserver.bots.base.js",
+    "cs/bots/ebb": "./src/components/machine_support/cncserver.bots.ebb.js",
+    "cs/bots/watercolorbot": "./src/components/machine_support/cncserver.bots.watercolorbot.js",
+    "cs/drawing": "./src/components/core/drawing/index.js",
+    "cs/drawing/base": "./src/components/core/drawing/cncserver.drawing.base.js",
+    "cs/drawing/occlusion": "./src/components/core/drawing/cncserver.drawing.occlusion.js",
+    "cs/drawing/trace": "./src/components/core/drawing/cncserver.drawing.trace.js",
+    "cs/drawing/spawner": "./src/components/core/drawing/cncserver.drawing.spawner.js",
+    "cs/drawing/fill": "./src/components/core/drawing/cncserver.drawing.fill.js",
+    "cs/drawing/vectorize": "./src/components/core/drawing/cncserver.drawing.vectorize.js",
+    "cs/drawing/text": "./src/components/core/drawing/cncserver.drawing.text.js",
+    "cs/drawing/accell": "./src/components/core/drawing/cncserver.drawing.accell.js",
+    "cs/drawing/colors": "./src/components/core/drawing/cncserver.drawing.colors.js",
+    "cs/drawing/colors/matcher": "./src/interface/modules/utils/colorset-matcher.mjs",
+    "cs/drawing/implements": "./src/components/core/drawing/cncserver.drawing.implements.js",
+    "cs/drawing/stage": "./src/components/core/drawing/cncserver.drawing.stage.js",
+    "cs/drawing/preview": "./src/components/core/drawing/cncserver.drawing.preview.js",
+    "cs/drawing/temp": "./src/components/core/drawing/cncserver.drawing.temp.js",
+    "cs/schemas": "./src/components/core/schemas/cncserver.schemas.js",
+    "cs/schemas/index": "./src/components/core/schemas/index.js",
+    "cs/schemas/projects": "./src/components/core/schemas/cncserver.schemas.projects.js",
+    "cs/schemas/content": "./src/components/core/schemas/cncserver.schemas.content.js",
+    "cs/schemas/content/settings": "./src/components/core/schemas/cncserver.schemas.content.settings.js",
+    "cs/schemas/fill": "./src/components/core/schemas/cncserver.schemas.fill.js",
+    "cs/schemas/stroke": "./src/components/core/schemas/cncserver.schemas.stroke.js",
+    "cs/schemas/text": "./src/components/core/schemas/cncserver.schemas.text.js",
+    "cs/schemas/vectorize": "./src/components/core/schemas/cncserver.schemas.vectorize.js",
+    "cs/schemas/path": "./src/components/core/schemas/cncserver.schemas.path.js",
+    "cs/schemas/color": "./src/components/core/schemas/cncserver.schemas.color.js",
+    "cs/schemas/colors": "./src/components/core/schemas/cncserver.schemas.colors.js",
+    "cs/schemas/tools": "./src/components/core/schemas/cncserver.schemas.tools.js",
+    "cs/schemas/implements": "./src/components/core/schemas/cncserver.schemas.implements.js",
+    "cs/schemas/toolsets": "./src/components/core/schemas/cncserver.schemas.toolsets.js"
+  }
+}