commit 0d2b4f88fa0f08ab223ddf5f495f46e8312f7acc
parent 0db4aaa9fb643fbad8324917bf192fd5935d5b2b
Author: Adam M <[email protected]>
Date: Thu, 1 Nov 2018 20:01:17 -0500
update panel and change size and number of digits of ComputerscareDebug
Diffstat:
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/res/ComputerscareDebugPanel.svg b/res/ComputerscareDebugPanel.svg
@@ -34,11 +34,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="4.0000002"
- inkscape:cx="29.704569"
- inkscape:cy="358.68215"
+ inkscape:zoom="8.0000004"
+ inkscape:cx="19.048088"
+ inkscape:cy="365.19808"
inkscape:document-units="mm"
- inkscape:current-layer="text1667"
+ inkscape:current-layer="g1669"
showgrid="false"
units="px"
inkscape:snap-bbox="true"
@@ -58,7 +58,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -282,31 +282,31 @@
</g>
<g
aria-label="debug"
- transform="matrix(1.0139335,-0.02825079,0.06854811,0.98434808,0,0)"
+ transform="matrix(0.83059873,-0.02949704,0.05615355,1.0277716,0.10702806,-8.3357075)"
style="font-style:normal;font-weight:normal;font-size:10.74719143px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26867977"
id="text1667">
<path
- d="m -8.0187684,202.28597 v -1.48404 H -7.56817 v 3.8105 h -0.4505984 v -0.41142 q -0.1420364,0.24489 -0.3599889,0.36489 -0.2155036,0.11754 -0.5191677,0.11754 -0.4971276,0 -0.8105874,-0.39672 -0.3110106,-0.39672 -0.3110106,-1.04323 0,-0.64651 0.3110106,-1.04323 0.3134598,-0.39673 0.8105874,-0.39673 0.3036641,0 0.5191677,0.12 0.2179525,0.11755 0.3599889,0.36244 z m -1.535463,0.95752 q 0,0.49713 0.2032591,0.7812 0.2057079,0.28162 0.563248,0.28162 0.35754,0 0.563248,-0.28162 0.2057079,-0.28407 0.2057079,-0.7812 0,-0.49713 -0.2057079,-0.77875 -0.205708,-0.28408 -0.563248,-0.28408 -0.3575401,0 -0.563248,0.28408 -0.2032591,0.28162 -0.2032591,0.77875 z"
+ d="m -11.071527,201.12319 v -1.48404 h 0.450598 v 3.8105 h -0.450598 v -0.41142 q -0.142037,0.24489 -0.359989,0.36489 -0.215503,0.11754 -0.519168,0.11754 -0.497127,0 -0.810587,-0.39672 -0.31101,-0.39672 -0.31101,-1.04323 0,-0.64651 0.31101,-1.04323 0.31346,-0.39673 0.810587,-0.39673 0.303665,0 0.519168,0.12 0.217952,0.11755 0.359989,0.36244 z m -1.535463,0.95752 q 0,0.49713 0.203259,0.7812 0.205708,0.28162 0.563248,0.28162 0.35754,0 0.563248,-0.28162 0.205708,-0.28407 0.205708,-0.7812 0,-0.49713 -0.205708,-0.77875 -0.205708,-0.28408 -0.563248,-0.28408 -0.35754,0 -0.563248,0.28408 -0.203259,0.28162 -0.203259,0.77875 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.01535606px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26867977"
id="path1671"
inkscape:connector-curvature="0" />
<path
- d="m -4.2939849,203.12839 v 0.2204 h -2.071773 q 0.029387,0.46529 0.2791751,0.71018 0.2522371,0.24245 0.7003866,0.24245 0.2595839,0 0.5020254,-0.0637 0.2448904,-0.0637 0.484883,-0.19101 v 0.42611 q -0.2424415,0.10285 -0.4971275,0.15673 -0.2546861,0.0539 -0.5167189,0.0539 -0.6563063,0 -1.0407843,-0.38202 -0.3820291,-0.38203 -0.3820291,-1.03344 0,-0.67345 0.3624379,-1.06772 0.3648867,-0.39673 0.9820106,-0.39673 0.5534524,0 0.8742589,0.35754 0.3232553,0.35509 0.3232553,0.96732 z m -0.4505984,-0.13224 q -0.0049,-0.36978 -0.2081568,-0.59019 -0.2008102,-0.2204 -0.5338612,-0.2204 -0.3771313,0 -0.6048794,0.21306 -0.2252992,0.21305 -0.2595838,0.59998 z"
+ d="m -7.3467433,201.96561 v 0.2204 H -9.418516 q 0.029387,0.46529 0.2791748,0.71018 0.2522371,0.24245 0.7003866,0.24245 0.2595839,0 0.5020254,-0.0637 0.2448904,-0.0637 0.484883,-0.19101 v 0.42611 q -0.2424415,0.10285 -0.4971275,0.15673 -0.2546861,0.0539 -0.5167189,0.0539 -0.6563063,0 -1.0407852,-0.38202 -0.382029,-0.38203 -0.382029,-1.03344 0,-0.67345 0.362438,-1.06772 0.3648874,-0.39673 0.9820113,-0.39673 0.5534524,0 0.8742589,0.35754 0.3232553,0.35509 0.3232553,0.96732 z m -0.4505984,-0.13224 q -0.0049,-0.36978 -0.2081568,-0.59019 -0.2008102,-0.2204 -0.5338612,-0.2204 -0.3771313,0 -0.6048794,0.21306 -0.2252992,0.21305 -0.2595838,0.59998 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.01535606px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26867977"
id="path1673"
inkscape:connector-curvature="0" />
<path
- d="m -1.5013251,203.28116 q 0.019267,-0.49759 -0.1856192,-0.78849 -0.2022218,-0.29328 -0.5773042,-0.30899 -0.3750826,-0.0157 -0.6018934,0.2596 -0.2241464,0.27294 -0.2434136,0.77052 -0.019268,0.49758 0.1829552,0.79084 0.2048862,0.29092 0.5799687,0.30663 0.3750826,0.0157 0.5992288,-0.25724 0.2268106,-0.27529 0.2460777,-0.77287 z m -1.57112,-1.02575 q 0.1584963,-0.23887 0.3891293,-0.34706 0.2332971,-0.11053 0.549291,-0.0973 0.5240878,0.0219 0.8349824,0.43271 0.31346385,0.41085 0.2884073,1.05795 -0.025057,0.64709 -0.3692715,1.0304 -0.3416461,0.38342 -0.8657339,0.36147 -0.3159942,-0.0132 -0.5400848,-0.14046 -0.2214264,-0.12957 -0.3609406,-0.38093 l -0.015945,0.4118 -0.4752756,-0.0199 0.1476823,-3.81397 0.4752756,0.0199 z"
+ d="m -4.5540835,202.11838 q 0.019267,-0.49759 -0.1856192,-0.78849 -0.2022218,-0.29328 -0.5773042,-0.30899 -0.3750826,-0.0157 -0.6018934,0.2596 -0.2241464,0.27294 -0.2434136,0.77052 -0.019268,0.49758 0.1829552,0.79084 0.2048862,0.29092 0.5799687,0.30663 0.3750826,0.0157 0.5992288,-0.25724 0.2268106,-0.27529 0.2460777,-0.77287 z m -1.57112,-1.02575 q 0.1584963,-0.23887 0.3891293,-0.34706 0.2332971,-0.11053 0.549291,-0.0973 0.5240878,0.0219 0.8349824,0.43271 0.3134639,0.41085 0.2884073,1.05795 -0.025057,0.64709 -0.3692715,1.0304 -0.3416461,0.38342 -0.8657339,0.36147 -0.3159942,-0.0132 -0.5400848,-0.14046 -0.2214264,-0.12957 -0.3609406,-0.38093 l -0.015945,0.4118 -0.4752756,-0.0199 0.1476823,-3.81397 0.4752756,0.0199 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.01535606px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.27554041"
id="path1675"
inkscape:connector-curvature="0" />
<path
- d="m -0.4173698,203.53001 v -1.66036 h 0.45059839 v 1.64322 q 0,0.38937 0.15183207,0.58529 0.15183207,0.19346 0.45549621,0.19346 0.36488673,0 0.57549253,-0.23265 0.2130547,-0.23264 0.2130547,-0.63426 v -1.55506 h 0.4505984 v 2.74278 H 1.4291041 v -0.42121 q -0.1640766,0.24978 -0.3820291,0.37223 -0.2155036,0.11999 -0.5020254,0.11999 -0.47263854,0 -0.71752897,-0.29386 -0.24489043,-0.29387 -0.24489043,-0.85957 z"
+ d="m -3.4701282,202.36723 v -1.66036 h 0.4505984 v 1.64322 q 0,0.38937 0.1518321,0.58529 0.1518321,0.19346 0.4554963,0.19346 0.3648867,0 0.5754925,-0.23265 0.2130547,-0.23264 0.2130547,-0.63426 v -1.55506 h 0.4505984 v 2.74278 h -0.4505984 v -0.42121 q -0.1640766,0.24978 -0.3820291,0.37223 -0.2155036,0.11999 -0.5020254,0.11999 -0.4726386,0 -0.717529,-0.29386 -0.2448905,-0.29387 -0.2448905,-0.85957 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.01535606px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26867977"
id="path1677"
inkscape:connector-curvature="0" />
<path
- d="m 5.0589196,203.27151 q 0.047331,-0.43814 -0.1766022,-0.71731 -0.2209217,-0.27871 -0.6696527,-0.3473 -0.4456794,-0.0684 -0.7217128,0.13462 -0.2729845,0.20322 -0.3203148,0.64135 -0.047093,0.43594 0.1738294,0.71464 0.2239325,0.27918 0.6696498,0.34733 0.4486948,0.0688 0.7217141,-0.13463 0.2759955,-0.20276 0.3230892,-0.6387 z m 0.4514319,1.03543 q -0.067682,0.62652 -0.4830488,0.87254 -0.4156064,0.24822 -1.20465,0.12762 -0.2921873,-0.0442 -0.5475811,-0.11706 -0.2556757,-0.0703 -0.4925219,-0.1733 l 0.04236,-0.39212 q 0.2335303,0.13366 0.4664762,0.21604 0.2329446,0.0824 0.479905,0.12008 0.5451752,0.0828 0.8386306,-0.0834 0.2932897,-0.16448 0.3384895,-0.58289 l 0.021539,-0.19937 q -0.1950898,0.19063 -0.4747191,0.25699 -0.2796264,0.0663 -0.6530776,0.009 -0.6204135,-0.0947 -0.9627019,-0.49677 -0.342309,-0.40193 -0.2810175,-0.9693 0.061528,-0.56955 0.4781454,-0.85548 0.4166184,-0.28594 1.0370098,-0.1911 0.3734564,0.057 0.629875,0.20542 0.2564397,0.1483 0.4046721,0.39142 l 0.040229,-0.3724 0.554221,0.0841 z"
+ d="m 2.0061612,202.10873 q 0.047331,-0.43814 -0.1766022,-0.71731 -0.2209217,-0.27871 -0.6696528,-0.3473 -0.44567934,-0.0684 -0.72171272,0.13462 -0.2729845,0.20322 -0.3203148,0.64135 -0.047093,0.43594 0.1738294,0.71464 0.2239325,0.27918 0.66964978,0.34733 0.44869474,0.0688 0.72171414,-0.13463 0.2759955,-0.20276 0.3230892,-0.6387 z m 0.4514319,1.03543 q -0.067682,0.62652 -0.4830488,0.87254 -0.4156064,0.24822 -1.20465004,0.12762 -0.29218728,-0.0442 -0.54758108,-0.11706 -0.25567568,-0.0703 -0.49252188,-0.1733 l 0.04236,-0.39212 q 0.2335303,0.13366 0.46647618,0.21604 0.2329446,0.0824 0.47990498,0.12008 0.54517514,0.0828 0.83863064,-0.0834 0.2932897,-0.16448 0.3384895,-0.58289 l 0.021539,-0.19937 q -0.1950898,0.19063 -0.4747192,0.25699 -0.2796264,0.0663 -0.65307754,0.009 -0.62041348,-0.0947 -0.96270186,-0.49677 -0.34230892,-0.40193 -0.28101745,-0.9693 0.061528,-0.56955 0.47814535,-0.85548 0.41661838,-0.28594 1.0370098,-0.1911 0.3734563,0.057 0.629875,0.20542 0.2564397,0.1483 0.4046721,0.39142 l 0.040229,-0.3724 0.554221,0.0841 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.01535606px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.28412068"
id="path1679"
inkscape:connector-curvature="0" />
diff --git a/src/ComputerscareDebug.cpp b/src/ComputerscareDebug.cpp
@@ -61,10 +61,10 @@ void ComputerscareDebug::step() {
}
logLines[0] = inputs[VAL_INPUT].value;
- thisVal = std::to_string(logLines[0]).substr(0,10);
+ thisVal = std::to_string(logLines[0]).substr(0,6);
for( unsigned int a = 1; a < NUM_LINES; a = a + 1 )
{
- thisVal = thisVal + "\n" + std::to_string(logLines[a]).substr(0,10);
+ thisVal = thisVal + "\n" + std::to_string(logLines[a]).substr(0,6);
}
strValue = thisVal;
@@ -140,11 +140,11 @@ struct ComputerscareDebugWidget : ModuleWidget {
StringDisplayWidget3 *display = new StringDisplayWidget3();
display->box.pos = Vec(1,24);
- display->box.size = Vec(88, 250);
+ display->box.size = Vec(48, 250);
display->value = &module->strValue;
addChild(display);
for(int i = 0; i < 16; i++ ) {
- Vec fun = Vec(54 + 10*(i%2),20+20*i);
+ Vec fun = Vec(51 + 10*(i%2),20*i);
if(i % 2) {
addOutput(Port::create<PointingUpPentagonPort>(fun, Port::OUTPUT, module, ComputerscareDebug::SAMPLE_OUTPUTS + i));
