riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Since there might be a conflict between Hurricane::Library and AGDS::Library : I clear the 'using namespace AGDS' line. 

This is a good example for people who want to use the driver.
This commit is contained in:
Damien Dupuis 2010-06-14 07:59:31 +00:00
parent 13357159f0
commit c35059f0ad
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crlcore/src/ccore/agds/AgdsDriver.cpp
View File

@ -24,7 +24,7 @@ using namespace Hurricane;
#include "vlsisapd/agds/Library.h" #include "vlsisapd/agds/Library.h"
#include "vlsisapd/agds/Structure.h" #include "vlsisapd/agds/Structure.h"
#include "vlsisapd/agds/Rectangle.h" #include "vlsisapd/agds/Rectangle.h"
using namespace AGDS; // Cannot use AGDS namespace : conflicts with Hurricane::Library object
#include "Agds.h" #include "Agds.h"
@ -33,7 +33,7 @@ class AgdsQuery : public Query {
public: public:
AgdsQuery ( Cell* ); AgdsQuery ( Cell* );
inline void setStructure(Structure*); inline void setStructure(AGDS::Structure*);
virtual bool hasGoCallback() const; virtual bool hasGoCallback() const;
virtual void goCallback ( Go* ); virtual void goCallback ( Go* );
@ -42,15 +42,15 @@ class AgdsQuery : public Query {
virtual void masterCellCallback() {}; virtual void masterCellCallback() {};
private: private:
Cell* _cell; Cell* _cell;
Structure* _str; AGDS::Structure* _str;
}; };
AgdsQuery::AgdsQuery(Cell* cell) : Query(), _cell(cell), _str(NULL) { AgdsQuery::AgdsQuery(Cell* cell) : Query(), _cell(cell), _str(NULL) {
Query::setQuery(_cell, _cell->getBoundingBox(), Transformation(), NULL, 0, Query::DoComponents); Query::setQuery(_cell, _cell->getBoundingBox(), Transformation(), NULL, 0, Query::DoComponents);
} }
inline void AgdsQuery::setStructure(Structure* str) { _str = str; } inline void AgdsQuery::setStructure(AGDS::Structure* str) { _str = str; }
bool AgdsQuery::hasGoCallback() const { return true; } bool AgdsQuery::hasGoCallback() const { return true; }
@ -75,11 +75,11 @@ void AgdsQuery::goCallback(Go* go) {
else { else {
return; return;
} }
Rectangle* rect = new Rectangle ( layer->getExtractNumber() AGDS::Rectangle* rect = new AGDS::Rectangle ( layer->getExtractNumber()
, DbU::getPhysical(b.getXMin(), DbU::Nano) , DbU::getPhysical(b.getXMin(), DbU::Nano)
, DbU::getPhysical(b.getYMin(), DbU::Nano) , DbU::getPhysical(b.getYMin(), DbU::Nano)
, DbU::getPhysical(b.getXMax(), DbU::Nano) , DbU::getPhysical(b.getXMax(), DbU::Nano)
, DbU::getPhysical(b.getYMax(), DbU::Nano)); , DbU::getPhysical(b.getYMax(), DbU::Nano));
_str->addElement(rect); _str->addElement(rect);
} }
} // namespace } // namespace
@ -97,7 +97,7 @@ void agdsDriver(const string& filePath, Cell* cell, string& name, string& lib, d
gdsLib->setPhysUnits(pUnits); gdsLib->setPhysUnits(pUnits);
AgdsQuery agdsQuery (cell); AgdsQuery agdsQuery (cell);
Structure* str = new Structure(getString(name)); AGDS::Structure* str = new AGDS::Structure(getString(name));
agdsQuery.setStructure(str); agdsQuery.setStructure(str);
forEach ( BasicLayer*, basicLayer, DataBase::getDB()->getTechnology()->getBasicLayers() ) { forEach ( BasicLayer*, basicLayer, DataBase::getDB()->getTechnology()->getBasicLayers() ) {