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

some cleaning again

This commit is contained in:
Christophe Alexandre 2008-03-25 11:06:05 +00:00
parent cb9260599c
commit eb54b6238e
34 changed files with 194 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2117,7 +2117,7 @@ void Cell_Occurrences::Locator::progress()
}
else {
Instance* instance = _instanceLocator.getElement();
if (instance->IsTerminal()) {
if (instance->isTerminal()) {
_instanceLocator.progress();
if (!_instanceLocator.isValid()) _state = 0;
}
@ -2401,7 +2401,7 @@ void Cell_OccurrencesUnder::Locator::progress()
}
else {
Instance* instance = _instanceLocator.getElement();
if (instance->IsTerminal()) {
if (instance->isTerminal()) {
_instanceLocator.progress();
if (!_instanceLocator.isValid()) _state = 0;
}

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

@ -350,16 +350,16 @@ void Component::unmaterialize()
}
}
void Component::Invalidate(bool propagateFlag)
void Component::invalidate(bool propagateFlag)
// *******************************************
{
Inherit::Invalidate(false);
Inherit::invalidate(false);
if (propagateFlag) {
Rubber* rubber = getRubber();
if (rubber) rubber->Invalidate();
if (rubber) rubber->invalidate();
for_each_component(component, getSlaveComponents()) {
component->Invalidate(false);
component->invalidate(false);
end_for;
}
}

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

@ -87,7 +87,7 @@ class Component : public Go {
public: virtual void materialize();
public: virtual void unmaterialize();
public: virtual void Invalidate(bool propagateFlag = true);
public: virtual void invalidate(bool propagateFlag = true);
// Filters
// *******

14
hurricane/src/hurricane/Contact.cpp
View File

@ -200,11 +200,11 @@ Component* Contact::getAnchor() const
return (masterHook) ? masterHook->getComponent() : NULL;
}
void Contact::Translate(const Unit& dx, const Unit& dy)
void Contact::translate(const Unit& dx, const Unit& dy)
// ****************************************************
{
if ((dx != 0) || (dy != 0)) {
Invalidate(true);
invalidate(true);
_dx += dx;
_dy += dy;
}
@ -217,7 +217,7 @@ void Contact::SetLayer(Layer* layer)
throw Error("Can't set layer : null layer");
if (layer != _layer) {
Invalidate(false);
invalidate(false);
_layer = layer;
}
}
@ -226,7 +226,7 @@ void Contact::SetWidth(const Unit& width)
// **************************************
{
if (width != _width) {
Invalidate(false);
invalidate(false);
_width = width;
}
}
@ -235,7 +235,7 @@ void Contact::SetHeight(const Unit& height)
// ****************************************
{
if (height != _height) {
Invalidate(false);
invalidate(false);
_height = height;
}
}
@ -244,7 +244,7 @@ void Contact::SetSizes(const Unit& width, const Unit& height)
// **********************************************************
{
if ((width != _width) || (height != _height)) {
Invalidate(false);
invalidate(false);
_width = width;
_height = height;
}
@ -294,7 +294,7 @@ void Contact::SetOffset(const Unit& dx, const Unit& dy)
// ****************************************************
{
if ((dx != _dx) || (dy != _dy)) {
Invalidate(true);
invalidate(true);
_dx = dx;
_dy = dy;
}

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

@ -84,7 +84,7 @@ class Contact : public Component {
// Updators
// ********
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void translate(const Unit& dx, const Unit& dy);
public: void SetLayer(Layer* layer);
public: void SetWidth(const Unit& width);

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

@ -40,11 +40,11 @@ DRCError* DRCError::create(Cell* cell, const Name& name, const Box& boundingBox)
return drcError;
}
void DRCError::Translate(const Unit& dx, const Unit& dy)
void DRCError::translate(const Unit& dx, const Unit& dy)
// *****************************************************
{
if ((dx != 0) || (dy != 0)) {
Invalidate(false);
invalidate(false);
_boundingBox.translate(dx, dy);
}
}

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

@ -47,7 +47,7 @@ class DRCError : public Marker {
// Updators
// ********
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void translate(const Unit& dx, const Unit& dy);
// Others
// ******

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

@ -13,12 +13,9 @@
namespace Hurricane {
//class View;
class BasicLayer;
class QuadTree;
// ****************************************************************************************************
// Go declaration
// ****************************************************************************************************
@ -63,10 +60,10 @@ class Go : public Entity {
public: virtual void materialize() = 0;
public: virtual void unmaterialize() = 0;
public: virtual void Invalidate(bool propagateFlag = true);
public: virtual void invalidate(bool propagateFlag = true);
// implementation located on file UpdateSession.cpp to access local variables
public: virtual void Translate(const Unit& dx, const Unit& dy) = 0;
public: virtual void translate(const Unit& dx, const Unit& dy) = 0;
// Others
// ******

14
hurricane/src/hurricane/Horizontal.cpp
View File

@ -104,11 +104,11 @@ Point Horizontal::getCenter() const
return Point ( (getSourceX()+getTargetX())/2, getY() );
}
void Horizontal::Translate(const Unit& dx, const Unit& dy)
void Horizontal::translate(const Unit& dx, const Unit& dy)
// *******************************************************
{
if (dy != 0) {
Invalidate(true);
invalidate(true);
_y += dy;
}
}
@ -117,7 +117,7 @@ void Horizontal::SetY(const Unit& y)
// *********************************
{
if (y != _y) {
Invalidate(true);
invalidate(true);
_y = y;
}
}
@ -126,7 +126,7 @@ void Horizontal::SetDxSource(const Unit& dxSource)
// ***********************************************
{
if (dxSource != _dxSource) {
Invalidate(false);
invalidate(false);
_dxSource = dxSource;
}
}
@ -135,16 +135,16 @@ void Horizontal::SetDxTarget(const Unit& dxTarget)
// ***********************************************
{
if (dxTarget != _dxTarget) {
Invalidate(false);
invalidate(false);
_dxTarget = dxTarget;
}
}
void Horizontal::Translate(const Unit& dy)
void Horizontal::translate(const Unit& dy)
// ***************************************
{
if (dy != 0) {
Invalidate(true);
invalidate(true);
_y += dy;
}
}

4
hurricane/src/hurricane/Horizontal.h
View File

@ -59,12 +59,12 @@ class Horizontal : public Segment {
// Updators
// ********
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void translate(const Unit& dx, const Unit& dy);
public: void SetY(const Unit& y);
public: void SetDxSource(const Unit& dxSource);
public: void SetDxTarget(const Unit& dxSource);
public: void Translate(const Unit& dy);
public: void translate(const Unit& dy);
// Others
// ******

36
hurricane/src/hurricane/Instance.cpp
View File

@ -75,7 +75,7 @@ class Instance_IsTerminalFilter : public Filter<Instance*> {
public: virtual Filter<Instance*>* getClone() const {return new Instance_IsTerminalFilter(*this);};
public: virtual bool accept(Instance* instance) const {return instance->IsTerminal();};
public: virtual bool accept(Instance* instance) const {return instance->isTerminal();};
public: virtual string _getString() const {return "<" + _TName("Instance::IsTerminalFilter") + ">";};
@ -92,7 +92,7 @@ class Instance_IsLeafFilter : public Filter<Instance*> {
public: virtual Filter<Instance*>* getClone() const {return new Instance_IsLeafFilter(*this);};
public: virtual bool accept(Instance* instance) const {return instance->IsLeaf();};
public: virtual bool accept(Instance* instance) const {return instance->isLeaf();};
public: virtual string _getString() const {return "<" + _TName("Instance::IsLeafFilter") + ">";};
@ -109,7 +109,7 @@ class Instance_IsUnplacedFilter : public Filter<Instance*> {
public: virtual Filter<Instance*>* getClone() const {return new Instance_IsUnplacedFilter(*this);};
public: virtual bool accept(Instance* instance) const {return instance->IsUnplaced();};
public: virtual bool accept(Instance* instance) const {return instance->isUnplaced();};
public: virtual string _getString() const {return "<" + _TName("Net::IsUnplacedFilter>");};
@ -126,7 +126,7 @@ class Instance_IsPlacedFilter : public Filter<Instance*> {
public: virtual Filter<Instance*>* getClone() const {return new Instance_IsPlacedFilter(*this);};
public: virtual bool accept(Instance* instance) const {return instance->IsPlaced();};
public: virtual bool accept(Instance* instance) const {return instance->isPlaced();};
public: virtual string _getString() const {return "<" + _TName("Net::IsPlacedFilter>");};
@ -143,7 +143,7 @@ class Instance_IsFixedFilter : public Filter<Instance*> {
public: virtual Filter<Instance*>* getClone() const {return new Instance_IsFixedFilter(*this);};
public: virtual bool accept(Instance* instance) const {return instance->IsFixed();};
public: virtual bool accept(Instance* instance) const {return instance->isFixed();};
public: virtual string _getString() const {return "<" + _TName("Net::IsFixedFilter>");};
@ -234,13 +234,13 @@ Box Instance::getAbutmentBox() const
return _transformation.getBox(_masterCell->getAbutmentBox());
}
bool Instance::IsTerminal() const
bool Instance::isTerminal() const
// ******************************
{
return getMasterCell()->isTerminal();
}
bool Instance::IsLeaf() const
bool Instance::isLeaf() const
// **************************
{
return getMasterCell()->isLeaf();
@ -310,20 +310,20 @@ void Instance::unmaterialize()
}
}
void Instance::Invalidate(bool propagateFlag)
void Instance::invalidate(bool propagateFlag)
// ******************************************
{
Inherit::Invalidate(false);
Inherit::invalidate(false);
if (propagateFlag) {
for_each_plug(plug, getConnectedPlugs()) {
plug->Invalidate(true);
plug->invalidate(true);
end_for;
}
}
}
void Instance::Translate(const Unit& dx, const Unit& dy)
void Instance::translate(const Unit& dx, const Unit& dy)
// *****************************************************
{
if ((dx != 0) || (dy !=0)) {
@ -331,11 +331,11 @@ void Instance::Translate(const Unit& dx, const Unit& dy)
Unit x = translation.getX() + dx;
Unit y = translation.getY() + dy;
Transformation::Orientation orientation = _transformation.getOrientation();
SetTransformation(Transformation(x, y, orientation));
setTransformation(Transformation(x, y, orientation));
}
}
void Instance::SetName(const Name& name)
void Instance::setName(const Name& name)
// *************************************
{
if (name != _name) {
@ -351,16 +351,16 @@ void Instance::SetName(const Name& name)
}
}
void Instance::SetTransformation(const Transformation& transformation)
void Instance::setTransformation(const Transformation& transformation)
// *******************************************************************
{
if (transformation != _transformation) {
Invalidate(true);
invalidate(true);
_transformation = transformation;
}
}
void Instance::SetPlacementStatus(const PlacementStatus& placementstatus)
void Instance::setPlacementStatus(const PlacementStatus& placementstatus)
// **********************************************************************
{
// if (placementstatus != _placementStatus) {
@ -369,7 +369,7 @@ void Instance::SetPlacementStatus(const PlacementStatus& placementstatus)
// }
}
void Instance::SetMasterCell(Cell* masterCell, bool secureFlag)
void Instance::setMasterCell(Cell* masterCell, bool secureFlag)
// ************************************************************
{
if (masterCell != _masterCell) {
@ -398,7 +398,7 @@ void Instance::SetMasterCell(Cell* masterCell, bool secureFlag)
end_for;
}
Invalidate(true);
invalidate(true);
for_each_plug(plug, getUnconnectedPlugs()) {
plug->_destroy();

22
hurricane/src/hurricane/Instance.h
View File

@ -123,11 +123,11 @@ class Instance : public Go {
// Predicates
// **********
public: bool IsUnplaced() const {return _placementStatus == PlacementStatus::UNPLACED;};
public: bool IsPlaced() const {return _placementStatus == PlacementStatus::PLACED;};
public: bool IsFixed() const {return _placementStatus == PlacementStatus::FIXED;};
public: bool IsTerminal() const;
public: bool IsLeaf() const;
public: bool isUnplaced() const {return _placementStatus == PlacementStatus::UNPLACED;};
public: bool isPlaced() const {return _placementStatus == PlacementStatus::PLACED;};
public: bool isFixed() const {return _placementStatus == PlacementStatus::FIXED;};
public: bool isTerminal() const;
public: bool isLeaf() const;
// Filters
// *******
@ -145,13 +145,13 @@ class Instance : public Go {
public: virtual void materialize();
public: virtual void unmaterialize();
public: virtual void Invalidate(bool propagateFlag = true);
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void invalidate(bool propagateFlag = true);
public: virtual void translate(const Unit& dx, const Unit& dy);
public: void SetName(const Name& name);
public: void SetTransformation(const Transformation& transformation);
public: void SetPlacementStatus(const PlacementStatus& placementstatus);
public: void SetMasterCell(Cell* masterCell, bool secureFlag = true);
public: void setName(const Name& name);
public: void setTransformation(const Transformation& transformation);
public: void setPlacementStatus(const PlacementStatus& placementstatus);
public: void setMasterCell(Cell* masterCell, bool secureFlag = true);
// Others
// ******

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

@ -198,7 +198,7 @@ Interval& Interval::Intersection(const Interval& interval)
return *this;
}
Interval& Interval::Translate(const Unit& dv)
Interval& Interval::translate(const Unit& dv)
// ******************************************
{
if (!IsEmpty()) {

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

@ -77,7 +77,7 @@ class Interval {
public: Interval& Merge(const Interval& interval);
public: Interval& Intersection(const Unit& vMin, const Unit& vMax);
public: Interval& Intersection(const Interval& interval);
public: Interval& Translate(const Unit& dv);
public: Interval& translate(const Unit& dv);
// Others
// ******

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

@ -471,7 +471,7 @@ void Net::SetPosition(const Point& position)
{
if (_position != position) {
for_each_plug(plug, getSlavePlugs()) {
plug->Invalidate(true);
plug->invalidate(true);
end_for;
}
_position = position;

6
hurricane/src/hurricane/Pad.cpp
View File

@ -78,11 +78,11 @@ Box Pad::getBoundingBox(const BasicLayer* basicLayer) const
return boundingBox;
}
void Pad::Translate(const Unit& dx, const Unit& dy)
void Pad::translate(const Unit& dx, const Unit& dy)
// ************************************************
{
if ((dx != 0) || (dy != 0)) {
Invalidate(true);
invalidate(true);
_boundingBox.translate(dx, dy);
}
}
@ -94,7 +94,7 @@ void Pad::SetBoundingBox(const Box& boundingBox)
throw Error("Can't set bounding box : empty bounding box");
if (boundingBox != _boundingBox) {
Invalidate(true);
invalidate(true);
_boundingBox = boundingBox;
}
}

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

@ -53,7 +53,7 @@ class Pad : public Component {
// Updators
// ********
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void translate(const Unit& dx, const Unit& dy);
public: void SetBoundingBox(const Box& boundingBox);
// Others

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

@ -51,7 +51,7 @@ void Pin::SetPlacementStatus(const PlacementStatus& placementstatus)
// **********************************************************************
{
if (placementstatus != _placementStatus) {
Invalidate(true);
invalidate(true);
_placementStatus = placementstatus;
}
}

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

@ -73,7 +73,7 @@ class Plug : public Component {
// Updators
// ********
public: virtual void Translate(const Unit& dx, const Unit& dy) {};
public: virtual void translate(const Unit& dx, const Unit& dy) {};
public: void SetNet(Net* net);

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

@ -58,11 +58,11 @@ Box Reference::getBoundingBox() const
return Box(_point).inflate(_extend);
}
void Reference::Translate(const Unit& dx, const Unit& dy)
void Reference::translate(const Unit& dx, const Unit& dy)
// *****************************************************
{
if ((dx != 0) || (dy != 0)) {
Invalidate(false);
invalidate(false);
_point.translate(dx, dy);
}
}

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

@ -51,7 +51,7 @@ class Reference : public Marker {
// Updators
// ********
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void translate(const Unit& dx, const Unit& dy);
// Others
// ******

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

@ -2368,7 +2368,7 @@ void Region::SwapLine::progress(int n)
}
}
void Region::SwapLine::Translate(const Unit& quantity)
void Region::SwapLine::translate(const Unit& quantity)
// ***************************************************
{
if (quantity) SetPosition(getPosition() + quantity);
@ -2758,7 +2758,7 @@ Region& Region::Inflate(const Unit& quantity)
return *this;
}
Region& Region::Translate(const Unit& dx, const Unit& dy)
Region& Region::translate(const Unit& dx, const Unit& dy)
// ******************************************************
{
if ((dx != 0) || (dy != 0)) {

4
hurricane/src/hurricane/Region.h
View File

@ -99,7 +99,7 @@ class Region {
// ********
public: void progress(int n = 1);
public: void Translate(const Unit& quantity);
public: void translate(const Unit& quantity);
public: void SetPosition(const Unit& position);
// Others
@ -184,7 +184,7 @@ class Region {
public: Region& getIntersection(const Region& region);
public: Region& Inflate(const Unit& quantity);
public: Region& Translate(const Unit& dx, const Unit& dy);
public: Region& translate(const Unit& dx, const Unit& dy);
public: bool VerticalEnhancement();
public: bool VerticalEnhancement(Point point);

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

@ -175,11 +175,11 @@ Point RoutingPad::getCenter() const
}
void RoutingPad::Translate(const Unit& dx, const Unit& dy)
void RoutingPad::translate(const Unit& dx, const Unit& dy)
// ****************************************************
{
if ((dx != 0) || (dy != 0)) {
Invalidate(true);
invalidate(true);
_x += dx;
_y += dy;
}
@ -212,7 +212,7 @@ void RoutingPad::SetPosition(const Point& position)
void RoutingPad::SetOffset(const Unit& x, const Unit& y)
// ****************************************************
{
Invalidate(true);
invalidate(true);
_x = x;
_y = y;
}
@ -276,7 +276,7 @@ Segment* RoutingPad::_getEntityAsSegment () const
void RoutingPad::SetExternalComponent(Component* component)
// ********************************************************
{
if (isMaterialized()) Invalidate(false);
if (isMaterialized()) invalidate(false);
Occurrence plugOccurrence = getPlugOccurrence();
Plug* plug= static_cast<Plug*>(plugOccurrence.getEntity());

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

@ -71,7 +71,7 @@ class RoutingPad : public Component {
// Updators
// ********
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void translate(const Unit& dx, const Unit& dy);
public: void SetX(const Unit& x);
public: void SetY(const Unit& y);

10
hurricane/src/hurricane/Rubber.cpp
View File

@ -117,7 +117,7 @@ void Rubber::unmaterialize()
}
}
void Rubber::Translate(const Unit& dx, const Unit& dy)
void Rubber::translate(const Unit& dx, const Unit& dy)
// ***************************************************
{
}
@ -228,7 +228,7 @@ void Rubber::_setHook(Hook* hook)
void Rubber::_Capture()
// ********************
{
Invalidate();
invalidate();
_count++;
}
@ -236,15 +236,15 @@ void Rubber::_Release()
// ********************
{
if (_count != ((unsigned)-1)) { // not in deletion
Invalidate();
invalidate();
if ((--_count) == 1) _destroy();
}
}
void Rubber::Invalidate(bool propagateFlag)
void Rubber::invalidate(bool propagateFlag)
// ****************************************
{
Inherit::Invalidate(false);
Inherit::invalidate(false);
_boundingBox.makeEmpty();
}

4
hurricane/src/hurricane/Rubber.h
View File

@ -66,8 +66,8 @@ class Rubber : public Go {
public: virtual void materialize();
public: virtual void unmaterialize();
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void Invalidate(bool propagateFlag = true);
public: virtual void translate(const Unit& dx, const Unit& dy);
public: virtual void invalidate(bool propagateFlag = true);
// Others
// ******

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

@ -248,7 +248,7 @@ void Segment::SetLayer(Layer* layer)
throw Error("Can't set layer : null layer");
if (layer != _layer) {
Invalidate(false);
invalidate(false);
_layer = layer;
}
}
@ -257,7 +257,7 @@ void Segment::SetWidth(const Unit& width)
// **************************************
{
if (width != _width) {
Invalidate(false);
invalidate(false);
_width = width;
}
}

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

@ -115,13 +115,13 @@ void UpdateSession::onNotOwned()
// ****************************************************************************************************
// Go::Invalidate implementation : located here to access UPDATOR_STACK variable
// Go::invalidate implementation : located here to access UPDATOR_STACK variable
// ****************************************************************************************************
void Go::Invalidate(bool propagateFlag)
void Go::invalidate(bool propagateFlag)
// ************************************
{
// trace << "Invalidate(" << this << ")" << endl;
// trace << "invalidate(" << this << ")" << endl;
// trace_in();
if (!UPDATOR_STACK || UPDATOR_STACK->empty())
@ -139,7 +139,7 @@ void Go::Invalidate(bool propagateFlag)
getCell()->_getSlaveEntities(this,it,end);
for(; it != end ; it++) {
Go* go = dynamic_cast<Go*>(it->second);
if (go) go->Invalidate(propagateFlag);
if (go) go->invalidate(propagateFlag);
}
if (isMaterialized()) {

14
hurricane/src/hurricane/Vertical.cpp
View File

@ -104,11 +104,11 @@ Point Vertical::getCenter() const
return Point ( getX(), (getSourceY()+getTargetY())/2 );
}
void Vertical::Translate(const Unit& dx, const Unit& dy)
void Vertical::translate(const Unit& dx, const Unit& dy)
// *****************************************************
{
if (dx != 0) {
Invalidate(true);
invalidate(true);
_x += dx;
}
}
@ -117,7 +117,7 @@ void Vertical::SetX(const Unit& x)
// *******************************
{
if (x != _x) {
Invalidate(true);
invalidate(true);
_x = x;
}
}
@ -126,7 +126,7 @@ void Vertical::SetDySource(const Unit& dySource)
// *********************************************
{
if (dySource != _dySource) {
Invalidate(false);
invalidate(false);
_dySource = dySource;
}
}
@ -135,16 +135,16 @@ void Vertical::SetDyTarget(const Unit& dyTarget)
// *********************************************
{
if (dyTarget != _dyTarget) {
Invalidate(false);
invalidate(false);
_dyTarget = dyTarget;
}
}
void Vertical::Translate(const Unit& dx)
void Vertical::translate(const Unit& dx)
// *************************************
{
if (dx != 0) {
Invalidate(true);
invalidate(true);
_x += dx;
}
}

4
hurricane/src/hurricane/Vertical.h
View File

@ -59,12 +59,12 @@ class Vertical : public Segment {
// Updators
// ********
public: virtual void Translate(const Unit& dx, const Unit& dy);
public: virtual void translate(const Unit& dx, const Unit& dy);
public: void SetX(const Unit& x);
public: void SetDySource(const Unit& dySource);
public: void SetDyTarget(const Unit& dyTarget);
public: void Translate(const Unit& dx);
public: void translate(const Unit& dx);
// Others
// ******

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

@ -93,9 +93,9 @@ extern "C" {
// Standart Predicates (Attributes).
DirectGetBoolAttribute(PyBox_IsEmpty ,isEmpty ,PyBox,Box)
DirectGetBoolAttribute(PyBox_IsFlat ,isFlat ,PyBox,Box)
DirectGetBoolAttribute(PyBox_IsPonctual,isPonctual,PyBox,Box)
DirectGetBoolAttribute(PyBox_isEmpty ,isEmpty ,PyBox,Box)
DirectGetBoolAttribute(PyBox_isFlat ,isFlat ,PyBox,Box)
DirectGetBoolAttribute(PyBox_isPonctual,isPonctual,PyBox,Box)
// Standart Destroy (Attribute).
@ -179,13 +179,13 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyBox_Contains ()"
// Attribute Method : "PyBox_contains ()"
static PyObject* PyBox_Contains ( PyBox *self, PyObject* args )
static PyObject* PyBox_contains ( PyBox *self, PyObject* args )
{
trace << "PyBox_Contains ()" << endl;
trace << "PyBox_contains ()" << endl;
METHOD_HEAD ( "Box.Contains()" )
METHOD_HEAD ( "Box.contains()" )
PyObject* arg0;
PyObject* arg1;
@ -193,8 +193,8 @@ extern "C" {
HTRY
__cs.Init ("Box.Contains");
if ( ! PyArg_ParseTuple(args,"|O&O&:Box.Contains",Converter,&arg0,Converter,&arg1) )
__cs.Init ("Box.contains");
if ( ! PyArg_ParseTuple(args,"|O&O&:Box.contains",Converter,&arg0,Converter,&arg1) )
return ( NULL );
if ( __cs.getObjectIds() == BOX_ARG ) { result = box->contains ( *PYBOX_O(arg0) ); }
@ -202,7 +202,7 @@ extern "C" {
else if ( __cs.getObjectIds() == INTS2_ARG ) { result = box->contains ( PyInt_AsLong(arg0)
, PyInt_AsLong(arg1) ); }
else {
PyErr_SetString ( ConstructorError, "invalid number of parameters for Box.Contains constructor." );
PyErr_SetString ( ConstructorError, "invalid number of parameters for Box.contains constructor." );
return ( NULL );
}
@ -215,18 +215,18 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyBox_Intersect ()"
// Attribute Method : "PyBox_intersect ()"
static PyObject* PyBox_Intersect ( PyBox *self, PyObject* args )
static PyObject* PyBox_intersect ( PyBox *self, PyObject* args )
{
trace << "PyBox_Intersect ()" << endl;
trace << "PyBox_intersect ()" << endl;
METHOD_HEAD ( "Box.Intersect()" )
METHOD_HEAD ( "Box.intersect()" )
PyBox* otherPyBox;
HTRY
if ( ! ParseOneArg ( "Box.Intersect", args, BOX_ARG, (PyObject**)&otherPyBox ) ) return ( NULL );
if ( ! ParseOneArg ( "Box.intersect", args, BOX_ARG, (PyObject**)&otherPyBox ) ) return ( NULL );
HCATCH
return ( Py_BuildValue("i",(long)box->intersect(*PYBOX_O(otherPyBox))) );
@ -236,18 +236,18 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyBox_IsConstrainedBy ()"
// Attribute Method : "PyBox_isConstrainedBy ()"
static PyObject* PyBox_IsConstrainedBy ( PyBox *self, PyObject* args )
static PyObject* PyBox_isConstrainedBy ( PyBox *self, PyObject* args )
{
trace << "PyBox_IsConstrainedBy ()" << endl;
trace << "PyBox_isConstrainedBy ()" << endl;
METHOD_HEAD ( "Box.IsConstrainedBy()" )
METHOD_HEAD ( "Box.isConstrainedBy()" )
PyBox* otherPyBox;
HTRY
if ( ! ParseOneArg ( "Box.getIsConstrainedBy", args, BOX_ARG, (PyObject**)&otherPyBox ) ) return ( NULL );
if ( ! ParseOneArg ( "Box.getisConstrainedBy", args, BOX_ARG, (PyObject**)&otherPyBox ) ) return ( NULL );
HCATCH
return ( Py_BuildValue("i",(long)box->isConstrainedBy(*PYBOX_O(otherPyBox))) );
@ -257,14 +257,14 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyBox_MakeEmpty ()"
// Attribute Method : "PyBox_makeEmpty ()"
static PyObject* PyBox_MakeEmpty ( PyBox *self, PyObject* args )
static PyObject* PyBox_makeEmpty ( PyBox *self, PyObject* args )
{
trace << "PyBox_MakeEmpty ()" << endl;
trace << "PyBox_makeEmpty ()" << endl;
HTRY
METHOD_HEAD ( "Box.MakeEmpty()" )
METHOD_HEAD ( "Box.makeEmpty()" )
if ( ! PyArg_ParseTuple ( args,":Box" ) ) return ( NULL );
box->makeEmpty ();
@ -279,13 +279,13 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyBox_Inflate ()"
// Attribute Method : "PyBox_inflate ()"
static PyObject* PyBox_Inflate ( PyBox *self, PyObject* args )
static PyObject* PyBox_inflate ( PyBox *self, PyObject* args )
{
trace << "PyBox_Inflate ()" << endl;
trace << "PyBox_inflate ()" << endl;
METHOD_HEAD ( "Box.Inflate()" )
METHOD_HEAD ( "Box.inflate()" )
PyObject* arg0;
PyObject* arg1;
@ -294,8 +294,8 @@ extern "C" {
HTRY
__cs.Init ("Box.Inflate");
if ( ! PyArg_ParseTuple(args,"|O&O&O&O&:Box.Inflate",Converter,&arg0,Converter,&arg1) )
__cs.Init ("Box.inflate");
if ( ! PyArg_ParseTuple(args,"|O&O&O&O&:Box.inflate",Converter,&arg0,Converter,&arg1) )
return ( NULL );
if ( __cs.getObjectIds() == INT_ARG ) { box->inflate ( PyInt_AsLong(arg0) ); }
@ -306,7 +306,7 @@ extern "C" {
, PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) ); }
else {
PyErr_SetString ( ConstructorError, "invalid number of parameters for Box.Inflate()" );
PyErr_SetString ( ConstructorError, "invalid number of parameters for Box.inflate()" );
return ( NULL );
}
@ -321,13 +321,13 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyBox_Merge ()"
// Attribute Method : "PyBox_merge ()"
static PyObject* PyBox_Merge ( PyBox *self, PyObject* args )
static PyObject* PyBox_merge ( PyBox *self, PyObject* args )
{
trace << "Box_Merge()" << endl;
trace << "Box_merge()" << endl;
METHOD_HEAD ( "Box.Merge()" )
METHOD_HEAD ( "Box.merge()" )
PyObject* arg0;
PyObject* arg1;
@ -336,8 +336,8 @@ extern "C" {
HTRY
__cs.Init ("Box.Merge");
if ( ! PyArg_ParseTuple(args,"|O&O&O&O&:Box.Merge",Converter,&arg0,Converter,&arg1,Converter,&arg2,Converter,&arg3) )
__cs.Init ("Box.merge");
if ( ! PyArg_ParseTuple(args,"|O&O&O&O&:Box.merge",Converter,&arg0,Converter,&arg1,Converter,&arg2,Converter,&arg3) )
return ( NULL );
if ( __cs.getObjectIds() == POINT_ARG ) { box->merge ( *PYPOINT_O(arg0) ); }
@ -349,7 +349,7 @@ extern "C" {
, PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) ); }
else {
PyErr_SetString ( ConstructorError, "invalid number of parameters for Box.Merge()" );
PyErr_SetString ( ConstructorError, "invalid number of parameters for Box.merge()" );
return ( NULL );
}
@ -363,19 +363,19 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyBox_Translate ()"
// Attribute Method : "PyBox_translate ()"
static PyObject* PyBox_Translate ( PyBox *self, PyObject* args )
static PyObject* PyBox_translate ( PyBox *self, PyObject* args )
{
trace << "PyBox_Translate ()" << endl;
trace << "PyBox_translate ()" << endl;
METHOD_HEAD ( "Box.Translate()" )
METHOD_HEAD ( "Box.translate()" )
PyObject* arg0;
PyObject* arg1;
HTRY
if ( ! ParseTwoArg ( "Box.Translate", args, INTS2_ARG, &arg0, &arg1 ) ) return ( NULL );
if ( ! ParseTwoArg ( "Box.translate", args, INTS2_ARG, &arg0, &arg1 ) ) return ( NULL );
box->translate ( PyInt_AsLong(arg0), PyInt_AsLong(arg1) );
HCATCH
Py_RETURN_NONE;
@ -401,16 +401,16 @@ extern "C" {
, { "getHalfHeight" , (PyCFunction)PyBox_getHalfHeight , METH_NOARGS , "Return the box half height." }
, { "getUnion" , (PyCFunction)PyBox_getUnion , METH_VARARGS, "Return the smallest enclosing box." }
, { "getIntersection", (PyCFunction)PyBox_getIntersection, METH_VARARGS, "Return the overlapping area." }
, { "IsEmpty" , (PyCFunction)PyBox_IsEmpty , METH_NOARGS , "Return true if the box is empty." }
, { "IsFlat" , (PyCFunction)PyBox_IsFlat , METH_NOARGS , "Return true if the box is flat." }
, { "IsPonctual" , (PyCFunction)PyBox_IsPonctual , METH_NOARGS , "Return true if the box reduced to a point." }
, { "Contains" , (PyCFunction)PyBox_Contains , METH_VARARGS, "Return true if the box contains the argument." }
, { "Intersect" , (PyCFunction)PyBox_Intersect , METH_VARARGS, "Return true if two boxes overlap." }
, { "IsConstrainedBy", (PyCFunction)PyBox_IsConstrainedBy, METH_VARARGS, "Return true if the argment box is included and share at least a side." }
, { "MakeEmpty" , (PyCFunction)PyBox_MakeEmpty , METH_NOARGS , "Transform the box in an empty one." }
, { "Inflate" , (PyCFunction)PyBox_Inflate , METH_VARARGS, "Expand the box to contains the arguments." }
, { "Merge" , (PyCFunction)PyBox_Merge , METH_VARARGS, "Expand or contract the box to contains the arguments." }
, { "Translate" , (PyCFunction)PyBox_Translate , METH_VARARGS, "Translate the box od dx ans dy." }
, { "isEmpty" , (PyCFunction)PyBox_isEmpty , METH_NOARGS , "Return true if the box is empty." }
, { "isFlat" , (PyCFunction)PyBox_isFlat , METH_NOARGS , "Return true if the box is flat." }
, { "isPonctual" , (PyCFunction)PyBox_isPonctual , METH_NOARGS , "Return true if the box reduced to a point." }
, { "contains" , (PyCFunction)PyBox_contains , METH_VARARGS, "Return true if the box contains the argument." }
, { "intersect" , (PyCFunction)PyBox_intersect , METH_VARARGS, "Return true if two boxes overlap." }
, { "isConstrainedBy", (PyCFunction)PyBox_isConstrainedBy, METH_VARARGS, "Return true if the argment box is included and share at least a side." }
, { "makeEmpty" , (PyCFunction)PyBox_makeEmpty , METH_NOARGS , "Transform the box in an empty one." }
, { "inflate" , (PyCFunction)PyBox_inflate , METH_VARARGS, "Expand the box to contains the arguments." }
, { "merge" , (PyCFunction)PyBox_merge , METH_VARARGS, "Expand or contract the box to contains the arguments." }
, { "translate" , (PyCFunction)PyBox_translate , METH_VARARGS, "translate the box od dx ans dy." }
, { "destroy" , (PyCFunction)PyBox_destroy , METH_NOARGS
, "Destroy associated hurricane object, the python object remains." }
, {NULL, NULL, 0, NULL} /* sentinel */

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

@ -195,23 +195,20 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyInstance_SetPlacementStatus ()"
static PyObject* PyInstance_SetPlacementStatus ( PyInstance *self, PyObject* args ) {
trace << "PyInstance_SetPlacementStatus()" << endl;
METHOD_HEAD ( "Instance.SetPlacementStatus()" )
static PyObject* PyInstance_setPlacementStatus ( PyInstance *self, PyObject* args ) {
trace << "PyInstance_setPlacementStatus()" << endl;
METHOD_HEAD ( "Instance.setPlacementStatus()" )
HTRY
PyObject* arg0;
if ( ! ParseOneArg ( "Instance.SetPlacementStatus()", args, INT_ARG, (PyObject**)&arg0 ) ) return ( NULL );
if ( ! ParseOneArg ( "Instance.setPlacementStatus()", args, INT_ARG, (PyObject**)&arg0 ) ) return ( NULL );
instance->SetPlacementStatus ( PyInt_AsPlacementStatus(arg0) );
instance->setPlacementStatus ( PyInt_AsPlacementStatus(arg0) );
HCATCH
Py_RETURN_NONE;
}
// ---------------------------------------------------------------
// Attribute Method : "PyInstance_getTransformation ()"
@ -229,9 +226,6 @@ extern "C" {
return ( (PyObject*)resultPyTransf );
}
// ---------------------------------------------------------------
// Attribute Method : "PyInstance_getPlug ()"
@ -252,9 +246,6 @@ extern "C" {
return PyPlug_Link ( plug );
}
// ---------------------------------------------------------------
// Attribute Method : "PyInstance_getPlugsLocator ()"
@ -332,8 +323,7 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyInstance_getAbutmentBox ()"
static PyObject* PyInstance_getAbutmentBox ( PyInstance *self )
{
static PyObject* PyInstance_getAbutmentBox ( PyInstance *self ) {
trace << "PyInstance_getAbutmentBox ()" << endl;
METHOD_HEAD ( "Instance.getAbutmentBox()" )
@ -351,18 +341,17 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyInstance_SetName ()"
// Attribute Method : "PyInstance_setName ()"
static PyObject* PyInstance_SetName ( PyInstance *self, PyObject* args )
{
trace << "PyInstance_SetName()" << endl;
METHOD_HEAD ( "Instance.SetName()" )
static PyObject* PyInstance_setName ( PyInstance *self, PyObject* args ) {
trace << "PyInstance_setName()" << endl;
METHOD_HEAD ( "Instance.setName()" )
HTRY
PyName* name;
if ( ! ParseOneArg ( "Instance.SetName", args, NAME_ARG, (PyObject**)&name ) ) return ( NULL );
if ( ! ParseOneArg ( "Instance.setName", args, NAME_ARG, (PyObject**)&name ) ) return ( NULL );
instance->SetName ( *PYNAME_O(name) );
instance->setName ( *PYNAME_O(name) );
HCATCH
Py_RETURN_NONE;
@ -373,16 +362,15 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyInstance_SetTransformation ()"
static PyObject* PyInstance_SetTransformation ( PyInstance *self, PyObject* args )
{
trace << "PyInstance_SetTransformation()" << endl;
METHOD_HEAD ( "Instance.SetTransformation()" )
static PyObject* PyInstance_setTransformation ( PyInstance *self, PyObject* args ) {
trace << "PyInstance_setTransformation()" << endl;
METHOD_HEAD ( "Instance.setTransformation()" )
HTRY
PyTransformation* transformation;
if ( ! ParseOneArg ( "Instance.SetTransformation", args, TRANS_ARG, (PyObject**)&transformation ) ) return ( NULL );
if ( ! ParseOneArg ( "Instance.setTransformation", args, TRANS_ARG, (PyObject**)&transformation ) ) return ( NULL );
instance->SetTransformation ( *PYTRANSFORMATION_O(transformation) );
instance->setTransformation ( *PYTRANSFORMATION_O(transformation) );
HCATCH
Py_RETURN_NONE;
@ -394,26 +382,25 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyInstance_SetMasterCell ()"
static PyObject* PyInstance_SetMasterCell ( PyInstance *self, PyObject* args )
{
trace << "Instance.SetMasterCell()" << endl;
METHOD_HEAD ( "Instance.SetMasterCell()" )
static PyObject* PyInstance_setMasterCell ( PyInstance *self, PyObject* args ) {
trace << "Instance.setMasterCell()" << endl;
METHOD_HEAD ( "Instance.setMasterCell()" )
HTRY
PyCell* masterCell;
if ( ! ParseOneArg ( "Instance.SetMasterCell", args, CELL_ARG, (PyObject**)&masterCell ) ) return ( NULL );
if ( ! ParseOneArg ( "Instance.setMasterCell", args, CELL_ARG, (PyObject**)&masterCell ) ) return ( NULL );
instance->SetMasterCell ( PYCELL_O(masterCell) );
instance->setMasterCell ( PYCELL_O(masterCell) );
HCATCH
Py_RETURN_NONE;
}
// Standart Predicates (Attributes).
DirectGetBoolAttribute(PyInstance_IsTerminal ,IsTerminal ,PyInstance,Instance)
DirectGetBoolAttribute(PyInstance_IsLeaf ,IsLeaf ,PyInstance,Instance)
DirectGetBoolAttribute(PyInstance_isTerminal ,isTerminal ,PyInstance,Instance)
DirectGetBoolAttribute(PyInstance_isLeaf ,isLeaf ,PyInstance,Instance)
GetBoundStateAttribute(PyInstance_IsPyBound ,PyInstance,Instance)
GetBoundStateAttribute(PyInstance_isPyBound ,PyInstance,Instance)
@ -429,16 +416,14 @@ extern "C" {
, { "getPlugsLocator" , (PyCFunction)PyInstance_getPlugsLocator , METH_NOARGS , "Returns the collection of instance plugs." }
, { "getConnectedPlugsLocator" , (PyCFunction)PyInstance_getConnectedPlugsLocator , METH_NOARGS , "Returns the collection of instance plugs which are effectively connected." }
, { "getUnconnectedPlugsLocator", (PyCFunction)PyInstance_getUnconnectedPlugsLocator, METH_NOARGS , "Returns the collection of instance plugs which are not connected." }
//, { "getPath" , (PyCFunction)PyInstance_getPath , METH_NOARGS , "Returns the path composed of the instance solely." }
//, { "getPath" , (PyCFunction)PyInstance_getPath , METH_VARARGS, "Returns the path resulting of the concatenation of the instance and the tail path (possibly empty)." }
, { "getAbutmentBox" , (PyCFunction)PyInstance_getAbutmentBox , METH_NOARGS , "Returns the abutment box of the instance, that is the abutment box of the master cell to which has been applied the instance transformation." }
, { "IsTerminal" , (PyCFunction)PyInstance_IsTerminal , METH_NOARGS , "Returns true if the instance is a terminal instance." }
, { "IsLeaf" , (PyCFunction)PyInstance_IsLeaf , METH_NOARGS , "Returns true if the instance is a leaf instance." }
, { "IsBound" , (PyCFunction)PyInstance_IsPyBound , METH_NOARGS, "Returns true if the instance is bounded to the hurricane instance" }
, { "SetName" , (PyCFunction)PyInstance_SetName , METH_VARARGS, "Allows to change the instance name." }
, { "SetTransformation" , (PyCFunction)PyInstance_SetTransformation , METH_VARARGS, "Allows to modify the instance transformation." }
, { "SetPlacementStatus" , (PyCFunction)PyInstance_SetPlacementStatus , METH_VARARGS, "Allows to modify the instance placement status." }
, { "SetMasterCell" , (PyCFunction)PyInstance_SetMasterCell , METH_VARARGS, "Allows to change the cell referenced by this instance." }
, { "isTerminal" , (PyCFunction)PyInstance_isTerminal , METH_NOARGS , "Returns true if the instance is a terminal instance." }
, { "isLeaf" , (PyCFunction)PyInstance_isLeaf , METH_NOARGS , "Returns true if the instance is a leaf instance." }
, { "isBound" , (PyCFunction)PyInstance_isPyBound , METH_NOARGS, "Returns true if the instance is bounded to the hurricane instance" }
, { "setName" , (PyCFunction)PyInstance_setName , METH_VARARGS, "Allows to change the instance name." }
, { "setTransformation" , (PyCFunction)PyInstance_setTransformation , METH_VARARGS, "Allows to modify the instance transformation." }
, { "setPlacementStatus" , (PyCFunction)PyInstance_setPlacementStatus , METH_VARARGS, "Allows to modify the instance placement status." }
, { "setMasterCell" , (PyCFunction)PyInstance_setMasterCell , METH_VARARGS, "Allows to change the cell referenced by this instance." }
, { "destroy" , (PyCFunction)PyInstance_destroy , METH_NOARGS
, "Destroy associated hurricane object The python object remains." }
, {NULL, NULL, 0, NULL} /* sentinel */

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

@ -140,22 +140,21 @@ extern "C" {
// ---------------------------------------------------------------
// Attribute Method : "PyReference_Translate ()"
// Attribute Method : "PyReference_translate ()"
static PyObject* PyReference_Translate ( PyReference *self, PyObject* args )
{
trace << "PyReference_Translate ()" << endl;
static PyObject* PyReference_translate ( PyReference *self, PyObject* args ) {
trace << "PyReference_translate ()" << endl;
METHOD_HEAD ( "Reference.Translate()" )
METHOD_HEAD ( "Reference.translate()" )
PyObject* arg0;
PyObject* arg1;
HTRY
if ( ! ParseTwoArg ( "Reference.Translate", args, INTS2_ARG, &arg0, &arg1 ) ) return ( NULL );
if ( ! ParseTwoArg ( "Reference.translate", args, INTS2_ARG, &arg0, &arg1 ) ) return ( NULL );
reference->Translate ( PyInt_AsLong(arg0), PyInt_AsLong(arg1) );
reference->translate ( PyInt_AsLong(arg0), PyInt_AsLong(arg1) );
HCATCH
@ -173,7 +172,7 @@ extern "C" {
, "destroy associated hurricane object, the python object remains." }
, { "getName" , (PyCFunction)PyReference_getName , METH_NOARGS , "Returns the name of the reference." }
, { "getPoint" , (PyCFunction)PyReference_getPoint , METH_NOARGS , "Return the reference point." }
, { "Translate" , (PyCFunction)PyReference_Translate , METH_VARARGS, "Translate the reference of dx and dy." }
, { "translate" , (PyCFunction)PyReference_translate , METH_VARARGS, "Translate the reference of dx and dy." }
, {NULL, NULL, 0, NULL} /* sentinel */
};