diff --git a/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-limb-shindansho-1.png b/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-limb-shindansho-1.png new file mode 100644 index 00000000..c4adf6ca Binary files /dev/null and b/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-limb-shindansho-1.png differ diff --git a/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-limb-shindansho-2.png b/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-limb-shindansho-2.png new file mode 100644 index 00000000..4c283366 Binary files /dev/null and b/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-limb-shindansho-2.png differ diff --git a/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-respiratory-shindansho-1.png b/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-respiratory-shindansho-1.png new file mode 100644 index 00000000..085d971a Binary files /dev/null and b/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-respiratory-shindansho-1.png differ diff --git a/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-respiratory-shindansho-2.png b/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-respiratory-shindansho-2.png new file mode 100644 index 00000000..461dee82 Binary files /dev/null and b/packages/generator/__tests__/__image_snapshots__/nenkin-shougai-respiratory-shindansho-2.png differ diff --git a/packages/generator/__tests__/integration-playground.test.ts b/packages/generator/__tests__/integration-playground.test.ts index ceac1e30..ddf20cd3 100644 --- a/packages/generator/__tests__/integration-playground.test.ts +++ b/packages/generator/__tests__/integration-playground.test.ts @@ -35,7 +35,9 @@ const GENERATOR_BENCHMARK_RUN_COUNT = 6; const GENERATOR_BENCHMARK_WARMUP_RUN_COUNT = 1; const ADDRESS_LABEL_BENCHMARK_INPUT_COUNT = 20; const PLAYGROUND_TEMPLATE_PERFORMANCE_THRESHOLDS: Record = { + 'nenkin-shougai-limb-shindansho': 5, 'nenkin-shougai-seishin-shindansho': 5, + 'nenkin-shougai-respiratory-shindansho': 5, }; const generatorPlugins = { text, diff --git a/playground/public/template-assets/nenkin-shougai-limb-shindansho/template.json b/playground/public/template-assets/nenkin-shougai-limb-shindansho/template.json index 29ca84f4..ed153516 100644 --- a/playground/public/template-assets/nenkin-shougai-limb-shindansho/template.json +++ b/playground/public/template-assets/nenkin-shougai-limb-shindansho/template.json @@ -1284,24 +1284,10 @@ "name": "p1_paralysis_spastic", "type": "circleMark", "position": { - "x": 91.02, + "x": 102.6, "y": 292.1 }, - "width": 14.82, - "height": 4.94, - "color": "#000000", - "borderWidth": 0.4, - "opacity": 0.6, - "content": "false" - }, - { - "name": "p1_paralysis_ataxic", - "type": "circleMark", - "position": { - "x": 105.83, - "y": 292.1 - }, - "width": 17.64, + "width": 15.2, "height": 4.94, "color": "#000000", "borderWidth": 0.4, @@ -1323,7 +1309,7 @@ "content": "false" }, { - "name": "p1_paralysis_apical", + "name": "p1_paralysis_ataxic", "type": "circleMark", "position": { "x": 162.45, @@ -1337,13 +1323,13 @@ "content": "false" }, { - "name": "p1_paralysis_strength", + "name": "p1_paralysis_rigidity", "type": "circleMark", "position": { - "x": 186.7, + "x": 184.9, "y": 291.75 }, - "width": 13.23, + "width": 15.5, "height": 5.03, "color": "#000000", "borderWidth": 0.4, @@ -1351,13 +1337,13 @@ "content": "false" }, { - "name": "p1_paralysis_flaccid_spastic", + "name": "p1_paralysis_tremor", "type": "circleMark", "position": { - "x": 230.92, - "y": 292.02 + "x": 211.5, + "y": 291.75 }, - "width": 23.55, + "width": 21.3, "height": 5.03, "color": "#000000", "borderWidth": 0.4, @@ -1437,20 +1423,6 @@ { "name": "p1_paralysis_sensory_loss", "type": "circleMark", - "position": { - "x": 76.91, - "y": 301.88 - }, - "width": 23.64, - "height": 4.8, - "color": "#000000", - "borderWidth": 0.4, - "opacity": 0.6, - "content": "false" - }, - { - "name": "p1_paralysis_sensory_blunt", - "type": "circleMark", "position": { "x": 100.54, "y": 301.88 @@ -1463,7 +1435,7 @@ "content": "false" }, { - "name": "p1_paralysis_sensory_hyper", + "name": "p1_paralysis_sensory_blunt", "type": "circleMark", "position": { "x": 113.94, @@ -1477,7 +1449,7 @@ "content": "false" }, { - "name": "p1_paralysis_sensory_abnormal", + "name": "p1_paralysis_sensory_hyper", "type": "circleMark", "position": { "x": 131.85, @@ -1491,18 +1463,34 @@ "content": "false" }, { - "name": "p1_paralysis_sensory_motor_present", + "name": "p1_paralysis_sensory_abnormal", "type": "circleMark", + "position": { + "x": 149.45, + "y": 302.14 + }, + "width": 12.3, + "height": 4.76, + "color": "#000000", + "borderWidth": 0.4, + "opacity": 0.6, + "content": "false" + }, + { + "name": "p1_paralysis_motor_detail", + "type": "text", "position": { "x": 200.38, "y": 301.61 }, "width": 31.75, "height": 4.8, - "color": "#000000", - "borderWidth": 0.4, - "opacity": 0.6, - "content": "false" + "fontName": "NotoSansJP", + "fontSize": 6.8, + "alignment": "left", + "verticalAlignment": "middle", + "readOnly": false, + "content": "あり" }, { "name": "p1_reflex_lower_right_upper",