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
152152 const int GAP = 16;
153153 char val[40];
154154 if (!USING_INVENSENSE_MPU9150) {
155− for(i = 0; i < NUM_CHANNELS; i++)
156− {
157−
155+ for(i = 0; i < NUM_CHANNELS; i++) {
158156 // Actual value
159157 glLineWidth(2.0);
160158 glColor4f(1, 1, 1, 1);
161159 glBegin(GL_LINES);
162− glVertex2f(disp_x, height*0.95);
163− glVertex2f(disp_x, height*(0.25 + 0.75f*getValue(i)/4096));
160+ glVertex2f(disp_x, height * 0.95);
161+ glVertex2f(disp_x, height * (0.25 + 0.75f * getValue(i) / 4096));
164162 glColor4f(1, 0, 0, 1);
165− glVertex2f(disp_x - 3, height*(0.25 + 0.75f*getValue(i)/4096));
166− glVertex2f(disp_x, height*(0.25 + 0.75f*getValue(i)/4096));
163+ glVertex2f(disp_x - 3, height * (0.25 + 0.75f * getValue(i) / 4096));
164+ glVertex2f(disp_x, height * (0.25 + 0.75f * getValue(i) / 4096));
167165 glEnd();
168166 // Trailing Average value
169167 glBegin(GL_LINES);
170168 glColor4f(1, 1, 1, 1);
171− glVertex2f(disp_x, height*(0.25 + 0.75f*getTrailingValue(i)/4096));
172− glVertex2f(disp_x + 4, height*(0.25 + 0.75f*getTrailingValue(i)/4096));
169+ glVertex2f(disp_x, height * (0.25 + 0.75f * getTrailingValue(i) / 4096));
170+ glVertex2f(disp_x + 4, height * (0.25 + 0.75f * getTrailingValue(i) / 4096));
173171 glEnd();
174172
175173 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);
177175
178176 disp_x += GAP;
179177 }
@@ -207,9 +205,8 @@ void SerialInterface::renderLevels(int width, int height) { · 27 unmodified lines
207205 glVertex2f(LEVEL_CORNER_X + LEVEL_CENTER, LEVEL_CORNER_Y - 6);
208206 glVertex2f(LEVEL_CORNER_X + LEVEL_CENTER, LEVEL_CORNER_Y + 30);
209207 glEnd();
210−
211−
212208 }
209+
213210 // Display Serial latency block
214211 if (LED) {
215212 glColor3f(1,0,0);