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

* ./kite: 

- Change: In GraphicKiteEngine, simplificate the normal menu, put
        everything else in the "step by step" sub-menu.
This commit is contained in:
Jean-Paul Chaput 2010-08-26 15:02:26 +00:00
parent 41e93e7c65
commit f3593289da
2 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
kite/src/GraphicKiteEngine.cpp
View File

@ -170,7 +170,7 @@ namespace Kite {
} }
void GraphicKiteEngine::runGlobal () void GraphicKiteEngine::globalRoute ()
{ {
KiteEngine* kite = getForFramework (); KiteEngine* kite = getForFramework ();
@ -181,7 +181,7 @@ namespace Kite {
} }
void GraphicKiteEngine::runDetailed () void GraphicKiteEngine::detailRoute ()
{ {
static KatabaticEngine::NetSet routingNets; static KatabaticEngine::NetSet routingNets;
@ -240,6 +240,14 @@ namespace Kite {
} }
void GraphicKiteEngine::route ()
{
globalRoute ();
detailRoute ();
finalize ();
}
void GraphicKiteEngine::postEvent () void GraphicKiteEngine::postEvent ()
{ {
static unsigned int count = 0; static unsigned int count = 0;
@ -289,6 +297,14 @@ namespace Kite {
if ( dRouteAction ) if ( dRouteAction )
cerr << Warning("GraphicKiteEngine::addToMenu() - Kite detailed router already hooked in.") << endl; cerr << Warning("GraphicKiteEngine::addToMenu() - Kite detailed router already hooked in.") << endl;
else { else {
stepMenu->addSeparator ();
QAction* gRouteAction = new QAction ( tr("Kite - &Global Route"), _viewer );
gRouteAction->setObjectName ( "viewer.menuBar.placeAndRoute.stepBystep.globalRoute" );
gRouteAction->setStatusTip ( tr("Run the <b>Knik</b> global router") );
gRouteAction->setVisible ( true );
stepMenu->addAction ( gRouteAction );
QAction* gLoadSolutionAction = new QAction ( tr("Kite - &Load Global Routing"), _viewer ); QAction* gLoadSolutionAction = new QAction ( tr("Kite - &Load Global Routing"), _viewer );
gLoadSolutionAction->setObjectName ( "viewer.menuBar.placeAndRoute.stepByStep.loadGlobalRouting" ); gLoadSolutionAction->setObjectName ( "viewer.menuBar.placeAndRoute.stepByStep.loadGlobalRouting" );
gLoadSolutionAction->setStatusTip ( tr("Load a solution for the global routing (.kgr)") ); gLoadSolutionAction->setStatusTip ( tr("Load a solution for the global routing (.kgr)") );
@ -301,36 +317,37 @@ namespace Kite {
gSaveSolutionAction->setVisible ( true ); gSaveSolutionAction->setVisible ( true );
stepMenu->addAction ( gSaveSolutionAction ); stepMenu->addAction ( gSaveSolutionAction );
QAction* gRouteAction = new QAction ( tr("Kite - &Global Route"), _viewer );
gRouteAction->setObjectName ( "viewer.menuBar.placeAndRoute.globalRoute" );
gRouteAction->setStatusTip ( tr("Run the <b>Knik</b> global router") );
gRouteAction->setVisible ( true );
prMenu->addAction ( gRouteAction );
dRouteAction = new QAction ( tr("Kite - &Detailed Route"), _viewer ); dRouteAction = new QAction ( tr("Kite - &Detailed Route"), _viewer );
dRouteAction->setObjectName ( "viewer.menuBar.placeAndRoute.detailedRoute" ); dRouteAction->setObjectName ( "viewer.menuBar.placeAndRoute.stepBystep.detailedRoute" );
dRouteAction->setStatusTip ( tr("Run the <b>Kite</b> detailed router") ); dRouteAction->setStatusTip ( tr("Run the <b>Kite</b> detailed router") );
dRouteAction->setVisible ( true ); dRouteAction->setVisible ( true );
prMenu->addAction ( dRouteAction ); stepMenu->addAction ( dRouteAction );
QAction* dFinalizeAction = new QAction ( tr("Kite - &Finalize Routing"), _viewer ); QAction* dFinalizeAction = new QAction ( tr("Kite - &Finalize Routing"), _viewer );
dFinalizeAction->setObjectName ( "viewer.menuBar.placeAndRoute.finalize" ); dFinalizeAction->setObjectName ( "viewer.menuBar.placeAndRoute.stepBystep.finalize" );
dFinalizeAction->setStatusTip ( tr("Closing Routing") ); dFinalizeAction->setStatusTip ( tr("Closing Routing") );
dFinalizeAction->setVisible ( true ); dFinalizeAction->setVisible ( true );
prMenu->addAction ( dFinalizeAction ); stepMenu->addAction ( dFinalizeAction );
QAction* dSaveAction = new QAction ( tr("Kite - &Save Design"), _viewer ); QAction* dSaveAction = new QAction ( tr("Kite - &Save Design"), _viewer );
dSaveAction->setObjectName ( "viewer.menuBar.placeAndRoute.save" ); dSaveAction->setObjectName ( "viewer.menuBar.placeAndRoute.stepBystep.save" );
dSaveAction->setStatusTip ( tr("Save routed design (temporary hack)") ); dSaveAction->setStatusTip ( tr("Save routed design (temporary hack)") );
dSaveAction->setVisible ( true ); dSaveAction->setVisible ( true );
prMenu->addAction ( dSaveAction ); stepMenu->addAction ( dSaveAction );
QAction* routeAction = new QAction ( tr("Kite - &Route"), _viewer );
routeAction->setObjectName ( "viewer.menuBar.placeAndRoute.route" );
routeAction->setStatusTip ( tr("Route the design (global & detailed)") );
routeAction->setVisible ( true );
prMenu->addAction ( routeAction );
connect ( gLoadSolutionAction, SIGNAL(triggered()), this, SLOT(loadGlobalSolution()) ); connect ( gLoadSolutionAction, SIGNAL(triggered()), this, SLOT(loadGlobalSolution()) );
connect ( gSaveSolutionAction, SIGNAL(triggered()), this, SLOT(saveGlobalSolution()) ); connect ( gSaveSolutionAction, SIGNAL(triggered()), this, SLOT(saveGlobalSolution()) );
connect ( gRouteAction , SIGNAL(triggered()), this, SLOT(runGlobal ()) ); connect ( gRouteAction , SIGNAL(triggered()), this, SLOT(globalRoute ()) );
connect ( dRouteAction , SIGNAL(triggered()), this, SLOT(runDetailed ()) ); connect ( dRouteAction , SIGNAL(triggered()), this, SLOT(detailRoute ()) );
connect ( dFinalizeAction , SIGNAL(triggered()), this, SLOT(finalize ()) ); connect ( dFinalizeAction , SIGNAL(triggered()), this, SLOT(finalize ()) );
connect ( dSaveAction , SIGNAL(triggered()), this, SLOT(save ()) ); connect ( dSaveAction , SIGNAL(triggered()), this, SLOT(save ()) );
connect ( routeAction , SIGNAL(triggered()), this, SLOT(route ()) );
} }
connect ( this, SIGNAL(cellPreModificated ()), _viewer->getCellWidget(), SLOT(cellPreModificate ()) ); connect ( this, SIGNAL(cellPreModificated ()), _viewer->getCellWidget(), SLOT(cellPreModificate ()) );

5
kite/src/kite/GraphicKiteEngine.h
View File

@ -86,9 +86,10 @@ namespace Kite {
public slots: public slots:
void loadGlobalSolution (); void loadGlobalSolution ();
void saveGlobalSolution (); void saveGlobalSolution ();
void runGlobal (); void globalRoute ();
void runDetailed (); void detailRoute ();
void finalize (); void finalize ();
void route ();
void save (); void save ();
protected: protected: