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

Working aspect ratio and feed cell loading in Etesian. 

* Bug: In Etesian::setDefaultAb(), the abutment box was miscalculated,
    it was always square.
* Bug: In Etesian::_postCreate(), improper loading of filler cells.
    Now we first try to find in memory (DataBase::getCell()) and if
    not found try to use the AllianceFramework loader.
      This is not a clean strategy. We should have something more
    clear.
This commit is contained in:
Jean-Paul Chaput 2018-01-10 17:46:11 +01:00
parent ba3ddafdf5
commit 19bdba0fcb
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etesian/src/EtesianEngine.cpp
View File

@ -279,17 +279,26 @@ namespace Etesian {
while ( not feedNames.empty() ) { while ( not feedNames.empty() ) {
size_t cut = feedNames.find( separator ); size_t cut = feedNames.find( separator );
string feedName;
if (cut != string::npos) { if (cut != string::npos) {
_feedCells.useFeed( DataBase::getDB()->getCell( feedNames.substr(0,cut) ) ); feedName = feedNames.substr( 0, cut );
feedNames = feedNames.substr( cut+1 ); feedNames = feedNames.substr( cut+1 );
} else { } else {
_feedCells.useFeed( AllianceFramework::get()->getCell( feedNames, Catalog::State::Views|Catalog::State::Foreign ) ); feedName = feedNames;
feedNames.clear(); feedNames.clear();
} }
}
//_feedCells.useFeed( AllianceFramework::get()->getCell("tie_x0" ,Catalog::State::Views) ); Cell* feed = DataBase::getDB()->getCell( feedName );
//_feedCells.useFeed( AllianceFramework::get()->getCell("rowend_x0",Catalog::State::Views) ); if (not feed)
feed = AllianceFramework::get()->getCell( feedName, Catalog::State::Views|Catalog::State::Foreign );
if (feed)
_feedCells.useFeed( feed );
else
cerr << Warning( "EtesianEngine::_postCreate() Unable to find \"%s\" feed cell."
, feedName.c_str()
) << endl;
}
} }
} }
@ -375,7 +384,7 @@ namespace Etesian {
static_cast<Instance*>(ioccurrence.getEntity())->destroy(); static_cast<Instance*>(ioccurrence.getEntity())->destroy();
} }
DbU::Unit abWidth = rows*getSliceHeight(); DbU::Unit abWidth = columns*getSliceHeight();
DbU::Unit adjust = abWidth % getVerticalPitch(); DbU::Unit adjust = abWidth % getVerticalPitch();
if (adjust) abWidth += getVerticalPitch() - adjust; if (adjust) abWidth += getVerticalPitch() - adjust;