some cleaning again
This commit is contained in:
parent
98778c4dbd
commit
cb9260599c
|
@ -493,7 +493,7 @@ END_IF
|
|||
switch(transistor->getAbutmentType().getCode()) {
|
||||
|
||||
case Transistor::Type::INTERNAL :
|
||||
transistor->SetAbutmentBox( Box(GET_BOX(string("20")).getXCenter()
|
||||
transistor->setAbutmentBox( Box(GET_BOX(string("20")).getXCenter()
|
||||
, transistor->getBoundingBox().getYMin()
|
||||
, GET_BOX(string("40")).getXCenter()
|
||||
, transistor->getBoundingBox().getYMax()
|
||||
|
@ -502,7 +502,7 @@ END_IF
|
|||
break;
|
||||
|
||||
case Transistor::Type::LEFT:
|
||||
transistor->SetAbutmentBox( Box(GET_BOX(string("11")).getXMin()
|
||||
transistor->setAbutmentBox( Box(GET_BOX(string("11")).getXMin()
|
||||
, transistor->getBoundingBox().getYMin()
|
||||
, GET_BOX(string("40")).getXCenter()
|
||||
, transistor->getBoundingBox().getYMax()
|
||||
|
@ -511,7 +511,7 @@ END_IF
|
|||
break ;
|
||||
|
||||
case Transistor::Type::RIGHT:
|
||||
transistor->SetAbutmentBox( Box(GET_BOX(string("20")).getXCenter()
|
||||
transistor->setAbutmentBox( Box(GET_BOX(string("20")).getXCenter()
|
||||
, transistor->getBoundingBox().getYMin()
|
||||
, GET_BOX(string("11")).getXMax()
|
||||
, transistor->getBoundingBox().getYMax()
|
||||
|
@ -520,7 +520,7 @@ END_IF
|
|||
break ;
|
||||
|
||||
case Transistor::Type::SINGLE:
|
||||
transistor->SetAbutmentBox( Box(GET_BOX(string("11")).getXMin()
|
||||
transistor->setAbutmentBox( Box(GET_BOX(string("11")).getXMin()
|
||||
, transistor->getBoundingBox().getYMin()
|
||||
, GET_BOX(string("11")).getXMax()
|
||||
, transistor->getBoundingBox().getYMax()
|
||||
|
|
|
@ -85,7 +85,7 @@ void MetaTransistor::createLayout()
|
|||
throw Error("Can't generate layout : " + getString(this) + " hasn't been dimensionned");
|
||||
}
|
||||
|
||||
SetTerminal(false);
|
||||
setTerminal(false);
|
||||
|
||||
Transistor * internal_ref = NULL;
|
||||
Transistor * left_ref = NULL;
|
||||
|
@ -136,7 +136,7 @@ void MetaTransistor::createLayout()
|
|||
end_for
|
||||
|
||||
|
||||
Materialize();
|
||||
materialize();
|
||||
// CloseUpdateSession();
|
||||
|
||||
}
|
||||
|
|
|
@ -372,14 +372,14 @@ void Transistor::createLayout()
|
|||
break;
|
||||
}
|
||||
|
||||
SetTerminal(false);
|
||||
setTerminal(false);
|
||||
|
||||
// Launch the selected algorithme.
|
||||
// ******************************
|
||||
_genTrans->Calculate(this);
|
||||
_genTrans->Generate(this);
|
||||
|
||||
Materialize();
|
||||
materialize();
|
||||
|
||||
delete _genTrans;
|
||||
_genTrans = NULL;
|
||||
|
@ -392,7 +392,7 @@ void Transistor::DuplicateLayout(Transistor* transistor)
|
|||
{
|
||||
OpenUpdateSession();
|
||||
|
||||
SetTerminal(false);
|
||||
setTerminal(false);
|
||||
|
||||
Net * tmp = NULL;
|
||||
Contact * con = NULL;
|
||||
|
@ -422,7 +422,7 @@ void Transistor::DuplicateLayout(Transistor* transistor)
|
|||
end_for
|
||||
end_for
|
||||
|
||||
SetAbutmentBox(transistor->getAbutmentBox());
|
||||
setAbutmentBox(transistor->getAbutmentBox());
|
||||
|
||||
_mapNet2Box.clear();
|
||||
|
||||
|
@ -434,7 +434,7 @@ void Transistor::DuplicateLayout(Transistor* transistor)
|
|||
i++;
|
||||
}
|
||||
|
||||
Materialize();
|
||||
materialize();
|
||||
|
||||
CloseUpdateSession();
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ static void getAllCells(Cell* cell)
|
|||
{
|
||||
cellSet.insert(cell);
|
||||
|
||||
if(!(cell->IsLeaf())){
|
||||
if(!(cell->isLeaf())){
|
||||
for_each_instance(instance, cell->getInstances())
|
||||
Cell * mastercell = instance->getMasterCell();
|
||||
getAllCells(mastercell);
|
||||
|
@ -131,7 +131,7 @@ void Device::_Place(Instance* ins, const Transformation::Orientation& orientatio
|
|||
}
|
||||
|
||||
|
||||
void Device::_SetRefIns(Instance* ins) const
|
||||
void Device::_setRefIns(Instance* ins) const
|
||||
// *****************************************
|
||||
{
|
||||
if(!ins) {
|
||||
|
|
|
@ -82,7 +82,7 @@ class Device : public Cell {
|
|||
// Description of Layout
|
||||
// **********************
|
||||
public: void _Place(Instance* ins, const Transformation::Orientation& orientation, const Point& point);
|
||||
public: void _SetRefIns(Instance*) const;
|
||||
public: void _setRefIns(Instance*) const;
|
||||
public: void _PlaceRight(Instance* ins, const Transformation::Orientation& orientation, const Point& offset=Point());
|
||||
|
||||
|
||||
|
|
|
@ -304,7 +304,7 @@ void TrMos::Generate(const unsigned m, const bool sourceisfirst, const bool hasr
|
|||
// Call function CreateLayout of MetaTransistor to launch the generator of finger.
|
||||
// *******************************************************************************
|
||||
|
||||
SetTerminal(false);
|
||||
setTerminal(false);
|
||||
//
|
||||
// IF_DEBUG_HUR_ANALOG
|
||||
// cout << endl;
|
||||
|
@ -331,8 +331,8 @@ void TrMos::Generate(const unsigned m, const bool sourceisfirst, const bool hasr
|
|||
|
||||
for_each_instance(instance, getInstances())
|
||||
//instance->SetTransformation(instance->getTransformation());
|
||||
instance->Unmaterialize();
|
||||
instance->Materialize();
|
||||
instance->unmaterialize();
|
||||
instance->materialize();
|
||||
|
||||
IF_DEBUG_HUR_ANALOG
|
||||
cout << ts << getString(instance) <<" 's boundingBox is " << getString(instance->getBoundingBox())<<endl;
|
||||
|
@ -346,7 +346,7 @@ IF_DEBUG_HUR_ANALOG
|
|||
cout << ts << getString(this) << " 's primary (without wire) boundingBox is " << getString(getBoundingBox()) <<endl;
|
||||
END_IF
|
||||
|
||||
Materialize();
|
||||
materialize();
|
||||
|
||||
IF_DEBUG_HUR_ANALOG
|
||||
cout << ts << getString(this) << " 's boundingBox is " << getString(getBoundingBox()) <<endl;
|
||||
|
|
|
@ -143,7 +143,7 @@ void TrMos::_PlaceAndRoute()
|
|||
else
|
||||
_Place( leftins, Transformation::Orientation::MX, Point(horizontalMargin, verticalLowMargin) );
|
||||
|
||||
_SetRefIns(leftins);
|
||||
_setRefIns(leftins);
|
||||
|
||||
if(_sourceIsFirst) // internal Finger's transformation.
|
||||
internalTransCode = Transformation::Orientation::MX;
|
||||
|
@ -186,8 +186,8 @@ void TrMos::_PlaceAndRoute()
|
|||
// Set AbutmentBox.
|
||||
// ****************
|
||||
for_each_instance(instance, getInstances())
|
||||
instance->Unmaterialize();
|
||||
instance->Materialize();
|
||||
instance->unmaterialize();
|
||||
instance->materialize();
|
||||
end_for
|
||||
|
||||
OpenUpdateSession();
|
||||
|
@ -195,7 +195,7 @@ void TrMos::_PlaceAndRoute()
|
|||
|
||||
cout <<"Bounding box of TrMos is "<<getString(getBoundingBox())<<endl;
|
||||
|
||||
SetAbutmentBox(Box(0, 0,
|
||||
setAbutmentBox(Box(0, 0,
|
||||
getBoundingBox().getWidth() + 2*horizontalMargin,
|
||||
getBoundingBox().getHeight() + verticalLowMargin + verticalHighMargin
|
||||
)
|
||||
|
@ -304,7 +304,7 @@ void TrMos::_PlaceAndRoute()
|
|||
Net * net = dynamic_cast<Net*>(occurrence.getEntity());
|
||||
Box routingZone;
|
||||
|
||||
if(net->getCell()->IsLeaf()) {
|
||||
if(net->getCell()->isLeaf()) {
|
||||
Transistor * trans = dynamic_cast<Transistor*>(net->getCell());
|
||||
if ( !trans )
|
||||
throw Error("Can't launch Trmos::PlaceAndRoute for " + getString(this)
|
||||
|
|
Loading…
Reference in New Issue