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

Bug in Cell::_preDestroy(). 

* Bug: In Hurricane, in Cell::_preDestroy(), the classic mistake again:
    do not iterate over a collection while deleting it's elements.
    Now should be safe.
* Change: In CRL Core, set the default display style to "Alliance.Classic [black]"
    (my favorite).
This commit is contained in:
Jean-Paul Chaput 2016-02-23 17:19:42 +01:00
parent f28daec401
commit b57c81dda8
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crlcore/etc/common/display.conf
View File

@ -8,7 +8,7 @@ else:
poly2Color = 'Orange' poly2Color = 'Orange'
defaultStyle = 'Printer.Coriolis' defaultStyle = 'Alliance.Classic [black]'
stylesTable = \ stylesTable = \
( ( (Style , 'Alliance.Coriolis [black]', 'Alliance Coriolis Look - black background') ( ( (Style , 'Alliance.Coriolis [black]', 'Alliance Coriolis Look - black background')

15
hurricane/src/hurricane/Cell.cpp
View File

@ -936,15 +936,18 @@ void Cell::_preDestroy()
_slaveEntityMap.begin()->second->destroy(); _slaveEntityMap.begin()->second->destroy();
} }
//for ( View* view : getViews() ) view->setCell( NULL ); Markers markers = getMarkers (); while ( markers .getFirst() ) markers .getFirst()->destroy();
for ( Marker* marker : getMarkers() ) marker->destroy(); Instances instances = getSlaveInstances(); while ( instances.getFirst() ) instances.getFirst()->destroy();
for ( Instance* slaveInstance : getSlaveInstances() ) slaveInstance->destroy(); instances = getInstances (); while ( instances.getFirst() ) instances.getFirst()->destroy();
for ( Instance* instance : getInstances() ) instance->destroy();
for ( Net* net : getNets() ) { Nets nets = getNets();
while ( nets.getFirst() ) {
Net* net = nets.getFirst();
net->_getMainName().detachAll(); net->_getMainName().detachAll();
net->destroy(); net->destroy();
} }
for ( auto islave : _netAliasSet ) delete islave; for ( auto islave : _netAliasSet ) delete islave;
for ( Slice* slice : getSlices() ) slice->_destroy(); for ( Slice* slice : getSlices() ) slice->_destroy();
while ( not _extensionSlices.empty() ) _removeSlice( _extensionSlices.begin()->second ); while ( not _extensionSlices.empty() ) _removeSlice( _extensionSlices.begin()->second );

6
hurricane/src/isobar/hurricane/isobar/PyHurricane.h
View File

@ -1399,16 +1399,16 @@ extern "C" {
# define HCATCH \ # define HCATCH \
} \ } \
catch ( Warning& w ) { \ catch ( const Warning& w ) { \
std::string message = "\n" + getString(w); \ std::string message = "\n" + getString(w); \
PyErr_Warn ( HurricaneWarning, const_cast<char*>(message.c_str()) ); \ PyErr_Warn ( HurricaneWarning, const_cast<char*>(message.c_str()) ); \
} \ } \
catch ( Error& e ) { \ catch ( const Error& e ) { \
std::string message = "\n" + getString(e); \ std::string message = "\n" + getString(e); \
PyErr_SetString ( HurricaneError, message.c_str() ); \ PyErr_SetString ( HurricaneError, message.c_str() ); \
return NULL; \ return NULL; \
} \ } \
catch ( std::exception& e ) { \ catch ( const std::exception& e ) { \
std::string message = "\n" + std::string(e.what()); \ std::string message = "\n" + std::string(e.what()); \
PyErr_SetString ( HurricaneError, message.c_str() ); \ PyErr_SetString ( HurricaneError, message.c_str() ); \
return NULL; \ return NULL; \