jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./crlcore: 

- Change: In RoutingLayerGauge, no longer throw exception when the position
        requested it outside the track grid. Instead returns first/last track
        index.
This commit is contained in:
Jean-Paul Chaput 2011-01-25 17:15:56 +00:00
parent b8e42d2efc
commit 10682d9c7c
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crlcore/src/ccore/RoutingLayerGauge.cpp
View File

@ -223,15 +223,19 @@ namespace CRL {
trace << "depth := " << depth << endl;
if ( depth < 0 )
throw Error ( negativeIndex
, getString(this).c_str()
, DbU::getValueString(position).c_str()
, DbU::getValueString(start).c_str()
, DbU::getValueString(stop).c_str()
);
if ( depth < 0 ) {
trace_out ();
return 0;
if ( ( mode & Constant::Exact ) && ( modulo != 0 ) )
// throw Error ( negativeIndex
// , getString(this).c_str()
// , DbU::getValueString(position).c_str()
// , DbU::getValueString(start).c_str()
// , DbU::getValueString(stop).c_str()
// );
}
if ( ( mode & Constant::Exact ) and ( modulo != 0 ) )
throw Error ( badExactPosition, getString(this).c_str(), DbU::getValueString(position).c_str() );
if ( mode & Constant::Superior ) {
@ -240,13 +244,17 @@ namespace CRL {
if ( modulo > _pitch / 2 ) depth++;
}
if ( (unsigned)depth >= getTrackNumber(start,stop) )
throw Error ( overflowIndex
, getString(this).c_str()
, DbU::getValueString(position).c_str()
, DbU::getValueString(start).c_str()
, DbU::getValueString(stop).c_str()
);
unsigned int tracksNumber = getTrackNumber(start,stop);
if ( (unsigned)depth >= tracksNumber ) {
trace_out ();
return (tracksNumber > 0) ? tracksNumber-1 : 0;
// throw Error ( overflowIndex
// , getString(this).c_str()
// , DbU::getValueString(position).c_str()
// , DbU::getValueString(start).c_str()
// , DbU::getValueString(stop).c_str()
// );
}
trace_out ();