caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace GuiLine with GraphicElement

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-04 12:02:58 +02:00
parent 6840ffd9c0
commit eb3c89bee9
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/design.h
View File

@ -34,6 +34,19 @@ template<typename T> using pool = std::unordered_set<T>;
template<typename T, typename U> using dict = std::unordered_map<T, U>; template<typename T, typename U> using dict = std::unordered_map<T, U>;
using std::vector; using std::vector;
struct GraphicElement
{
enum {
G_LINE,
G_BOX,
G_CIRCLE,
G_LABEL
} type;
float x1, y1, x2, y2, z;
std::string text;
};
#include "chip.h" #include "chip.h"
struct CellInfo; struct CellInfo;

13
dummy/chip.h
View File

@ -160,11 +160,6 @@ struct BelPinRange
BelPinIterator end() const { return e; } BelPinIterator end() const { return e; }
}; };
struct GuiLine
{
float x1, y1, x2, y2;
};
struct ChipArgs struct ChipArgs
{ {
// ... // ...
@ -188,10 +183,10 @@ struct Chip
BelRange getBelsByType(BelType type) const; BelRange getBelsByType(BelType type) const;
BelType getBelType(BelId bel) const; BelType getBelType(BelId bel) const;
void getBelPosition(BelId bel, float &x, float &y) const; // void getBelPosition(BelId bel, float &x, float &y) const;
void getWirePosition(WireId wire, float &x, float &y) const; // void getWirePosition(WireId wire, float &x, float &y) const;
vector<GuiLine> getBelGuiLines(BelId bel) const; // vector<GuiLine> getBelGuiLines(BelId bel) const;
vector<GuiLine> getWireGuiLines(WireId wire) const; // vector<GuiLine> getWireGuiLines(WireId wire) const;
WireRange getWires() const; WireRange getWires() const;
WireDelayRange getWiresUphill(WireId wire) const; WireDelayRange getWiresUphill(WireId wire) const;

11
ice40/chip.h
View File

@ -272,11 +272,6 @@ struct BelPinRange
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
struct GuiLine
{
float x1, y1, x2, y2;
};
struct ChipArgs struct ChipArgs
{ {
enum { enum {
@ -346,8 +341,10 @@ struct Chip
// FIXME: void getBelPosition(BelId bel, float &x, float &y) const; // FIXME: void getBelPosition(BelId bel, float &x, float &y) const;
// FIXME: void getWirePosition(WireId wire, float &x, float &y) const; // FIXME: void getWirePosition(WireId wire, float &x, float &y) const;
// FIXME: vector<GuiLine> getBelGuiLines(BelId bel) const; // FIXME: vector<GraphicElement> getBelGraphics(BelId bel) const;
// FIXME: vector<GuiLine> getWireGuiLines(WireId wire) const; // FIXME: vector<GraphicElement> getWireGraphics(WireId wire) const;
// FIXME: vector<GraphicElement> getPipGraphics(WireId src, WireId dst) const;
// FIXME: vector<GraphicElement> getFrameGraphics() const;
AllWireRange getWires() const AllWireRange getWires() const
{ {