diff options
author | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-26 21:00:26 -0700 |
---|---|---|
committer | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-26 21:00:26 -0700 |
commit | d5c2332ebf5dd9b84e3a6fd2a99e8df70150bd33 (patch) | |
tree | 0f641516654085dd24bb69889ef466041234f684 /common | |
parent | f45e688354c13f38bda3ba4064587880a25980fe (diff) | |
parent | e5acd80247264fed41dfc1e7e07efa8a10a67fae (diff) | |
download | nextpnr-d5c2332ebf5dd9b84e3a6fd2a99e8df70150bd33.tar.gz nextpnr-d5c2332ebf5dd9b84e3a6fd2a99e8df70150bd33.tar.bz2 nextpnr-d5c2332ebf5dd9b84e3a6fd2a99e8df70150bd33.zip |
Merge remote-tracking branch 'origin/master' into redist_slack
Diffstat (limited to 'common')
-rw-r--r-- | common/nextpnr.h | 28 | ||||
-rw-r--r-- | common/router1.cc | 4 |
2 files changed, 18 insertions, 14 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index 4d9cf5f7..c4c05ae0 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -145,21 +145,25 @@ struct GraphicElement { enum type_t { - G_NONE, - G_LINE, - G_ARROW, - G_BOX, - G_CIRCLE, - G_LABEL - } type = G_NONE; + TYPE_NONE, + TYPE_LINE, + TYPE_ARROW, + TYPE_BOX, + TYPE_CIRCLE, + TYPE_LABEL, + + TYPE_MAX + } type = TYPE_NONE; enum style_t { - G_FRAME, - G_HIDDEN, - G_INACTIVE, - G_ACTIVE, - } style = G_FRAME; + STYLE_FRAME, // Static "frame". Contrast between STYLE_INACTIVE and STYLE_ACTIVE + STYLE_HIDDEN, // Only display when object is selected or highlighted + STYLE_INACTIVE, // Render using low-contrast color + STYLE_ACTIVE, // Render using high-contast color + + STYLE_MAX + } style = STYLE_FRAME; float x1 = 0, y1 = 0, x2 = 0, y2 = 0, z = 0; std::string text; diff --git a/common/router1.cc b/common/router1.cc index dae8d8cb..2ae54245 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -813,15 +813,15 @@ bool router1(Context *ctx) log_info("Checksum: 0x%08x\n", ctx->checksum()); #ifndef NDEBUG ctx->check(); - ctx->unlock(); #endif compute_fmax(ctx, true /* print_fmax */, true /* print_path */); + ctx->unlock(); return true; } catch (log_execution_error_exception) { #ifndef NDEBUG ctx->check(); - ctx->unlock(); #endif + ctx->unlock(); return false; } } |