diff options
| author | David Shah <davey1576@gmail.com> | 2018-07-24 12:58:07 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-07-24 12:58:07 +0200 |
| commit | 73877219403a2646f5504867d5b1ccc4cefda4c8 (patch) | |
| tree | 9748bd4f8b680e5533b10ea7783acfa6470298b1 | |
| parent | 35a6bc496eb28f26c42e25a5e746987329e96f3e (diff) | |
| parent | c06bca07134b8b52733b025d19fd26910cd9a4e3 (diff) | |
| download | nextpnr-73877219403a2646f5504867d5b1ccc4cefda4c8.tar.gz nextpnr-73877219403a2646f5504867d5b1ccc4cefda4c8.tar.bz2 nextpnr-73877219403a2646f5504867d5b1ccc4cefda4c8.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr
| -rw-r--r-- | bba/main.cc | 15 | ||||
| -rw-r--r-- | common/nextpnr.h | 1 | ||||
| -rw-r--r-- | gui/fpgaviewwidget.cc | 6 | ||||
| -rw-r--r-- | ice40/gfx.cc | 2 |
4 files changed, 20 insertions, 4 deletions
diff --git a/bba/main.cc b/bba/main.cc new file mode 100644 index 00000000..42b79504 --- /dev/null +++ b/bba/main.cc @@ -0,0 +1,15 @@ +#include <unistd.h> +#include <assert.h> +int main() +{ + char buffer[512]; + int i, j; + while (1) { + i = read(0, buffer, 512); + if (i == 0) break; + assert(i > 0); + j = write(1, buffer, i); + assert(i == j); + } + return 0; +} diff --git a/common/nextpnr.h b/common/nextpnr.h index 021772fe..3ba4f3b3 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -147,6 +147,7 @@ struct GraphicElement { G_NONE, G_LINE, + G_ARROW, G_BOX, G_CIRCLE, G_LABEL diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc index e21af678..7ccb3445 100644 --- a/gui/fpgaviewwidget.cc +++ b/gui/fpgaviewwidget.cc @@ -246,7 +246,7 @@ FPGAViewWidget::FPGAViewWidget(QWidget *parent) { colors_.background = QColor("#000000"); colors_.grid = QColor("#333"); - colors_.frame = QColor("#d0d0d0"); + colors_.frame = QColor("#808080"); colors_.hidden = QColor("#606060"); colors_.inactive = QColor("#303030"); colors_.active = QColor("#f0f0f0"); @@ -327,7 +327,7 @@ void FPGAViewWidget::drawDecal(LineShaderData &out, const DecalXY &decal) line.build(out); } - if (el.type == GraphicElement::G_LINE) { + if (el.type == GraphicElement::G_LINE || el.type == GraphicElement::G_ARROW) { PolyLine(offsetX + scale * el.x1, offsetY + scale * el.y1, offsetX + scale * el.x2, offsetY + scale * el.y2) .build(out); } @@ -360,7 +360,7 @@ void FPGAViewWidget::drawDecal(LineShaderData out[], const DecalXY &decal) } } - if (el.type == GraphicElement::G_LINE) { + if (el.type == GraphicElement::G_LINE || el.type == GraphicElement::G_ARROW) { auto line = PolyLine(offsetX + scale * el.x1, offsetY + scale * el.y1, offsetX + scale * el.x2, offsetY + scale * el.y2); switch (el.style) { diff --git a/ice40/gfx.cc b/ice40/gfx.cc index f6ed789f..1b01cbd8 100644 --- a/ice40/gfx.cc +++ b/ice40/gfx.cc @@ -647,7 +647,7 @@ void pipGfx(std::vector<GraphicElement> &g, int x, int y, float x1, float y1, fl float ty = 0.5 * (y1 + y2); GraphicElement el; - el.type = GraphicElement::G_LINE; + el.type = GraphicElement::G_ARROW; el.style = style; if (fabsf(x1 - swx1) < 0.001 && fabsf(x2 - swx1) < 0.001) { |