cleaning in namespaces
This commit is contained in:
parent
ecba4fe7e0
commit
68760f612d
|
@ -2,7 +2,7 @@
|
|||
#define __CELL_EDITOR_H
|
||||
|
||||
#include "Cell.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
#include <QMainWindow>
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <QStyleOptionGraphicsItem>
|
||||
|
||||
#include "Slice.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
#include "Utils.h"
|
||||
#include "InstanceGraphicsItem.h"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <QGraphicsScene>
|
||||
|
||||
#include "Cell.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
class CellScene : public QGraphicsScene {
|
||||
Q_OBJECT
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include "Slice.h"
|
||||
#include "Segment.h"
|
||||
#include "BasicLayer.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
#include "Utils.h"
|
||||
#include "InstanceGraphicsItem.h"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include "CompositeLayer.h"
|
||||
#include "BasicLayer.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
#include "Utils.h"
|
||||
#include "CellGraphicsItem.h"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <QTransform>
|
||||
#include "Box.h"
|
||||
#include "Transformation.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
inline void boxToRectangle(const Box& box, QRectF& rec) {
|
||||
double xmin = getValue(box.getXMin());
|
||||
|
|
|
@ -350,19 +350,19 @@ Record* BasicLayer::Type::_getRecord() const
|
|||
|
||||
} // 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") {
|
||||
type = H::BasicLayer::Type::UNDEFINED;
|
||||
type = Hurricane::BasicLayer::Type::UNDEFINED;
|
||||
return true;
|
||||
}
|
||||
if (s == "CONDUCTING") {
|
||||
type = H::BasicLayer::Type::CONDUCTING;
|
||||
type = Hurricane::BasicLayer::Type::CONDUCTING;
|
||||
return true;
|
||||
}
|
||||
if (s == "CONTACT") {
|
||||
type = H::BasicLayer::Type::CONTACT;
|
||||
type = Hurricane::BasicLayer::Type::CONTACT;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -140,7 +140,7 @@ template<>
|
|||
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
|
||||
|
|
|
@ -49,13 +49,6 @@
|
|||
// | Macros Definition |
|
||||
// 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
|
||||
|
||||
|
||||
|
|
|
@ -246,19 +246,19 @@ Record* CompositeLayer::Type::_getRecord() const
|
|||
// Generic functions
|
||||
// ****************************************************************************************************
|
||||
|
||||
bool Scan(const string& s, H::CompositeLayer::Type& type)
|
||||
bool Scan(const string& s, Hurricane::CompositeLayer::Type& type)
|
||||
// ***************************************************
|
||||
{
|
||||
if (s == "UNDEFINED") {
|
||||
type = H::CompositeLayer::Type::UNDEFINED;
|
||||
type = Hurricane::CompositeLayer::Type::UNDEFINED;
|
||||
return true;
|
||||
}
|
||||
if (s == "METAL") {
|
||||
type = H::CompositeLayer::Type::METAL;
|
||||
type = Hurricane::CompositeLayer::Type::METAL;
|
||||
return true;
|
||||
}
|
||||
if (s == "VIA") {
|
||||
type = H::CompositeLayer::Type::VIA;
|
||||
type = Hurricane::CompositeLayer::Type::VIA;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -178,7 +178,7 @@ Record* Name::_getRecord() const
|
|||
// Generic functions
|
||||
// ****************************************************************************************************
|
||||
|
||||
bool Scan ( const string& s, H::Name& name )
|
||||
bool Scan ( const string& s, Hurricane::Name& name )
|
||||
// *****************************************
|
||||
{
|
||||
name = s;
|
||||
|
|
|
@ -79,7 +79,7 @@ class Name {
|
|||
ValueIOStreamSupport(Hurricane::Name)
|
||||
|
||||
|
||||
bool Scan ( const string& s, H::Name& name );
|
||||
bool Scan ( const string& s, Hurricane::Name& name );
|
||||
|
||||
#endif // HURRICANE_NAME
|
||||
|
||||
|
|
|
@ -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;
|
||||
if (Scan(s, d)) {
|
||||
unit = H::getUnit(d);
|
||||
unit = Hurricane::getUnit(d);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -157,7 +157,7 @@ template<class Element> class VectorCollection : public Collection<Element> {
|
|||
public: Record* _getRecord() const
|
||||
// *************************
|
||||
{
|
||||
H::Record* record = NULL;
|
||||
Hurricane::Record* record = NULL;
|
||||
if (!_elementVector->empty()) {
|
||||
record = new Record(_getString());
|
||||
unsigned n = 1;
|
||||
|
|
|
@ -60,8 +60,8 @@
|
|||
#include "Error.h"
|
||||
#include "Warning.h"
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
|
|
@ -58,8 +58,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -64,8 +64,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -58,8 +58,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ extern "C" {
|
|||
extern PyMethodDef PyDataBase_Methods[];
|
||||
|
||||
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_Constructor ();
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -60,7 +60,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -121,7 +121,7 @@ namespace {
|
|||
} // End of local namespace.
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -52,18 +52,17 @@
|
|||
|
||||
|
||||
|
||||
# include "PyHyperNet.h"
|
||||
# include "PyCell.h"
|
||||
# include "PyOccurrence.h"
|
||||
# include "PyOccurrenceLocator.h"
|
||||
#include "PyHyperNet.h"
|
||||
#include "PyCell.h"
|
||||
#include "PyOccurrence.h"
|
||||
#include "PyOccurrenceLocator.h"
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -62,9 +62,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -58,8 +58,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -59,8 +59,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -61,8 +61,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -54,8 +54,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -52,25 +52,23 @@
|
|||
|
||||
|
||||
|
||||
# include "PyNet.h"
|
||||
# include "PyName.h"
|
||||
# include "PyCell.h"
|
||||
# include "PyPoint.h"
|
||||
# include "PyPlugLocator.h"
|
||||
# include "PySegmentLocator.h"
|
||||
# include "PyComponentLocator.h"
|
||||
# include "PyPinLocator.h"
|
||||
#include "PyNet.h"
|
||||
#include "PyName.h"
|
||||
#include "PyCell.h"
|
||||
#include "PyPoint.h"
|
||||
#include "PyPlugLocator.h"
|
||||
#include "PySegmentLocator.h"
|
||||
#include "PyComponentLocator.h"
|
||||
#include "PyPinLocator.h"
|
||||
|
||||
#include "NetExternalComponents.h"
|
||||
using namespace Hurricane;
|
||||
|
||||
# include "NetExternalComponents.h"
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
||||
|
|
|
@ -50,14 +50,13 @@
|
|||
|
||||
|
||||
|
||||
# include "PyNetLocator.h"
|
||||
# include "PyNet.h"
|
||||
#include "PyNetLocator.h"
|
||||
#include "PyNet.h"
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -60,8 +60,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -50,20 +50,19 @@
|
|||
|
||||
|
||||
|
||||
# include "PyOccurrence.h"
|
||||
# include "PyOccurrenceLocator.h"
|
||||
#include "PyOccurrence.h"
|
||||
#include "PyOccurrenceLocator.h"
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
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
|
||||
|
|
|
@ -59,8 +59,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -58,8 +58,7 @@
|
|||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -52,28 +52,26 @@
|
|||
|
||||
|
||||
|
||||
# include "PyPinLocator.h"
|
||||
# include "PyPin.h"
|
||||
#include "PyPinLocator.h"
|
||||
#include "PyPin.h"
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
# undef ACCESS_OBJECT
|
||||
# define ACCESS_OBJECT _object
|
||||
# define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Pin*>,locator,function)
|
||||
#undef ACCESS_OBJECT
|
||||
#define ACCESS_OBJECT _object
|
||||
#define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Locator<Pin*>,locator,function)
|
||||
|
||||
|
||||
// x=================================================================x
|
||||
// | "PyPin" Python Module Code Part |
|
||||
// x=================================================================x
|
||||
|
||||
# if defined(__PYTHON_MODULE__)
|
||||
#if defined(__PYTHON_MODULE__)
|
||||
|
||||
|
||||
// x-------------------------------------------------------------x
|
||||
|
|
|
@ -52,25 +52,23 @@
|
|||
|
||||
|
||||
|
||||
# include "PyPlug.h"
|
||||
# include "PyInstance.h"
|
||||
# include "PyNet.h"
|
||||
#include "PyPlug.h"
|
||||
#include "PyInstance.h"
|
||||
#include "PyNet.h"
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
||||
# undef ACCESS_OBJECT
|
||||
# undef ACCESS_CLASS
|
||||
# define ACCESS_OBJECT _baseObject._baseObject._object
|
||||
# define ACCESS_CLASS(_pyObject) &(_pyObject->_baseObject._baseObject)
|
||||
# define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Plug,plug,function)
|
||||
#undef ACCESS_OBJECT
|
||||
#undef ACCESS_CLASS
|
||||
#define ACCESS_OBJECT _baseObject._baseObject._object
|
||||
#define ACCESS_CLASS(_pyObject) &(_pyObject->_baseObject._baseObject)
|
||||
#define METHOD_HEAD(function) GENERIC_METHOD_HEAD(Plug,plug,function)
|
||||
|
||||
|
||||
// x=================================================================x
|
||||
|
|
|
@ -58,9 +58,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -57,9 +57,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -61,9 +61,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -47,23 +47,18 @@
|
|||
// | |
|
||||
// x-----------------------------------------------------------------x
|
||||
|
||||
|
||||
|
||||
|
||||
# include "PyReferenceLocator.h"
|
||||
# include "PyReference.h"
|
||||
#include "PyReferenceLocator.h"
|
||||
#include "PyReference.h"
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
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
|
||||
|
|
|
@ -62,9 +62,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -52,27 +52,25 @@
|
|||
|
||||
|
||||
|
||||
# include "PySegmentLocator.h"
|
||||
# include "PySegment.h"
|
||||
#include "PySegmentLocator.h"
|
||||
#include "PySegment.h"
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
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
|
||||
// | "PySegmentLocator" Python Module Code Part |
|
||||
// x=================================================================x
|
||||
|
||||
# if defined(__PYTHON_MODULE__)
|
||||
#if defined(__PYTHON_MODULE__)
|
||||
|
||||
|
||||
// x-------------------------------------------------------------x
|
||||
|
|
|
@ -60,8 +60,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -59,9 +59,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -57,8 +57,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -54,9 +54,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -59,9 +59,7 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
|
||||
USING_NAMESPACE_HURRICANE
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define __CELL_VIEWER_H
|
||||
|
||||
#include "Cell.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
#include <QMainWindow>
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "Slot.h"
|
||||
#include "Technology.h"
|
||||
#include "Transformation.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
#include <QPaintEvent>
|
||||
#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)) {
|
||||
drawContent(instance, basicLayer, updateArea, transformation);
|
||||
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;
|
||||
Transformation masterTransformation = instance->getTransformation();
|
||||
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->getBoundingBox().intersect(updateArea)) {
|
||||
//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)));
|
||||
}
|
||||
|
||||
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)) {
|
||||
drawPhantoms(instance, updateArea, transformation);
|
||||
end_for;
|
||||
}
|
||||
}
|
||||
|
||||
void CellWidget::drawPhantoms(const Instance* instance, const H::Box& updateArea, const Transformation& transformation) const {
|
||||
H::Box masterArea = updateArea;
|
||||
void CellWidget::drawPhantoms(const Instance* instance, const Hurricane::Box& updateArea, const Transformation& transformation) const {
|
||||
Hurricane::Box masterArea = updateArea;
|
||||
Transformation masterTransformation = instance->getTransformation();
|
||||
instance->getTransformation().getInvert().applyOn(masterArea);
|
||||
transformation.applyOn(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()));
|
||||
for_each_instance(instance, cell->getInstances()) {
|
||||
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 {
|
||||
H::Box masterArea = updateArea;
|
||||
void CellWidget::drawBoundaries(const Instance* instance, const Hurricane::Box& updateArea, const Transformation& transformation) const {
|
||||
Hurricane::Box masterArea = updateArea;
|
||||
Transformation masterTransformation = instance->getTransformation();
|
||||
instance->getTransformation().getInvert().applyOn(masterArea);
|
||||
transformation.applyOn(masterTransformation);
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "BasicLayer.h"
|
||||
#include "Occurrences.h"
|
||||
#include "Points.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
//#include "Selectors.h"
|
||||
|
||||
//OPEN_MY_NAMESPACE
|
||||
|
@ -170,9 +170,9 @@ class /* Q_EXPORT */ CellWidget : public QWidget {
|
|||
void abortStartedCommand();
|
||||
|
||||
|
||||
void drawContent(const Cell* cell, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const;
|
||||
void drawContent(const Instance* instance, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const;
|
||||
void drawSlice(const Slice* slice, 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 Hurricane::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 Instance* instance, const Box& updateArea, const Transformation& transformation) const;
|
||||
void drawBoundaries(const Cell* cell, const Box& updateArea, const Transformation& transformation) const;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "DataBase.h"
|
||||
#include "Technology.h"
|
||||
#include "BasicLayer.h"
|
||||
using namespace H;
|
||||
using namespace Hurricane;
|
||||
|
||||
#include <QCheckBox>
|
||||
#include <QLabel>
|
||||
|
|
Loading…
Reference in New Issue