commit 827a75e8905459095729426b1762a3e8444d5b8c
parent ba62064e8e08af43f6097b871d2254ff5486a36b
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Wed, 16 Mar 2022 17:10:15 +0100
add combo box for arp mode instead of having a "knob" for it
Diffstat:
1 file changed, 159 insertions(+), 140 deletions(-)
diff --git a/source/jucePlugin/genericUI/assets/VirusC.json b/source/jucePlugin/genericUI/assets/VirusC.json
@@ -97,10 +97,10 @@
"alignH" : "L",
"alignV" : "C",
"bold" : "1",
- "x" : "824,6",
- "y" : "80,9",
- "width" : "470",
- "height" : "100"
+ "x" : "818.6",
+ "y" : "95.9",
+ "width" : "440",
+ "height" : "75"
}
},
{
@@ -112,8 +112,8 @@
"alignH" : "R",
"alignV" : "T",
"bold" : "1",
- "x" : "1190,6",
- "y" : "92,9",
+ "x" : "1190.6",
+ "y" : "92.9",
"width" : "368",
"height" : "80"
}
@@ -200,7 +200,7 @@
"normalImageOn" : "1",
"overImageOn" : "1",
"downImageOn" : "1",
- "x" : "786,9999",
+ "x" : "786.9999",
"y" : "216",
"width" : "282",
"height" : "52",
@@ -279,7 +279,7 @@
"alignV" : "C",
"x" : "68",
"y" : "322",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -342,8 +342,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "340,13",
+ "x" : "552.3",
+ "y" : "340.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -356,8 +356,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "340,13",
+ "x" : "614.38",
+ "y" : "340.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -375,7 +375,7 @@
"alignV" : "C",
"x" : "68",
"y" : "394",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -438,8 +438,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "412,13",
+ "x" : "552.3",
+ "y" : "412.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -452,8 +452,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "412,13",
+ "x" : "614.38",
+ "y" : "412.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -471,7 +471,7 @@
"alignV" : "C",
"x" : "68",
"y" : "466",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -534,8 +534,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "484,13",
+ "x" : "552.3",
+ "y" : "484.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -548,8 +548,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "484,13",
+ "x" : "614.38",
+ "y" : "484.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -567,7 +567,7 @@
"alignV" : "C",
"x" : "68",
"y" : "538",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -630,8 +630,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "556,13",
+ "x" : "552.3",
+ "y" : "556.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -644,8 +644,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "556,13",
+ "x" : "614.38",
+ "y" : "556.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -663,7 +663,7 @@
"alignV" : "C",
"x" : "68",
"y" : "610",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -726,8 +726,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "628,13",
+ "x" : "552.3",
+ "y" : "628.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -740,8 +740,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "628,13",
+ "x" : "614.38",
+ "y" : "628.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -759,7 +759,7 @@
"alignV" : "C",
"x" : "68",
"y" : "682",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -822,8 +822,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "700,13",
+ "x" : "552.3",
+ "y" : "700.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -836,8 +836,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "700,13",
+ "x" : "614.38",
+ "y" : "700.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -855,7 +855,7 @@
"alignV" : "C",
"x" : "68",
"y" : "754",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -918,8 +918,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "772,13",
+ "x" : "552.3",
+ "y" : "772.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -932,8 +932,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "772,13",
+ "x" : "614.38",
+ "y" : "772.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -951,7 +951,7 @@
"alignV" : "C",
"x" : "68",
"y" : "826",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1014,8 +1014,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "844,13",
+ "x" : "552.3",
+ "y" : "844.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1028,8 +1028,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "844,13",
+ "x" : "614.38",
+ "y" : "844.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1047,7 +1047,7 @@
"alignV" : "C",
"x" : "68",
"y" : "898",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1110,8 +1110,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "916,13",
+ "x" : "552.3",
+ "y" : "916.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1124,8 +1124,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "916,13",
+ "x" : "614.38",
+ "y" : "916.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1143,7 +1143,7 @@
"alignV" : "C",
"x" : "68",
"y" : "970",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1206,8 +1206,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "988,13",
+ "x" : "552.3",
+ "y" : "988.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1220,8 +1220,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "988,13",
+ "x" : "614.38",
+ "y" : "988.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1239,7 +1239,7 @@
"alignV" : "C",
"x" : "68",
"y" : "1042",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1302,8 +1302,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "1060,13",
+ "x" : "552.3",
+ "y" : "1060.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1316,8 +1316,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "1060,13",
+ "x" : "614.38",
+ "y" : "1060.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1335,7 +1335,7 @@
"alignV" : "C",
"x" : "68",
"y" : "1114",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1398,8 +1398,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "1132,13",
+ "x" : "552.3",
+ "y" : "1132.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1412,8 +1412,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "1132,13",
+ "x" : "614.38",
+ "y" : "1132.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1431,7 +1431,7 @@
"alignV" : "C",
"x" : "68",
"y" : "1186",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1494,8 +1494,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "1204,13",
+ "x" : "552.3",
+ "y" : "1204.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1508,8 +1508,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "1204,13",
+ "x" : "614.38",
+ "y" : "1204.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1527,7 +1527,7 @@
"alignV" : "C",
"x" : "68",
"y" : "1258",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1590,8 +1590,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "1276,13",
+ "x" : "552.3",
+ "y" : "1276.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1604,8 +1604,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "1276,13",
+ "x" : "614.38",
+ "y" : "1276.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1623,7 +1623,7 @@
"alignV" : "C",
"x" : "68",
"y" : "1330",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1686,8 +1686,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "1348,13",
+ "x" : "552.3",
+ "y" : "1348.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1700,8 +1700,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "1348,13",
+ "x" : "614.38",
+ "y" : "1348.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1719,7 +1719,7 @@
"alignV" : "C",
"x" : "68",
"y" : "1402",
- "width" : "50,3025",
+ "width" : "50.3025",
"height" : "72"
}
},
@@ -1782,8 +1782,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "552,3",
- "y" : "1420,13",
+ "x" : "552.3",
+ "y" : "1420.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1796,8 +1796,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "614,38",
- "y" : "1420,13",
+ "x" : "614.38",
+ "y" : "1420.13",
"width" : "36",
"height" : "36",
"texture" : "Mult_36x36_x2i",
@@ -1857,7 +1857,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "497,2",
+ "x" : "497.2",
"y" : "89",
"width" : "140",
"height" : "140",
@@ -1925,7 +1925,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "496,2",
+ "x" : "496.2",
"y" : "327",
"width" : "140",
"height" : "140",
@@ -1993,7 +1993,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "496,2",
+ "x" : "496.2",
"y" : "517",
"width" : "140",
"height" : "140",
@@ -2079,7 +2079,7 @@
},
"spritesheet" : {
"x" : "245",
- "y" : "998,7",
+ "y" : "998.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2096,7 +2096,7 @@
},
"spritesheet" : {
"x" : "369",
- "y" : "998,7",
+ "y" : "998.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2112,8 +2112,8 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "496,2",
- "y" : "997,7",
+ "x" : "496.2",
+ "y" : "997.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2130,7 +2130,7 @@
},
"spritesheet" : {
"x" : "628",
- "y" : "997,7",
+ "y" : "997.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2247,7 +2247,7 @@
},
"spritesheet" : {
"x" : "836",
- "y" : "90,5",
+ "y" : "90.5",
"width" : "140",
"height" : "140",
"texture" : "GenPol_140x140_x2",
@@ -2264,7 +2264,7 @@
},
"spritesheet" : {
"x" : "975",
- "y" : "90,5",
+ "y" : "90.5",
"width" : "140",
"height" : "140",
"texture" : "GenRed_140x140_x2",
@@ -2281,7 +2281,7 @@
},
"spritesheet" : {
"x" : "835",
- "y" : "329,5",
+ "y" : "329.5",
"width" : "140",
"height" : "140",
"texture" : "GenRed_140x140_x2",
@@ -2298,7 +2298,7 @@
},
"spritesheet" : {
"x" : "975",
- "y" : "329,5",
+ "y" : "329.5",
"width" : "140",
"height" : "140",
"texture" : "GenRed_140x140_x2",
@@ -2524,7 +2524,7 @@
},
"spritesheet" : {
"x" : "1197",
- "y" : "519,7",
+ "y" : "519.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2541,7 +2541,7 @@
},
"spritesheet" : {
"x" : "1318",
- "y" : "519,7",
+ "y" : "519.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2558,7 +2558,7 @@
},
"spritesheet" : {
"x" : "1448",
- "y" : "519,7",
+ "y" : "519.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2575,7 +2575,7 @@
},
"spritesheet" : {
"x" : "1577",
- "y" : "519,7",
+ "y" : "519.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2592,7 +2592,7 @@
},
"spritesheet" : {
"x" : "1707",
- "y" : "518,7",
+ "y" : "518.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2609,7 +2609,7 @@
},
"spritesheet" : {
"x" : "1837",
- "y" : "518,7",
+ "y" : "518.7",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -2625,7 +2625,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1210",
- "y" : "409,8",
+ "y" : "409.8",
"width" : "162",
"height" : "36"
},
@@ -2645,7 +2645,7 @@
"normalImageOn" : "1",
"downImageOn" : "0",
"x" : "1872",
- "y" : "414,7",
+ "y" : "414.7",
"width" : "50",
"height" : "68",
"texture" : "env_pol_100x68_x2",
@@ -2709,7 +2709,7 @@
"textHeight" : "30",
"alignH" : "L",
"alignV" : "C",
- "x" : "1782,4",
+ "x" : "1782.4",
"y" : "309",
"width" : "162",
"height" : "36"
@@ -3001,7 +3001,7 @@
"normalImageOn" : "1",
"downImageOn" : "0",
"x" : "178",
- "y" : "299,4",
+ "y" : "299.4",
"width" : "46",
"height" : "38",
"texture" : "lfo_btn_46x76_x2",
@@ -3276,7 +3276,7 @@
"normalImageOn" : "1",
"downImageOn" : "0",
"x" : "178",
- "y" : "679,4",
+ "y" : "679.4",
"width" : "46",
"height" : "38",
"texture" : "lfo_btn_46x76_x2",
@@ -3730,7 +3730,7 @@
},
"spritesheet" : {
"x" : "1135",
- "y" : "971,8",
+ "y" : "971.8",
"width" : "140",
"height" : "140",
"texture" : "GenPol_140x140_x2",
@@ -3746,7 +3746,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1289",
- "y" : "1047,8",
+ "y" : "1047.8",
"width" : "190",
"height" : "36"
},
@@ -3812,7 +3812,7 @@
},
"spritesheet" : {
"x" : "1137",
- "y" : "377,8",
+ "y" : "377.8",
"width" : "140",
"height" : "140",
"texture" : "GenPol_140x140_x2",
@@ -3828,7 +3828,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1291",
- "y" : "453,8",
+ "y" : "453.8",
"width" : "190",
"height" : "36"
},
@@ -3927,7 +3927,7 @@
},
"spritesheet" : {
"x" : "1608",
- "y" : "721,7",
+ "y" : "721.7",
"width" : "140",
"height" : "140",
"texture" : "GenPol_140x140_x2",
@@ -3943,7 +3943,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1758",
- "y" : "681,7",
+ "y" : "681.7",
"width" : "190",
"height" : "36"
},
@@ -3959,7 +3959,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1758",
- "y" : "797,7",
+ "y" : "797.7",
"width" : "190",
"height" : "36"
},
@@ -4603,7 +4603,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "741,7",
+ "x" : "741.7",
"y" : "35",
"width" : "140",
"height" : "140",
@@ -4699,7 +4699,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "741,7",
+ "x" : "741.7",
"y" : "35",
"width" : "140",
"height" : "140",
@@ -5216,14 +5216,33 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "1002,9",
- "y" : "136,7",
+ "x" : "1002.9",
+ "y" : "136.7",
"width" : "104",
"height" : "72",
"texture" : "arpall_104x432_X2",
"tileSizeX" : "104",
"tileSizeY" : "72"
- }
+ },
+ "children" : [
+ {
+ "name" : "ArpModeComboBox",
+ "combobox" : {
+ "text" : "Hold",
+ "textHeight" : "30",
+ "color" : "FFFFFF00",
+ "alignH" : "L",
+ "alignV" : "C",
+ "x" : "0",
+ "y" : "0",
+ "width" : "104",
+ "height" : "72"
+ },
+ "parameterAttachment" : {
+ "parameter" : "Arp Mode"
+ }
+ }
+ ]
},
{
"name" : "ArpPattern",
@@ -5338,7 +5357,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "1857,5",
+ "x" : "1857.5",
"y" : "90",
"width" : "140",
"height" : "140",
@@ -5370,7 +5389,7 @@
"textHeight" : "30",
"alignH" : "L",
"alignV" : "C",
- "x" : "1180,55",
+ "x" : "1180.55",
"y" : "381",
"width" : "162",
"height" : "36"
@@ -5402,7 +5421,7 @@
"textHeight" : "30",
"alignH" : "L",
"alignV" : "C",
- "x" : "1820,55",
+ "x" : "1820.55",
"y" : "381",
"width" : "162",
"height" : "36"
@@ -5419,7 +5438,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "969",
- "y" : "617,4",
+ "y" : "617.4",
"width" : "162",
"height" : "36"
},
@@ -5436,7 +5455,7 @@
},
"spritesheet" : {
"x" : "1128",
- "y" : "569,4",
+ "y" : "569.4",
"width" : "140",
"height" : "140",
"texture" : "Gen_140x140_x2",
@@ -5453,7 +5472,7 @@
},
"spritesheet" : {
"x" : "1252",
- "y" : "569,4",
+ "y" : "569.4",
"width" : "140",
"height" : "140",
"texture" : "GenPol_140x140_x2",
@@ -5469,7 +5488,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "969",
- "y" : "776,5",
+ "y" : "776.5",
"width" : "162",
"height" : "36"
},
@@ -5486,7 +5505,7 @@
},
"spritesheet" : {
"x" : "1129",
- "y" : "728,5",
+ "y" : "728.5",
"width" : "140",
"height" : "140",
"texture" : "GenPol_140x140_x2",
@@ -5503,7 +5522,7 @@
},
"spritesheet" : {
"x" : "1252",
- "y" : "728,5",
+ "y" : "728.5",
"width" : "140",
"height" : "140",
"texture" : "GenPol_140x140_x2",
@@ -5519,7 +5538,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1608",
- "y" : "617,4",
+ "y" : "617.4",
"width" : "160",
"height" : "36"
},
@@ -5535,7 +5554,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1822",
- "y" : "617,4",
+ "y" : "617.4",
"width" : "160",
"height" : "36"
},
@@ -5551,7 +5570,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1608",
- "y" : "716,4",
+ "y" : "716.4",
"width" : "160",
"height" : "36"
},
@@ -5567,7 +5586,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1822",
- "y" : "716,4",
+ "y" : "716.4",
"width" : "160",
"height" : "36"
},
@@ -5583,7 +5602,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1608",
- "y" : "815,4",
+ "y" : "815.4",
"width" : "160",
"height" : "36"
},
@@ -5599,7 +5618,7 @@
"alignH" : "L",
"alignV" : "C",
"x" : "1822",
- "y" : "815,4",
+ "y" : "815.4",
"width" : "160",
"height" : "36"
},
@@ -5616,7 +5635,7 @@
"alignV" : "C",
"x" : "992",
"y" : "1116",
- "width" : "124,2466",
+ "width" : "124.2466",
"height" : "36"
}
},
@@ -5629,7 +5648,7 @@
"alignV" : "C",
"x" : "1116",
"y" : "1116",
- "width" : "124,2466",
+ "width" : "124.2466",
"height" : "36"
}
}
@@ -5665,7 +5684,7 @@
"color" : "FF7180FF",
"x" : "74",
"y" : "1543",
- "width" : "627,718",
+ "width" : "604.98",
"height" : "45"
}
},