diff --git a/hurricane/src/viewer/CellViewer.cpp b/hurricane/src/viewer/CellViewer.cpp index a124011d..33987eb1 100644 --- a/hurricane/src/viewer/CellViewer.cpp +++ b/hurricane/src/viewer/CellViewer.cpp @@ -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" diff --git a/katana/src/GraphicKatanaEngine.cpp b/katana/src/GraphicKatanaEngine.cpp index abedcac0..c8c954f6 100644 --- a/katana/src/GraphicKatanaEngine.cpp +++ b/katana/src/GraphicKatanaEngine.cpp @@ -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 Katana 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 Katana global router" , std::bind(&GraphicKatanaEngine::_globalRoute,this) ); - _viewer->addToMenu( "beta.placeAndRoute.stepByStep.detailedRoute" + _viewer->addToMenu( "placeAndRoute.stepByStep.detailedRoute" , "&Detailed Route . . [Katana]" , "Run the Katana 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) diff --git a/kite/src/GraphicKiteEngine.cpp b/kite/src/GraphicKiteEngine.cpp index d166ebdb..b86daf15 100644 --- a/kite/src/GraphicKiteEngine.cpp +++ b/kite/src/GraphicKiteEngine.cpp @@ -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) [Kite]" , 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 [Kite]" , std::bind(&GraphicKiteEngine::_runNegociatePreRouted,this) ); - _viewer->addToMenu( "placeAndRoute.stepByStep.globalRoute" + _viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.globalRoute" , "&Global Route" , "Run the global router [nik]" , 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) [Knik]" , 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) [Knik]" , std::bind(&GraphicKiteEngine::_saveGlobalSolution,this) ); - _viewer->addToMenu( "placeAndRoute.stepByStep.detailedRoute" + _viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.detailedRoute" , "&Detailed Route" , "Run the detailed router [Kite]" , 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 [Kite]" , std::bind(&GraphicKiteEngine::_finalize,this) ); - _viewer->addToMenu( "placeAndRoute.stepByStep.dumpMeasures" + _viewer->addToMenu( "misc.obsolete.placeAndRoute.stepByStep.dumpMeasures" , "Dump &Measures" , "Dumping Measurements on the disk [Kite]" , 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)