History

some spacing repairs after merging Philip's levels pull

Stephen Birarda committed 13 years ago

Commit f424b751 parent 133e95f1 file · +9 −12Browse files

Showing the changes to interface/src/SerialInterface.cpp (1 of 1 file). Show all

Unified · Split

interface/src/SerialInterface.cpp+9−12
@@ -152,28 +152,26 @@ void SerialInterface::renderLevels(int width, int height) { · 151 unmodified lines
152 const int GAP = 16;152 const int GAP = 16;
153 char val[40];153 char val[40];
154 if (!USING_INVENSENSE_MPU9150) {154 if (!USING_INVENSENSE_MPU9150) {
155 for(i = 0; i < NUM_CHANNELS; i++)155 for(i = 0; i < NUM_CHANNELS; i++) {
156 {
157
158 // Actual value156 // Actual value
159 glLineWidth(2.0);157 glLineWidth(2.0);
160 glColor4f(1, 1, 1, 1);158 glColor4f(1, 1, 1, 1);
161 glBegin(GL_LINES);159 glBegin(GL_LINES);
162 glVertex2f(disp_x, height*0.95);160 glVertex2f(disp_x, height * 0.95);
163 glVertex2f(disp_x, height*(0.25 + 0.75f*getValue(i)/4096));161 glVertex2f(disp_x, height * (0.25 + 0.75f * getValue(i) / 4096));
164 glColor4f(1, 0, 0, 1);162 glColor4f(1, 0, 0, 1);
165 glVertex2f(disp_x - 3, height*(0.25 + 0.75f*getValue(i)/4096));163 glVertex2f(disp_x - 3, height * (0.25 + 0.75f * getValue(i) / 4096));
166 glVertex2f(disp_x, height*(0.25 + 0.75f*getValue(i)/4096));164 glVertex2f(disp_x, height * (0.25 + 0.75f * getValue(i) / 4096));
167 glEnd();165 glEnd();
168 // Trailing Average value166 // Trailing Average value
169 glBegin(GL_LINES);167 glBegin(GL_LINES);
170 glColor4f(1, 1, 1, 1);168 glColor4f(1, 1, 1, 1);
171 glVertex2f(disp_x, height*(0.25 + 0.75f*getTrailingValue(i)/4096));169 glVertex2f(disp_x, height * (0.25 + 0.75f * getTrailingValue(i) / 4096));
172 glVertex2f(disp_x + 4, height*(0.25 + 0.75f*getTrailingValue(i)/4096));170 glVertex2f(disp_x + 4, height * (0.25 + 0.75f * getTrailingValue(i) / 4096));
173 glEnd();171 glEnd();
174 172
175 sprintf(val, "%d", getValue(i));173 sprintf(val, "%d", getValue(i));
176 drawtext(disp_x-GAP/2, (height*0.95)+2, 0.08, 90, 1.0, 0, val, 0, 1, 0);174 drawtext(disp_x - GAP / 2, (height * 0.95) + 2, 0.08, 90, 1.0, 0, val, 0, 1, 0);
177 175
178 disp_x += GAP;176 disp_x += GAP;
179 }177 }
@@ -207,9 +205,8 @@ void SerialInterface::renderLevels(int width, int height) { · 27 unmodified lines
207 glVertex2f(LEVEL_CORNER_X + LEVEL_CENTER, LEVEL_CORNER_Y - 6);205 glVertex2f(LEVEL_CORNER_X + LEVEL_CENTER, LEVEL_CORNER_Y - 6);
208 glVertex2f(LEVEL_CORNER_X + LEVEL_CENTER, LEVEL_CORNER_Y + 30);206 glVertex2f(LEVEL_CORNER_X + LEVEL_CENTER, LEVEL_CORNER_Y + 30);
209 glEnd();207 glEnd();
210
211
212 }208 }
209
213 // Display Serial latency block210 // Display Serial latency block
214 if (LED) {211 if (LED) {
215 glColor3f(1,0,0);212 glColor3f(1,0,0);