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

cleaning in namespaces

This commit is contained in:
Christophe Alexandre 2008-03-28 09:48:47 +00:00
parent ecba4fe7e0
commit 68760f612d
63 changed files with 123 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hurricane/src/editor/CellEditor.h
View File

@ -2,7 +2,7 @@
#define __CELL_EDITOR_H #define __CELL_EDITOR_H
#include "Cell.h" #include "Cell.h"
using namespace H; using namespace Hurricane;
#include <QMainWindow> #include <QMainWindow>

2
hurricane/src/editor/CellGraphicsItem.cpp
View File

@ -4,7 +4,7 @@
#include <QStyleOptionGraphicsItem> #include <QStyleOptionGraphicsItem>
#include "Slice.h" #include "Slice.h"
using namespace H; using namespace Hurricane;
#include "Utils.h" #include "Utils.h"
#include "InstanceGraphicsItem.h" #include "InstanceGraphicsItem.h"

2
hurricane/src/editor/CellScene.h
View File

@ -4,7 +4,7 @@
#include <QGraphicsScene> #include <QGraphicsScene>
#include "Cell.h" #include "Cell.h"
using namespace H; using namespace Hurricane;
class CellScene : public QGraphicsScene { class CellScene : public QGraphicsScene {
Q_OBJECT Q_OBJECT

2
hurricane/src/editor/InstanceGraphicsItem.cpp
View File

@ -6,7 +6,7 @@
#include "Slice.h" #include "Slice.h"
#include "Segment.h" #include "Segment.h"
#include "BasicLayer.h" #include "BasicLayer.h"
using namespace H; using namespace Hurricane;
#include "Utils.h" #include "Utils.h"
#include "InstanceGraphicsItem.h" #include "InstanceGraphicsItem.h"

2
hurricane/src/editor/SegmentFigure.cpp
View File

@ -6,7 +6,7 @@
#include "CompositeLayer.h" #include "CompositeLayer.h"
#include "BasicLayer.h" #include "BasicLayer.h"
using namespace H; using namespace Hurricane;
#include "Utils.h" #include "Utils.h"
#include "CellGraphicsItem.h" #include "CellGraphicsItem.h"

2
hurricane/src/editor/Utils.h
View File

@ -5,7 +5,7 @@
#include <QTransform> #include <QTransform>
#include "Box.h" #include "Box.h"
#include "Transformation.h" #include "Transformation.h"
using namespace H; using namespace Hurricane;
inline void boxToRectangle(const Box& box, QRectF& rec) { inline void boxToRectangle(const Box& box, QRectF& rec) {
double xmin = getValue(box.getXMin()); double xmin = getValue(box.getXMin());

8
hurricane/src/hurricane/BasicLayer.cpp
View File

@ -350,19 +350,19 @@ Record* BasicLayer::Type::_getRecord() const
} // End of Hurricane namespace. } // End of Hurricane namespace.
bool Scan(const string& s, H::BasicLayer::Type& type) bool Scan(const string& s, Hurricane::BasicLayer::Type& type)
// ************************************************** // **************************************************
{ {
if (s == "UNDEFINED") { if (s == "UNDEFINED") {
type = H::BasicLayer::Type::UNDEFINED; type = Hurricane::BasicLayer::Type::UNDEFINED;
return true; return true;
} }
if (s == "CONDUCTING") { if (s == "CONDUCTING") {
type = H::BasicLayer::Type::CONDUCTING; type = Hurricane::BasicLayer::Type::CONDUCTING;
return true; return true;
} }
if (s == "CONTACT") { if (s == "CONTACT") {
type = H::BasicLayer::Type::CONTACT; type = Hurricane::BasicLayer::Type::CONTACT;
return true; return true;
} }
return false; return false;

2
hurricane/src/hurricane/BasicLayer.h
View File

@ -140,7 +140,7 @@ template<>
SetNestedSlotAdapter(Hurricane::BasicLayer) SetNestedSlotAdapter(Hurricane::BasicLayer)
bool Scan(const string& s, H::BasicLayer::Type& type); bool Scan(const string& s, Hurricane::BasicLayer::Type& type);
#endif // HURRICANE_BASIC_LAYER #endif // HURRICANE_BASIC_LAYER

7
hurricane/src/hurricane/Commons.h
View File

@ -49,13 +49,6 @@
// | Macros Definition | // | Macros Definition |
// x-----------------------------------------------------------------x // x-----------------------------------------------------------------x
#define Hurricane H
#define BEGIN_NAMESPACE_HURRICANE namespace Hurricane {
#define END_NAMESPACE_HURRICANE }
#define USING_NAMESPACE_HURRICANE using namespace std; using namespace Hurricane;
#define is_a (bool)dynamic_cast #define is_a (bool)dynamic_cast

8
hurricane/src/hurricane/CompositeLayer.cpp
View File

@ -246,19 +246,19 @@ Record* CompositeLayer::Type::_getRecord() const
// Generic functions // Generic functions
// **************************************************************************************************** // ****************************************************************************************************
bool Scan(const string& s, H::CompositeLayer::Type& type) bool Scan(const string& s, Hurricane::CompositeLayer::Type& type)
// *************************************************** // ***************************************************
{ {
if (s == "UNDEFINED") { if (s == "UNDEFINED") {
type = H::CompositeLayer::Type::UNDEFINED; type = Hurricane::CompositeLayer::Type::UNDEFINED;
return true; return true;
} }
if (s == "METAL") { if (s == "METAL") {
type = H::CompositeLayer::Type::METAL; type = Hurricane::CompositeLayer::Type::METAL;
return true; return true;
} }
if (s == "VIA") { if (s == "VIA") {
type = H::CompositeLayer::Type::VIA; type = Hurricane::CompositeLayer::Type::VIA;
return true; return true;
} }
return false; return false;

2
hurricane/src/hurricane/CompositeLayer.h
View File

@ -120,7 +120,7 @@ SetNestedSlotAdapter(Hurricane::CompositeLayer)
// **************************************************************************************************** // ****************************************************************************************************
bool Scan(const string& s, H::CompositeLayer::Type& type); bool Scan(const string& s, Hurricane::CompositeLayer::Type& type);
#endif // HURRICANE_COMPOSITE_LAYER #endif // HURRICANE_COMPOSITE_LAYER

2
hurricane/src/hurricane/Name.cpp
View File

@ -178,7 +178,7 @@ Record* Name::_getRecord() const
// Generic functions // Generic functions
// **************************************************************************************************** // ****************************************************************************************************
bool Scan ( const string& s, H::Name& name ) bool Scan ( const string& s, Hurricane::Name& name )
// ***************************************** // *****************************************
{ {
name = s; name = s;

2
hurricane/src/hurricane/Name.h
View File

@ -79,7 +79,7 @@ class Name {
ValueIOStreamSupport(Hurricane::Name) ValueIOStreamSupport(Hurricane::Name)
bool Scan ( const string& s, H::Name& name ); bool Scan ( const string& s, Hurricane::Name& name );
#endif // HURRICANE_NAME #endif // HURRICANE_NAME

4
hurricane/src/hurricane/Unit.cpp
View File

@ -170,12 +170,12 @@ string getValueString(const Unit& unit)
bool Scan(const string& s, H::Unit& unit) bool Scan(const string& s, Hurricane::Unit& unit)
// *********************************** // ***********************************
{ {
double d; double d;
if (Scan(s, d)) { if (Scan(s, d)) {
unit = H::getUnit(d); unit = Hurricane::getUnit(d);
return true; return true;
} }
return false; return false;

2
hurricane/src/hurricane/Unit.h
View File

@ -97,7 +97,7 @@ string getValueString(const Unit& unit);
bool Scan(const string& s, H::Unit& unit); bool Scan(const string& s, Hurricane::Unit& unit);
#endif // HURRICANE_UNIT #endif // HURRICANE_UNIT

2
hurricane/src/hurricane/VectorCollection.h
View File

@ -157,7 +157,7 @@ template<class Element> class VectorCollection : public Collection<Element> {
public: Record* _getRecord() const public: Record* _getRecord() const
// ************************* // *************************
{ {
H::Record* record = NULL; Hurricane::Record* record = NULL;
if (!_elementVector->empty()) { if (!_elementVector->empty()) {
record = new Record(_getString()); record = new Record(_getString());
unsigned n = 1; unsigned n = 1;

6
hurricane/src/pyext/ProxyProperty.cpp
View File

@ -60,11 +60,11 @@
#include "Error.h" #include "Error.h"
#include "Warning.h" #include "Warning.h"
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
namespace Isobar {
namespace Isobar {
namespace { namespace {

3
hurricane/src/pyext/PyBox.cpp
View File

@ -58,8 +58,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

2
hurricane/src/pyext/PyCell.cpp
View File

@ -65,7 +65,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

3
hurricane/src/pyext/PyCell.h
View File

@ -64,8 +64,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

2
hurricane/src/pyext/PyCellLocator.cpp
View File

@ -58,7 +58,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

2
hurricane/src/pyext/PyComponent.cpp
View File

@ -63,7 +63,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

2
hurricane/src/pyext/PyComponentLocator.cpp
View File

@ -57,7 +57,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

2
hurricane/src/pyext/PyContact.cpp
View File

@ -62,7 +62,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

3
hurricane/src/pyext/PyDataBase.cpp
View File

@ -58,8 +58,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

2
hurricane/src/pyext/PyDataBase.h
View File

@ -86,7 +86,7 @@ extern "C" {
extern PyMethodDef PyDataBase_Methods[]; extern PyMethodDef PyDataBase_Methods[];
extern PyObject* PyDataBase_getDataBase ( PyObject* module ); extern PyObject* PyDataBase_getDataBase ( PyObject* module );
extern PyObject* PyDataBase_Link ( H::DataBase* db ); extern PyObject* PyDataBase_Link ( Hurricane::DataBase* db );
extern void PyDataBase_LinkPyType (); extern void PyDataBase_LinkPyType ();
extern void PyDataBase_Constructor (); extern void PyDataBase_Constructor ();

2
hurricane/src/pyext/PyEntity.cpp
View File

@ -66,7 +66,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

2
hurricane/src/pyext/PyHorizontal.cpp
View File

@ -60,7 +60,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

2
hurricane/src/pyext/PyHurricane.cpp
View File

@ -121,7 +121,7 @@ namespace {
} // End of local namespace. } // End of local namespace.
USING_NAMESPACE_HURRICANE using namespace Hurricane;

11
hurricane/src/pyext/PyHyperNet.cpp
View File

@ -52,18 +52,17 @@
# include "PyHyperNet.h" #include "PyHyperNet.h"
# include "PyCell.h" #include "PyCell.h"
# include "PyOccurrence.h" #include "PyOccurrence.h"
# include "PyOccurrenceLocator.h" #include "PyOccurrenceLocator.h"
USING_NAMESPACE_HURRICANE using namespace Hurricane;
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

4
hurricane/src/pyext/PyInstance.cpp
View File

@ -62,9 +62,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

2
hurricane/src/pyext/PyInstance.h
View File

@ -65,7 +65,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

3
hurricane/src/pyext/PyInstanceLocator.cpp
View File

@ -58,8 +58,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

3
hurricane/src/pyext/PyLayer.cpp
View File

@ -59,8 +59,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

2
hurricane/src/pyext/PyLayer.h
View File

@ -57,7 +57,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

3
hurricane/src/pyext/PyLibrary.cpp
View File

@ -61,8 +61,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

2
hurricane/src/pyext/PyLibrary.h
View File

@ -61,7 +61,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

3
hurricane/src/pyext/PyName.cpp
View File

@ -54,8 +54,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

24
hurricane/src/pyext/PyNet.cpp
View File

@ -52,25 +52,23 @@
# include "PyNet.h" #include "PyNet.h"
# include "PyName.h" #include "PyName.h"
# include "PyCell.h" #include "PyCell.h"
# include "PyPoint.h" #include "PyPoint.h"
# include "PyPlugLocator.h" #include "PyPlugLocator.h"
# include "PySegmentLocator.h" #include "PySegmentLocator.h"
# include "PyComponentLocator.h" #include "PyComponentLocator.h"
# include "PyPinLocator.h" #include "PyPinLocator.h"
#include "NetExternalComponents.h"
using namespace Hurricane;
# include "NetExternalComponents.h"
USING_NAMESPACE_HURRICANE
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

7
hurricane/src/pyext/PyNetLocator.cpp
View File

@ -50,14 +50,13 @@
# include "PyNetLocator.h" #include "PyNetLocator.h"
# include "PyNet.h" #include "PyNet.h"
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

3
hurricane/src/pyext/PyOccurrence.cpp
View File

@ -60,8 +60,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

9
hurricane/src/pyext/PyOccurrenceLocator.cpp
View File

@ -50,20 +50,19 @@
# include "PyOccurrence.h" #include "PyOccurrence.h"
# include "PyOccurrenceLocator.h" #include "PyOccurrenceLocator.h"
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {
# define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Occurrence>,locator,function) #define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Occurrence>,locator,function)
// x=================================================================x // x=================================================================x

3
hurricane/src/pyext/PyPath.cpp
View File

@ -59,8 +59,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

3
hurricane/src/pyext/PyPin.cpp
View File

@ -58,8 +58,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

2
hurricane/src/pyext/PyPin.h
View File

@ -58,7 +58,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

16
hurricane/src/pyext/PyPinLocator.cpp
View File

@ -52,28 +52,26 @@
# include "PyPinLocator.h" #include "PyPinLocator.h"
# include "PyPin.h" #include "PyPin.h"
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {
# undef ACCESS_OBJECT #undef ACCESS_OBJECT
# define ACCESS_OBJECT _object #define ACCESS_OBJECT _object
# define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Pin*>,locator,function) #define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Pin*>,locator,function)
// x=================================================================x // x=================================================================x
// | "PyPin" Python Module Code Part | // | "PyPin" Python Module Code Part |
// x=================================================================x // x=================================================================x
# if defined(__PYTHON_MODULE__) #if defined(__PYTHON_MODULE__)
// x-------------------------------------------------------------x // x-------------------------------------------------------------x

20
hurricane/src/pyext/PyPlug.cpp
View File

@ -52,25 +52,23 @@
# include "PyPlug.h" #include "PyPlug.h"
# include "PyInstance.h" #include "PyInstance.h"
# include "PyNet.h" #include "PyNet.h"
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {
# undef ACCESS_OBJECT #undef ACCESS_OBJECT
# undef ACCESS_CLASS #undef ACCESS_CLASS
# define ACCESS_OBJECT _baseObject._baseObject._object #define ACCESS_OBJECT _baseObject._baseObject._object
# define ACCESS_CLASS(_pyObject) &(_pyObject->_baseObject._baseObject) #define ACCESS_CLASS(_pyObject) &(_pyObject->_baseObject._baseObject)
# define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Plug,plug,function) #define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Plug,plug,function)
// x=================================================================x // x=================================================================x

4
hurricane/src/pyext/PyPlugLocator.cpp
View File

@ -58,9 +58,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

4
hurricane/src/pyext/PyPoint.cpp
View File

@ -57,9 +57,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

4
hurricane/src/pyext/PyReference.cpp
View File

@ -61,9 +61,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

13
hurricane/src/pyext/PyReferenceLocator.cpp
View File

@ -47,23 +47,18 @@
// | | // | |
// x-----------------------------------------------------------------x // x-----------------------------------------------------------------x
#include "PyReferenceLocator.h"
#include "PyReference.h"
# include "PyReferenceLocator.h"
# include "PyReference.h"
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {
# define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Reference*>,locator,function) #define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Reference*>,locator,function)
// x=================================================================x // x=================================================================x

4
hurricane/src/pyext/PySegment.cpp
View File

@ -62,9 +62,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

12
hurricane/src/pyext/PySegmentLocator.cpp
View File

@ -52,27 +52,25 @@
# include "PySegmentLocator.h" #include "PySegmentLocator.h"
# include "PySegment.h" #include "PySegment.h"
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {
# define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Segment*>,locator,function) #define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Segment*>,locator,function)
// x=================================================================x // x=================================================================x
// | "PySegmentLocator" Python Module Code Part | // | "PySegmentLocator" Python Module Code Part |
// x=================================================================x // x=================================================================x
# if defined(__PYTHON_MODULE__) #if defined(__PYTHON_MODULE__)
// x-------------------------------------------------------------x // x-------------------------------------------------------------x

3
hurricane/src/pyext/PyTechnology.cpp
View File

@ -60,8 +60,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

2
hurricane/src/pyext/PyTechnology.h
View File

@ -58,7 +58,7 @@
namespace Isobar { namespace Isobar {
USING_NAMESPACE_HURRICANE using namespace Hurricane;
extern "C" { extern "C" {

4
hurricane/src/pyext/PyTransformation.cpp
View File

@ -59,9 +59,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

3
hurricane/src/pyext/PyUnit.cpp
View File

@ -57,8 +57,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

4
hurricane/src/pyext/PyUpdateSession.cpp
View File

@ -54,9 +54,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

4
hurricane/src/pyext/PyVertical.cpp
View File

@ -59,9 +59,7 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
USING_NAMESPACE_HURRICANE
extern "C" { extern "C" {

2
hurricane/src/viewer/CellViewer.h
View File

@ -2,7 +2,7 @@
#define __CELL_VIEWER_H #define __CELL_VIEWER_H
#include "Cell.h" #include "Cell.h"
using namespace H; using namespace Hurricane;
#include <QMainWindow> #include <QMainWindow>

20
hurricane/src/viewer/CellWidget.cpp
View File

@ -18,7 +18,7 @@
#include "Slot.h" #include "Slot.h"
#include "Technology.h" #include "Technology.h"
#include "Transformation.h" #include "Transformation.h"
using namespace H; using namespace Hurricane;
#include <QPaintEvent> #include <QPaintEvent>
#include <QPainter> #include <QPainter>
@ -1775,7 +1775,7 @@ CellWidget::postRedraw(const Box& area)
} }
void CellWidget::drawContent(const Cell* cell, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const { void CellWidget::drawContent(const Cell* cell, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const {
for_each_instance(instance, cell->getInstancesUnder(updateArea)) { for_each_instance(instance, cell->getInstancesUnder(updateArea)) {
drawContent(instance, basicLayer, updateArea, transformation); drawContent(instance, basicLayer, updateArea, transformation);
end_for; end_for;
@ -1788,7 +1788,7 @@ void CellWidget::drawContent(const Cell* cell, const BasicLayer* basicLayer, con
} }
void CellWidget::drawContent(const Instance* instance, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const { void CellWidget::drawContent(const Instance* instance, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const {
Box masterArea = updateArea; Box masterArea = updateArea;
Transformation masterTransformation = instance->getTransformation(); Transformation masterTransformation = instance->getTransformation();
instance->getTransformation().getInvert().applyOn(masterArea); instance->getTransformation().getInvert().applyOn(masterArea);
@ -1797,7 +1797,7 @@ void CellWidget::drawContent(const Instance* instance, const BasicLayer* basicLa
} }
void CellWidget::drawSlice(const Slice* slice, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const { void CellWidget::drawSlice(const Slice* slice, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const {
if (slice->getLayer()->contains(basicLayer)) { if (slice->getLayer()->contains(basicLayer)) {
if (slice->getBoundingBox().intersect(updateArea)) { if (slice->getBoundingBox().intersect(updateArea)) {
//if ((basicLayer == _layer->_getSymbolicBasicLayer()) || (3 < view->getScale())) //if ((basicLayer == _layer->_getSymbolicBasicLayer()) || (3 < view->getScale()))
@ -1835,22 +1835,22 @@ void CellWidget::drawContact(const Contact* contact, const BasicLayer* basicLaye
drawRectangle(transformation.getBox(contact->getBoundingBox(basicLayer))); drawRectangle(transformation.getBox(contact->getBoundingBox(basicLayer)));
} }
void CellWidget::drawPhantoms(const Cell* cell, const H::Box& updateArea, const Transformation& transformation) const { void CellWidget::drawPhantoms(const Cell* cell, const Hurricane::Box& updateArea, const Transformation& transformation) const {
for_each_instance(instance, cell->getInstancesUnder(updateArea)) { for_each_instance(instance, cell->getInstancesUnder(updateArea)) {
drawPhantoms(instance, updateArea, transformation); drawPhantoms(instance, updateArea, transformation);
end_for; end_for;
} }
} }
void CellWidget::drawPhantoms(const Instance* instance, const H::Box& updateArea, const Transformation& transformation) const { void CellWidget::drawPhantoms(const Instance* instance, const Hurricane::Box& updateArea, const Transformation& transformation) const {
H::Box masterArea = updateArea; Hurricane::Box masterArea = updateArea;
Transformation masterTransformation = instance->getTransformation(); Transformation masterTransformation = instance->getTransformation();
instance->getTransformation().getInvert().applyOn(masterArea); instance->getTransformation().getInvert().applyOn(masterArea);
transformation.applyOn(masterTransformation); transformation.applyOn(masterTransformation);
drawPhantoms(instance->getMasterCell(), masterArea, masterTransformation); drawPhantoms(instance->getMasterCell(), masterArea, masterTransformation);
} }
void CellWidget::drawBoundaries(const Cell* cell, const H::Box& updateArea, const Transformation& transformation) const { void CellWidget::drawBoundaries(const Cell* cell, const Hurricane::Box& updateArea, const Transformation& transformation) const {
drawRectangle(transformation.getBox(cell->getAbutmentBox())); drawRectangle(transformation.getBox(cell->getAbutmentBox()));
for_each_instance(instance, cell->getInstances()) { for_each_instance(instance, cell->getInstances()) {
drawBoundaries(instance, updateArea, transformation); drawBoundaries(instance, updateArea, transformation);
@ -1858,8 +1858,8 @@ void CellWidget::drawBoundaries(const Cell* cell, const H::Box& updateArea, cons
} }
} }
void CellWidget::drawBoundaries(const Instance* instance, const H::Box& updateArea, const Transformation& transformation) const { void CellWidget::drawBoundaries(const Instance* instance, const Hurricane::Box& updateArea, const Transformation& transformation) const {
H::Box masterArea = updateArea; Hurricane::Box masterArea = updateArea;
Transformation masterTransformation = instance->getTransformation(); Transformation masterTransformation = instance->getTransformation();
instance->getTransformation().getInvert().applyOn(masterArea); instance->getTransformation().getInvert().applyOn(masterArea);
transformation.applyOn(masterTransformation); transformation.applyOn(masterTransformation);

8
hurricane/src/viewer/CellWidget.h
View File

@ -18,7 +18,7 @@
#include "BasicLayer.h" #include "BasicLayer.h"
#include "Occurrences.h" #include "Occurrences.h"
#include "Points.h" #include "Points.h"
using namespace H; using namespace Hurricane;
//#include "Selectors.h" //#include "Selectors.h"
//OPEN_MY_NAMESPACE //OPEN_MY_NAMESPACE
@ -170,9 +170,9 @@ class /* Q_EXPORT */ CellWidget : public QWidget {
void abortStartedCommand(); void abortStartedCommand();
void drawContent(const Cell* cell, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const; void drawContent(const Cell* cell, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const;
void drawContent(const Instance* instance, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const; void drawContent(const Instance* instance, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const;
void drawSlice(const Slice* slice, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const; void drawSlice(const Slice* slice, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const;
void drawPhantoms(const Cell* cell, const Box& updateArea, const Transformation& transformation) const; void drawPhantoms(const Cell* cell, const Box& updateArea, const Transformation& transformation) const;
void drawPhantoms(const Instance* instance, const Box& updateArea, const Transformation& transformation) const; void drawPhantoms(const Instance* instance, const Box& updateArea, const Transformation& transformation) const;
void drawBoundaries(const Cell* cell, const Box& updateArea, const Transformation& transformation) const; void drawBoundaries(const Cell* cell, const Box& updateArea, const Transformation& transformation) const;

2
hurricane/src/viewer/LayersWidget.cpp
View File

@ -1,7 +1,7 @@
#include "DataBase.h" #include "DataBase.h"
#include "Technology.h" #include "Technology.h"
#include "BasicLayer.h" #include "BasicLayer.h"
using namespace H; using namespace Hurricane;
#include <QCheckBox> #include <QCheckBox>
#include <QLabel> #include <QLabel>