riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch place in menus between Katana & Kite (Katana becomes the default). 

* Change: In Hurricane::CellViewer, reorganisation of the to level menus.
    Add "Misc." and it's two sub-menus "Beta" and "Obsolete".
* Change: In GraphicKiteEngine::addToMenu(), set Kite in the obsolete menu.
* Change: In GraphicKatanaEngine::addToMenu(), set Katana as the standart
    router.
This commit is contained in:
Jean-Paul Chaput 2019-05-10 11:59:21 +02:00
parent 82dc58bf8e
commit 1360479eed
3 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hurricane/src/viewer/CellViewer.cpp
View File

@ -386,9 +386,13 @@ namespace Hurricane {
void CellViewer::createMenus ()
{
addMenu ( "file" , "File" , TopMenu );
addMenu ( "view" , "View" , TopMenu );
addMenu ( "tools", "Tools", TopMenu );
addMenu( "file" , "File" , TopMenu );
addMenu( "view" , "View" , TopMenu );
addMenu( "tools" , "Tools" , TopMenu );
addMenu( "placeAndRoute", "P&&R" , TopMenu );
addMenu( "misc" , "Misc" , TopMenu );
addMenu( "misc.beta" , "&beta" );
addMenu( "misc.obsolete", "&Obsolete" );
// Building the "File" menu.
QAction* action = addToMenu( "viewer.interrupt"

29
katana/src/GraphicKatanaEngine.cpp
View File

@ -359,59 +359,54 @@ namespace Katana {
_viewer = viewer;
if (not _viewer->hasMenuAction("beta"))
_viewer->addMenu( "beta", "Beta", CellViewer::TopMenu );
if (not _viewer->hasMenuAction("beta.placeAndRoute"))
_viewer->addMenu( "beta.placeAndRoute", "P&&R" );
if (_viewer->hasMenuAction("beta.placeAndRoute.route")) {
if (_viewer->hasMenuAction("placeAndRoute.route")) {
cerr << Warning( "GraphicKatanaEngine::addToMenu() - Katana detailed router already hooked in." ) << endl;
return;
}
_viewer->addMenu ( "beta.placeAndRoute.stepByStep", "&Step by step" );
_viewer->addMenu ( "placeAndRoute.stepByStep", "&Step by step" );
_viewer->addToMenu( "beta.placeAndRoute.route"
_viewer->addToMenu( "placeAndRoute.route"
, "&Route . . . . . [Katana]"
, "Route the design (global & detailed)"
, std::bind(&GraphicKatanaEngine::_route,this)
, QIcon()
, "beta.placeAndRoute.stepByStep"
, "placeAndRoute.stepByStep"
);
_viewer->addToMenu( "beta.placeAndRoute.stepByStep.========" );
_viewer->addToMenu( "beta.placeAndRoute.stepByStep.detailedPreRoute"
_viewer->addToMenu( "placeAndRoute.stepByStep.========" );
_viewer->addToMenu( "placeAndRoute.stepByStep.detailedPreRoute"
, "Detailed Pre-Route . [Katana]"
, "Run the <b>Katana</b> detailed router on pre-routed nets"
, std::bind(&GraphicKatanaEngine::_runNegociatePreRouted,this)
);
_viewer->addToMenu( "beta.placeAndRoute.stepByStep.globalRoute"
_viewer->addToMenu( "placeAndRoute.stepByStep.globalRoute"
, "&Global Route . . . [Katana]"
, "Run the <b>Katana</b> global router"
, std::bind(&GraphicKatanaEngine::_globalRoute,this)
);
_viewer->addToMenu( "beta.placeAndRoute.stepByStep.detailedRoute"
_viewer->addToMenu( "placeAndRoute.stepByStep.detailedRoute"
, "&Detailed Route . . [Katana]"
, "Run the <b>Katana</b> detailed router"
, std::bind(&GraphicKatanaEngine::_detailRoute,this)
);
_viewer->addToMenu( "beta.placeAndRoute.stepByStep.finalize"
_viewer->addToMenu( "placeAndRoute.stepByStep.finalize"
, "&Finalize Routing . [Katana]"
, "Closing Routing"
, std::bind(&GraphicKatanaEngine::_finalize,this)
);
_viewer->addToMenu( "beta.placeAndRoute.stepByStep.dumpMeasures"
_viewer->addToMenu( "placeAndRoute.stepByStep.dumpMeasures"
, "Dump &Measures . . [Katana]"
, "Dumping Measurements on the disk"
, std::bind(&GraphicKatanaEngine::_dumpMeasures,this)
);
#if NO_NEED_OF_IT_NOW
_viewer->addToMenu( "beta.placeAndRoute.stepByStep.save"
_viewer->addToMenu( "placeAndRoute.stepByStep.save"
, "&Save Design"
, "Save routed design (temporary hack)"
, std::bind(&GraphicKatanaEngine::_save,this)
);
_viewer->addToMenu( "beta.placeAndRoute.stepByStep.runTest"
_viewer->addToMenu( "placeAndRoute.stepByStep.runTest"
, "Run &Test"
, "Run Test Program (symmetric routing of gmChamla)"
, std::bind(&GraphicKatanaEngine::_runTest,this)

32
kite/src/GraphicKiteEngine.cpp
View File

@ -279,61 +279,67 @@ namespace Kite {
_viewer = viewer;
if (_viewer->hasMenuAction("placeAndRoute.route")) {
if (_viewer->hasMenuAction("misc.obsolete.placeAndRoute.route")) {
cerr << Warning( "GraphicKiteEngine::addToMenu() - Kite detailed router already hooked in." ) << endl;
return;
}
_viewer->addToMenu( "placeAndRoute.route"
if (not _viewer->hasMenuAction("misc.obsolete.placeAndRoute"))
_viewer->addMenu( "misc.obsolete.placeAndRoute", "P&&R" );
if (not _viewer->hasMenuAction("misc.obsolete.placeAndRoute.stepByStep"))
_viewer->addMenu( "misc.obsolete.placeAndRoute.stepByStep", "&Step by step" );
_viewer->addToMenu( "misc.obsolete.placeAndRoute.route"
, "&Route"
, "Complete routing of the design (global, detailed and finalize) [<b>Kite</b>]"
, std::bind(&GraphicKiteEngine::_route,this)
, QIcon()
, "placeAndRoute.stepByStep"
, "misc.obsolete.placeAndRoute.stepByStep"
);
_viewer->addToMenu( "placeAndRoute.stepByStep.========" );
_viewer->addToMenu( "placeAndRoute.stepByStep.wipeoutRouting"
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.========" );
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.wipeoutRouting"
, "Erase Previous Routing"
, "Erase any previously routed wires"
, std::bind(&GraphicKiteEngine::_wipeoutRouting,this)
);
_viewer->addToMenu( "placeAndRoute.stepByStep.detailedPreRoute"
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.detailedPreRoute"
, "Detailed Pre-Route"
, "Run the detailed router on global pre-routed nets [<b>Kite</b>]"
, std::bind(&GraphicKiteEngine::_runNegociatePreRouted,this)
);
_viewer->addToMenu( "placeAndRoute.stepByStep.globalRoute"
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.globalRoute"
, "&Global Route"
, "Run the global router [<b>nik</b>]"
, std::bind(&GraphicKiteEngine::_globalRoute,this)
);
_viewer->addToMenu( "placeAndRoute.stepByStep.loadGlobalRouting"
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.loadGlobalRouting"
, "&Load Global Routing"
, "Load a solution for the global routing (.kgr) [<b>Knik</b>]"
, std::bind(&GraphicKiteEngine::_loadGlobalSolution,this)
);
_viewer->addToMenu( "placeAndRoute.stepByStep.saveGlobalRouting"
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.saveGlobalRouting"
, "&Save Global Routing"
, "Save a global router solution (.kgr) [<b>Knik</b>]"
, std::bind(&GraphicKiteEngine::_saveGlobalSolution,this)
);
_viewer->addToMenu( "placeAndRoute.stepByStep.detailedRoute"
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.detailedRoute"
, "&Detailed Route"
, "Run the detailed router [<b>Kite</b>]"
, std::bind(&GraphicKiteEngine::_detailRoute,this)
);
_viewer->addToMenu( "placeAndRoute.stepByStep.finalize"
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.finalize"
, "&Finalize Routing"
, "Cleanup all routing related data structures [<b>Kite</b>]"
, std::bind(&GraphicKiteEngine::_finalize,this)
);
_viewer->addToMenu( "placeAndRoute.stepByStep.dumpMeasures"
_viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.dumpMeasures"
, "Dump &Measures"
, "Dumping Measurements on the disk [<b>Kite</b>]"
, std::bind(&GraphicKiteEngine::_dumpMeasures,this)
);
// _viewer->addToMenu( "placeAndRoute.stepByStep.save"
// _viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.save"
// , "&Save Design"
// , "Save routed design (temporary hack)"
// , std::bind(&GraphicKiteEngine::_save,this)