From d0dea3473d42b6878cd0e7779b09ac583b79231b Mon Sep 17 00:00:00 2001 From: papaseppo Date: Sat, 4 Jan 2025 23:44:22 +0000 Subject: [PATCH 1/5] =?UTF-8?q?deligted=20to=20see=20the=20git=20hub=20rep?= =?UTF-8?q?o=20referenced=20by=20the=20hobbybrauer.de=20thread.=20Found=20?= =?UTF-8?q?I'd=20have=20myself=20a=20nice=20scale=20on=20my=20stuff.=20-st?= =?UTF-8?q?eel=20cup=20-milk=20pot=20(used=20for=20umsch=C3=B6pfing)=20-bi?= =?UTF-8?q?g=20old=20pan=20-sansone=20fermenting=20pot=20needed=20to=20all?= =?UTF-8?q?ow=20for=20"ml"=20as=20VolumeUnit=20in=20New-Scale-Request.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/new-scale-request.yml | 1 + .../cylinder_mm_d070_h080_0L01-0L2_i0L1.json | 37 ++++++++++++++++ .../cylinder_mm_d138_h110_0L2-1L5_i0L2.json | 37 ++++++++++++++++ .../cylinder_mm_d281_h180_1-10L_i1.json | 37 ++++++++++++++++ .../cylinder_mm_d370_h330_1-30l_i1.json | 37 ++++++++++++++++ scales/definitions/schemas/scale-config | 2 +- .../cylinder_mm_d070_h080_0L01-0L2_i0L1.svg | 19 +++++++++ .../cylinder_mm_d138_h110_0L2-1L5_i0L2.svg | 24 +++++++++++ .../svgs/cylinder_mm_d281_h180_1-10L_i1.svg | 19 +++++++++ .../svgs/cylinder_mm_d370_h330_1-30l_i1.svg | 42 +++++++++++++++++++ 10 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 scales/definitions/cylinder_mm_d070_h080_0L01-0L2_i0L1.json create mode 100644 scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json create mode 100644 scales/definitions/cylinder_mm_d281_h180_1-10L_i1.json create mode 100644 scales/definitions/cylinder_mm_d370_h330_1-30l_i1.json create mode 100644 scales/svgs/cylinder_mm_d070_h080_0L01-0L2_i0L1.svg create mode 100644 scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg create mode 100644 scales/svgs/cylinder_mm_d281_h180_1-10L_i1.svg create mode 100644 scales/svgs/cylinder_mm_d370_h330_1-30l_i1.svg diff --git a/.github/ISSUE_TEMPLATE/new-scale-request.yml b/.github/ISSUE_TEMPLATE/new-scale-request.yml index 9b125a8..99006b0 100644 --- a/.github/ISSUE_TEMPLATE/new-scale-request.yml +++ b/.github/ISSUE_TEMPLATE/new-scale-request.yml @@ -39,6 +39,7 @@ body: options: - "l" - "gal (U.S.)" + - "ml" default: 0 - type: input id: diameter diff --git a/scales/definitions/cylinder_mm_d070_h080_0L01-0L2_i0L1.json b/scales/definitions/cylinder_mm_d070_h080_0L01-0L2_i0L1.json new file mode 100644 index 0000000..dd105f8 --- /dev/null +++ b/scales/definitions/cylinder_mm_d070_h080_0L01-0L2_i0L1.json @@ -0,0 +1,37 @@ +{ + "$schema": "./schemas/scale-config", + "scale-config": { + "containerForm": "cylinder", + "lengthUnit": "mm", + "volumeUnit": "ml", + "diameter": 70, + "height": 82, + "minVolume": 10, + "maxVolume": 200, + "output": "./scales/svgs/{0}.svg", + "description": "steel mug", + "sucessfullyAppliedTo": "", + "requiresTransferTape": false, + "graduationMarkSettings": [ + { + "interval": 20, + "length": 8, + "height": 1.3, + "indentation": 0, + "textTemplate": "" + }, + { + "interval": 100, + "length": 25, + "height": 1.3, + "font": { + "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", + "size": 8, + "offsetX": 5, + "offsetY": -5, + "textAlignment": "Right" + } + } + ] + } +} diff --git a/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json b/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json new file mode 100644 index 0000000..633aad8 --- /dev/null +++ b/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json @@ -0,0 +1,37 @@ +{ + "$schema": "./schemas/scale-config", + "scale-config": { + "containerForm": "cylinder", + "lengthUnit": "mm", + "volumeUnit": "ml", + "diameter": 138, + "height": 110, + "minVolume": 200, + "maxVolume": 1500, + "output": "./scales/svgs/{0}.svg", + "description": "wenco Milkpot", + "sucessfullyAppliedTo": "", + "requiresTransferTape": false, + "graduationMarkSettings": [ + { + "interval": 100, + "length": 10, + "height": 1.5, + "indentation": 0, + "textTemplate": "" + }, + { + "interval": 500, + "length": 25, + "height": 1.5, + "font": { + "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", + "size": 8, + "offsetX": 10, + "offsetY": -5, + "textAlignment": "Right" + } + } + ] + } +} diff --git a/scales/definitions/cylinder_mm_d281_h180_1-10L_i1.json b/scales/definitions/cylinder_mm_d281_h180_1-10L_i1.json new file mode 100644 index 0000000..0dbfee7 --- /dev/null +++ b/scales/definitions/cylinder_mm_d281_h180_1-10L_i1.json @@ -0,0 +1,37 @@ +{ + "$schema": "./schemas/scale-config", + "scale-config": { + "containerForm": "cylinder", + "lengthUnit": "mm", + "volumeUnit": "l", + "diameter": 281, + "height": 180, + "minVolume": 1, + "maxVolume": 10, + "output": "./scales/svgs/{0}.svg", + "description": "old 10 L pot", + "sucessfullyAppliedTo": "", + "requiresTransferTape": false, + "graduationMarkSettings": [ + { + "interval": 1, + "length": 10, + "height": 1.5, + "indentation": 0, + "textTemplate": "" + }, + { + "interval": 5, + "length": 25, + "height": 1.5, + "font": { + "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", + "size": 8, + "offsetX": -2, + "offsetY": -5, + "textAlignment": "Right" + } + } + ] + } +} \ No newline at end of file diff --git a/scales/definitions/cylinder_mm_d370_h330_1-30l_i1.json b/scales/definitions/cylinder_mm_d370_h330_1-30l_i1.json new file mode 100644 index 0000000..59e8ec6 --- /dev/null +++ b/scales/definitions/cylinder_mm_d370_h330_1-30l_i1.json @@ -0,0 +1,37 @@ +{ + "$schema": "./schemas/scale-config", + "scale-config": { + "containerForm": "cylinder", + "lengthUnit": "mm", + "volumeUnit": "l", + "diameter": 370, + "height": 330, + "minVolume": 2, + "maxVolume": 30, + "output": "./scales/svgs/{0}.svg", + "description": "Sansone Edelstahlbehälter 18/10 30 Liter", + "sucessfullyAppliedTo": "", + "requiresTransferTape": false, + "graduationMarkSettings": [ + { + "interval": 1, + "length": 10, + "height": 1.5, + "indentation": 0, + "textTemplate": "" + }, + { + "interval": 5, + "length": 25, + "height": 1.5, + "font": { + "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", + "size": 8, + "offsetX": -2, + "offsetY": -5, + "textAlignment": "Right" + } + } + ] + } +} \ No newline at end of file diff --git a/scales/definitions/schemas/scale-config b/scales/definitions/schemas/scale-config index 23cbacb..877a293 100644 --- a/scales/definitions/schemas/scale-config +++ b/scales/definitions/schemas/scale-config @@ -25,7 +25,7 @@ }, "volumeUnit": { "type": "string", - "enum": ["l", "gal (U.S.)"], + "enum": ["l", "gal (U.S.)", "ml"], "description": "Unit of volume for the given measurements and output on scale." }, "diameter": { diff --git a/scales/svgs/cylinder_mm_d070_h080_0L01-0L2_i0L1.svg b/scales/svgs/cylinder_mm_d070_h080_0L01-0L2_i0L1.svg new file mode 100644 index 0000000..b9eca5c --- /dev/null +++ b/scales/svgs/cylinder_mm_d070_h080_0L01-0L2_i0L1.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg b/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg new file mode 100644 index 0000000..b5f2fc0 --- /dev/null +++ b/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scales/svgs/cylinder_mm_d281_h180_1-10L_i1.svg b/scales/svgs/cylinder_mm_d281_h180_1-10L_i1.svg new file mode 100644 index 0000000..efbef31 --- /dev/null +++ b/scales/svgs/cylinder_mm_d281_h180_1-10L_i1.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scales/svgs/cylinder_mm_d370_h330_1-30l_i1.svg b/scales/svgs/cylinder_mm_d370_h330_1-30l_i1.svg new file mode 100644 index 0000000..cdc3c13 --- /dev/null +++ b/scales/svgs/cylinder_mm_d370_h330_1-30l_i1.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b73466b7510a396631950ec13bb8fe80c73ad5cc Mon Sep 17 00:00:00 2001 From: papaseppo Date: Sun, 5 Jan 2025 09:23:50 +0000 Subject: [PATCH 2/5] add dl and ml to "new-scale-request.yml" --- .github/ISSUE_TEMPLATE/new-scale-request.yml | 2 ++ .../cylinder_mm_d138_h110_0L2-1L5_i0L2.json | 10 +++--- .../cylinder_mm_d138_h110_0L2-1L5_i0L2.svg | 36 +++++++++---------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/new-scale-request.yml b/.github/ISSUE_TEMPLATE/new-scale-request.yml index 99006b0..9d3ab62 100644 --- a/.github/ISSUE_TEMPLATE/new-scale-request.yml +++ b/.github/ISSUE_TEMPLATE/new-scale-request.yml @@ -40,6 +40,8 @@ body: - "l" - "gal (U.S.)" - "ml" + - "cl" + - "dl" default: 0 - type: input id: diameter diff --git a/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json b/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json index 633aad8..41b9b74 100644 --- a/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json +++ b/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json @@ -3,25 +3,25 @@ "scale-config": { "containerForm": "cylinder", "lengthUnit": "mm", - "volumeUnit": "ml", + "volumeUnit": "dl", "diameter": 138, "height": 110, - "minVolume": 200, - "maxVolume": 1500, + "minVolume": 2, + "maxVolume": 15, "output": "./scales/svgs/{0}.svg", "description": "wenco Milkpot", "sucessfullyAppliedTo": "", "requiresTransferTape": false, "graduationMarkSettings": [ { - "interval": 100, + "interval": 1, "length": 10, "height": 1.5, "indentation": 0, "textTemplate": "" }, { - "interval": 500, + "interval": 5, "length": 25, "height": 1.5, "font": { diff --git a/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg b/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg index b5f2fc0..7f97f4e 100644 --- a/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg +++ b/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg @@ -3,22 +3,22 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file From 17ea9622e724bbe98ebbfb5a998c584a6b8d949f Mon Sep 17 00:00:00 2001 From: papaseppo Date: Sun, 5 Jan 2025 09:29:01 +0000 Subject: [PATCH 3/5] Added "cl" and "dl" to scale config in schemas/scale-config --- scales/definitions/schemas/scale-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scales/definitions/schemas/scale-config b/scales/definitions/schemas/scale-config index 877a293..9ede41c 100644 --- a/scales/definitions/schemas/scale-config +++ b/scales/definitions/schemas/scale-config @@ -25,7 +25,7 @@ }, "volumeUnit": { "type": "string", - "enum": ["l", "gal (U.S.)", "ml"], + "enum": ["l", "gal (U.S.)", "ml", "cl", "dl"], "description": "Unit of volume for the given measurements and output on scale." }, "diameter": { From db653d7dbe1c0b986a219d0e17cb2f906912d980 Mon Sep 17 00:00:00 2001 From: papaseppo Date: Sun, 5 Jan 2025 17:18:00 +0000 Subject: [PATCH 4/5] Applid descriptions and naming conventions to fit into existing ensamble, minor tweaking of scales, adjusted template master to have 30 mm scale length --- scales/definitions/_newscale.json.template | 2 +- ...=> cylinder_mm_d070_h080_1-200ml_i20.json} | 8 ++--- ...n => cylinder_mm_d138_h110_2-15dl_i1.json} | 8 ++--- .../cylinder_mm_d281_h180_1-10L_i1.json | 8 ++--- .../cylinder_mm_d370_h330_1-30l_i1.json | 6 ++-- ... => cylinder_mm_d070_h080_1-200ml_i20.svg} | 4 +-- .../cylinder_mm_d138_h110_0L2-1L5_i0L2.svg | 24 --------------- .../svgs/cylinder_mm_d138_h110_2-15dl_i1.svg | 24 +++++++++++++++ .../svgs/cylinder_mm_d281_h180_1-10L_i1.svg | 25 +++++++++------- .../svgs/cylinder_mm_d370_h330_1-30l_i1.svg | 30 +++++++++---------- 10 files changed, 71 insertions(+), 68 deletions(-) rename scales/definitions/{cylinder_mm_d070_h080_0L01-0L2_i0L1.json => cylinder_mm_d070_h080_1-200ml_i20.json} (80%) rename scales/definitions/{cylinder_mm_d138_h110_0L2-1L5_i0L2.json => cylinder_mm_d138_h110_2-15dl_i1.json} (79%) rename scales/svgs/{cylinder_mm_d070_h080_0L01-0L2_i0L1.svg => cylinder_mm_d070_h080_1-200ml_i20.svg} (99%) delete mode 100644 scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg create mode 100644 scales/svgs/cylinder_mm_d138_h110_2-15dl_i1.svg diff --git a/scales/definitions/_newscale.json.template b/scales/definitions/_newscale.json.template index 9416492..0267360 100644 --- a/scales/definitions/_newscale.json.template +++ b/scales/definitions/_newscale.json.template @@ -22,7 +22,7 @@ }, { "interval": 5, - "length": 25, + "length": 30, "height": 1.5, "font": { "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", diff --git a/scales/definitions/cylinder_mm_d070_h080_0L01-0L2_i0L1.json b/scales/definitions/cylinder_mm_d070_h080_1-200ml_i20.json similarity index 80% rename from scales/definitions/cylinder_mm_d070_h080_0L01-0L2_i0L1.json rename to scales/definitions/cylinder_mm_d070_h080_1-200ml_i20.json index dd105f8..ce26b44 100644 --- a/scales/definitions/cylinder_mm_d070_h080_0L01-0L2_i0L1.json +++ b/scales/definitions/cylinder_mm_d070_h080_1-200ml_i20.json @@ -9,8 +9,8 @@ "minVolume": 10, "maxVolume": 200, "output": "./scales/svgs/{0}.svg", - "description": "steel mug", - "sucessfullyAppliedTo": "", + "description": "Scale for 70 mm diameter cylindric container. 1-200 ml in 20 ml intervals with text every 100 ml.", + "sucessfullyAppliedTo": "Steel Mug", "requiresTransferTape": false, "graduationMarkSettings": [ { @@ -22,12 +22,12 @@ }, { "interval": 100, - "length": 25, + "length": 30, "height": 1.3, "font": { "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", "size": 8, - "offsetX": 5, + "offsetX": 0, "offsetY": -5, "textAlignment": "Right" } diff --git a/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json b/scales/definitions/cylinder_mm_d138_h110_2-15dl_i1.json similarity index 79% rename from scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json rename to scales/definitions/cylinder_mm_d138_h110_2-15dl_i1.json index 41b9b74..c9dfd9e 100644 --- a/scales/definitions/cylinder_mm_d138_h110_0L2-1L5_i0L2.json +++ b/scales/definitions/cylinder_mm_d138_h110_2-15dl_i1.json @@ -9,8 +9,8 @@ "minVolume": 2, "maxVolume": 15, "output": "./scales/svgs/{0}.svg", - "description": "wenco Milkpot", - "sucessfullyAppliedTo": "", + "description": "Scale for 138 mm diameter cylindric container. 1-15 dl in 1 dl intervals with text every 5 dl.", + "sucessfullyAppliedTo": "Wenco Milkpot", "requiresTransferTape": false, "graduationMarkSettings": [ { @@ -22,12 +22,12 @@ }, { "interval": 5, - "length": 25, + "length": 30, "height": 1.5, "font": { "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", "size": 8, - "offsetX": 10, + "offsetX": -2, "offsetY": -5, "textAlignment": "Right" } diff --git a/scales/definitions/cylinder_mm_d281_h180_1-10L_i1.json b/scales/definitions/cylinder_mm_d281_h180_1-10L_i1.json index 0dbfee7..1748924 100644 --- a/scales/definitions/cylinder_mm_d281_h180_1-10L_i1.json +++ b/scales/definitions/cylinder_mm_d281_h180_1-10L_i1.json @@ -9,8 +9,8 @@ "minVolume": 1, "maxVolume": 10, "output": "./scales/svgs/{0}.svg", - "description": "old 10 L pot", - "sucessfullyAppliedTo": "", + "description": "Scale for 281 diameter cylindric container. 1-10 l in 1 l intervals with text every 2 l.", + "sucessfullyAppliedTo": "10 liter non-induction Ikea pot", "requiresTransferTape": false, "graduationMarkSettings": [ { @@ -21,8 +21,8 @@ "textTemplate": "" }, { - "interval": 5, - "length": 25, + "interval": 2, + "length": 27, "height": 1.5, "font": { "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", diff --git a/scales/definitions/cylinder_mm_d370_h330_1-30l_i1.json b/scales/definitions/cylinder_mm_d370_h330_1-30l_i1.json index 59e8ec6..6ed3126 100644 --- a/scales/definitions/cylinder_mm_d370_h330_1-30l_i1.json +++ b/scales/definitions/cylinder_mm_d370_h330_1-30l_i1.json @@ -9,8 +9,8 @@ "minVolume": 2, "maxVolume": 30, "output": "./scales/svgs/{0}.svg", - "description": "Sansone Edelstahlbehälter 18/10 30 Liter", - "sucessfullyAppliedTo": "", + "description": "Scale for 370 mm diameter cylindric container. 1-30 l in 1 l intervals with text every 5 l.", + "sucessfullyAppliedTo": "Sansone Edelstahlbehälter 18/10 30 Liter", "requiresTransferTape": false, "graduationMarkSettings": [ { @@ -22,7 +22,7 @@ }, { "interval": 5, - "length": 25, + "length": 30, "height": 1.5, "font": { "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", diff --git a/scales/svgs/cylinder_mm_d070_h080_0L01-0L2_i0L1.svg b/scales/svgs/cylinder_mm_d070_h080_1-200ml_i20.svg similarity index 99% rename from scales/svgs/cylinder_mm_d070_h080_0L01-0L2_i0L1.svg rename to scales/svgs/cylinder_mm_d070_h080_1-200ml_i20.svg index b9eca5c..b778558 100644 --- a/scales/svgs/cylinder_mm_d070_h080_0L01-0L2_i0L1.svg +++ b/scales/svgs/cylinder_mm_d070_h080_1-200ml_i20.svg @@ -7,13 +7,13 @@ - + - + \ No newline at end of file diff --git a/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg b/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg deleted file mode 100644 index 7f97f4e..0000000 --- a/scales/svgs/cylinder_mm_d138_h110_0L2-1L5_i0L2.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/scales/svgs/cylinder_mm_d138_h110_2-15dl_i1.svg b/scales/svgs/cylinder_mm_d138_h110_2-15dl_i1.svg new file mode 100644 index 0000000..3c912a7 --- /dev/null +++ b/scales/svgs/cylinder_mm_d138_h110_2-15dl_i1.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scales/svgs/cylinder_mm_d281_h180_1-10L_i1.svg b/scales/svgs/cylinder_mm_d281_h180_1-10L_i1.svg index efbef31..628552f 100644 --- a/scales/svgs/cylinder_mm_d281_h180_1-10L_i1.svg +++ b/scales/svgs/cylinder_mm_d281_h180_1-10L_i1.svg @@ -1,19 +1,22 @@  - + - + - + + - - - - + + + + + - + + - - - + + + \ No newline at end of file diff --git a/scales/svgs/cylinder_mm_d370_h330_1-30l_i1.svg b/scales/svgs/cylinder_mm_d370_h330_1-30l_i1.svg index cdc3c13..b13fad0 100644 --- a/scales/svgs/cylinder_mm_d370_h330_1-30l_i1.svg +++ b/scales/svgs/cylinder_mm_d370_h330_1-30l_i1.svg @@ -1,42 +1,42 @@  - + - + - - + + - - + + - - + + - - + + - - + + - - - + + + \ No newline at end of file From da6786d066a9b1c70a6f15aa43781b6a9a9c17b8 Mon Sep 17 00:00:00 2001 From: papaseppo Date: Sun, 5 Jan 2025 18:48:50 +0000 Subject: [PATCH 5/5] template major tic width back to 25 offset text -2 for steel mug d070mm --- scales/definitions/_newscale.json.template | 2 +- scales/definitions/cylinder_mm_d070_h080_1-200ml_i20.json | 2 +- scales/svgs/cylinder_mm_d070_h080_1-200ml_i20.svg | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scales/definitions/_newscale.json.template b/scales/definitions/_newscale.json.template index 0267360..9416492 100644 --- a/scales/definitions/_newscale.json.template +++ b/scales/definitions/_newscale.json.template @@ -22,7 +22,7 @@ }, { "interval": 5, - "length": 30, + "length": 25, "height": 1.5, "font": { "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", diff --git a/scales/definitions/cylinder_mm_d070_h080_1-200ml_i20.json b/scales/definitions/cylinder_mm_d070_h080_1-200ml_i20.json index ce26b44..bdd80e3 100644 --- a/scales/definitions/cylinder_mm_d070_h080_1-200ml_i20.json +++ b/scales/definitions/cylinder_mm_d070_h080_1-200ml_i20.json @@ -27,7 +27,7 @@ "font": { "family": "./fonts/BigShoulderStencilText/static/BigShouldersStencilText-ExtraBold.ttf", "size": 8, - "offsetX": 0, + "offsetX": -2, "offsetY": -5, "textAlignment": "Right" } diff --git a/scales/svgs/cylinder_mm_d070_h080_1-200ml_i20.svg b/scales/svgs/cylinder_mm_d070_h080_1-200ml_i20.svg index b778558..f7b0774 100644 --- a/scales/svgs/cylinder_mm_d070_h080_1-200ml_i20.svg +++ b/scales/svgs/cylinder_mm_d070_h080_1-200ml_i20.svg @@ -8,12 +8,12 @@ - + - + \ No newline at end of file