From cb9260599c56bb91dff2eb9621344bc2bb5b0a42 Mon Sep 17 00:00:00 2001 From: Christophe Alexandre Date: Sat, 22 Mar 2008 13:19:38 +0000 Subject: [PATCH] some cleaning again --- chamsin/src/analogic/GenV1Trans.cpp | 8 ++++---- chamsin/src/analogic/MetaTransistor.cpp | 4 ++-- chamsin/src/analogic/Transistor.cpp | 10 +++++----- chamsin/src/device/Device.cpp | 4 ++-- chamsin/src/device/Device.h | 2 +- chamsin/src/device/TrMos.cpp | 8 ++++---- chamsin/src/device/TrMos_PlaceRoute.cpp | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/chamsin/src/analogic/GenV1Trans.cpp b/chamsin/src/analogic/GenV1Trans.cpp index d75146d0..765be92e 100644 --- a/chamsin/src/analogic/GenV1Trans.cpp +++ b/chamsin/src/analogic/GenV1Trans.cpp @@ -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() diff --git a/chamsin/src/analogic/MetaTransistor.cpp b/chamsin/src/analogic/MetaTransistor.cpp index e7589be6..9ffa3d3c 100644 --- a/chamsin/src/analogic/MetaTransistor.cpp +++ b/chamsin/src/analogic/MetaTransistor.cpp @@ -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(); } diff --git a/chamsin/src/analogic/Transistor.cpp b/chamsin/src/analogic/Transistor.cpp index 8a48385c..59d7ed11 100644 --- a/chamsin/src/analogic/Transistor.cpp +++ b/chamsin/src/analogic/Transistor.cpp @@ -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(); diff --git a/chamsin/src/device/Device.cpp b/chamsin/src/device/Device.cpp index 8bde8afc..e90aa914 100644 --- a/chamsin/src/device/Device.cpp +++ b/chamsin/src/device/Device.cpp @@ -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) { diff --git a/chamsin/src/device/Device.h b/chamsin/src/device/Device.h index 980c5ecf..669b1419 100644 --- a/chamsin/src/device/Device.h +++ b/chamsin/src/device/Device.h @@ -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()); diff --git a/chamsin/src/device/TrMos.cpp b/chamsin/src/device/TrMos.cpp index 7b50acf5..0559de5f 100644 --- a/chamsin/src/device/TrMos.cpp +++ b/chamsin/src/device/TrMos.cpp @@ -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())<Unmaterialize(); - instance->Materialize(); + instance->unmaterialize(); + instance->materialize(); end_for OpenUpdateSession(); @@ -195,7 +195,7 @@ void TrMos::_PlaceAndRoute() cout <<"Bounding box of TrMos is "<(occurrence.getEntity()); Box routingZone; - if(net->getCell()->IsLeaf()) { + if(net->getCell()->isLeaf()) { Transistor * trans = dynamic_cast(net->getCell()); if ( !trans ) throw Error("Can't launch Trmos::PlaceAndRoute for " + getString(this)