+32
@@ -0,0 +1,32 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<code_scheme name="Project" version="173">
|
||||||
|
<option name="RIGHT_MARGIN" value="160" />
|
||||||
|
<Objective-C>
|
||||||
|
<option name="INDENT_C_STRUCT_MEMBERS" value="2" />
|
||||||
|
<option name="INDENT_VISIBILITY_KEYWORDS" value="2" />
|
||||||
|
<option name="FUNCTION_BRACE_PLACEMENT" value="2" />
|
||||||
|
<option name="SUPERCLASS_LIST_BEFORE_COLON" value="0" />
|
||||||
|
<option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" />
|
||||||
|
<option name="SPACE_AFTER_REFERENCE_IN_DECLARATION" value="true" />
|
||||||
|
</Objective-C>
|
||||||
|
<codeStyleSettings language="CMake">
|
||||||
|
<option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
|
||||||
|
<option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
|
||||||
|
<option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
|
||||||
|
<indentOptions>
|
||||||
|
<option name="INDENT_SIZE" value="2" />
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
||||||
|
<option name="TAB_SIZE" value="8" />
|
||||||
|
</indentOptions>
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="ObjectiveC">
|
||||||
|
<option name="CLASS_BRACE_STYLE" value="2" />
|
||||||
|
<option name="ELSE_ON_NEW_LINE" value="true" />
|
||||||
|
<indentOptions>
|
||||||
|
<option name="INDENT_SIZE" value="2" />
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
||||||
|
<option name="TAB_SIZE" value="8" />
|
||||||
|
</indentOptions>
|
||||||
|
</codeStyleSettings>
|
||||||
|
</code_scheme>
|
||||||
|
</component>
|
||||||
+5
@@ -0,0 +1,5 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</state>
|
||||||
|
</component>
|
||||||
@@ -126,6 +126,57 @@ void BitmapBuffer::drawVerticalLine(coord_t x, coord_t y, coord_t h, uint8_t pat
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BitmapBuffer::drawLine(coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t pat, LcdFlags flags)
|
||||||
|
{
|
||||||
|
// Offsets
|
||||||
|
x1 += offsetX;
|
||||||
|
y1 += offsetY;
|
||||||
|
x2 += offsetX;
|
||||||
|
y2 += offsetY;
|
||||||
|
|
||||||
|
pixel_t color = lcdColorTable[COLOR_IDX(flags)];
|
||||||
|
|
||||||
|
int dx = x2 - x1; /* the horizontal distance of the line */
|
||||||
|
int dy = y2 - y1; /* the vertical distance of the line */
|
||||||
|
int dxabs = abs(dx);
|
||||||
|
int dyabs = abs(dy);
|
||||||
|
int sdx = sgn(dx);
|
||||||
|
int sdy = sgn(dy);
|
||||||
|
int x = dyabs >> 1;
|
||||||
|
int y = dxabs >> 1;
|
||||||
|
int px = x1;
|
||||||
|
int py = y1;
|
||||||
|
|
||||||
|
if (dxabs >= dyabs) {
|
||||||
|
/* the line is more horizontal than vertical */
|
||||||
|
for (int i = 0; i <= dxabs; i++) {
|
||||||
|
if ((1 << (px % 8)) & pat) {
|
||||||
|
drawPixel(px, py, color);
|
||||||
|
}
|
||||||
|
y += dyabs;
|
||||||
|
if (y >= dxabs) {
|
||||||
|
y -= dxabs;
|
||||||
|
py += sdy;
|
||||||
|
}
|
||||||
|
px += sdx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
/* the line is more vertical than horizontal */
|
||||||
|
for (int i = 0; i <= dyabs; i++) {
|
||||||
|
if ((1 << (py % 8)) & pat) {
|
||||||
|
drawPixel(px, py, color);
|
||||||
|
}
|
||||||
|
x += dxabs;
|
||||||
|
if (x >= dyabs) {
|
||||||
|
x -= dyabs;
|
||||||
|
px += sdx;
|
||||||
|
}
|
||||||
|
py += sdy;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void BitmapBuffer::drawRect(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t thickness, uint8_t pat, LcdFlags att)
|
void BitmapBuffer::drawRect(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t thickness, uint8_t pat, LcdFlags att)
|
||||||
{
|
{
|
||||||
for (int i=0; i<thickness; i++) {
|
for (int i=0; i<thickness; i++) {
|
||||||
|
|||||||
@@ -327,6 +327,8 @@ class BitmapBuffer: public BitmapBufferBase<pixel_t>
|
|||||||
|
|
||||||
void drawVerticalLine(coord_t x, coord_t y, coord_t h, uint8_t pat = SOLID, LcdFlags flags = 0);
|
void drawVerticalLine(coord_t x, coord_t y, coord_t h, uint8_t pat = SOLID, LcdFlags flags = 0);
|
||||||
|
|
||||||
|
void drawLine(coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t pat, LcdFlags att);
|
||||||
|
|
||||||
inline void drawSolidHorizontalLine(coord_t x, coord_t y, coord_t w, LcdFlags flags)
|
inline void drawSolidHorizontalLine(coord_t x, coord_t y, coord_t w, LcdFlags flags)
|
||||||
{
|
{
|
||||||
drawSolidFilledRect(x, y, w, 1, flags);
|
drawSolidFilledRect(x, y, w, 1, flags);
|
||||||
|
|||||||
@@ -53,6 +53,12 @@ inline int divRoundClosest(const int n, const int d)
|
|||||||
return ((n < 0) ^ (d < 0)) ? ((n - d/2)/d) : ((n + d/2)/d);
|
return ((n < 0) ^ (d < 0)) ? ((n - d/2)/d) : ((n + d/2)/d);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<class T>
|
||||||
|
inline T sgn(T a)
|
||||||
|
{
|
||||||
|
return a > 0 ? 1 : (a < 0 ? -1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
// TODO duplicated code
|
// TODO duplicated code
|
||||||
inline std::string TEXT_AT_INDEX(const char * val, uint8_t idx)
|
inline std::string TEXT_AT_INDEX(const char * val, uint8_t idx)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user