|
From: Markus R. <rol...@us...> - 2007-04-15 11:16:17
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29401 Modified Files: mainframe.cpp mainframe.h Log Message: - handle SparkContextEvents Index: mainframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mainframe.h 15 Apr 2007 10:50:51 -0000 1.11 --- mainframe.h 15 Apr 2007 11:16:11 -0000 1.12 *************** *** 33,36 **** --- 33,37 ---- class SparkGLCanvas; + class SparkContextEvent; namespace oxygen *************** *** 133,136 **** --- 134,139 ---- void OnTreeItemRightClick(wxTreeEvent& event); + void OnSparkContext(SparkContextEvent& event); + void SplitHor(); void SplitVert(); Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mainframe.cpp 15 Apr 2007 10:50:50 -0000 1.14 --- mainframe.cpp 15 Apr 2007 11:16:10 -0000 1.15 *************** *** 33,36 **** --- 33,37 ---- #include <rsgedit/res/xpm_reload.xpm> #include <rsgedit/res/xpm_agent.xpm> + #include "sparkcontextevent.h" #include "aboutdlg.h" *************** *** 84,87 **** --- 85,90 ---- EVT_TREE_ITEM_ACTIVATED(1, mainframe::OnTreeItemActivated) EVT_TREE_ITEM_RIGHT_CLICK(1, mainframe::OnTreeItemRightClick) + + EVT_SPARK_CONTEXT(ID_SPARK_CONTEXT, mainframe::OnSparkContext) END_EVENT_TABLE() *************** *** 172,175 **** --- 175,182 ---- mTimer.Start(LOGWND_UPDATE_INTERVAL); + // init spark context + SparkContext::GetInstance().ResetSelection(); + SparkContext::GetInstance().SetEventHandler(this, ID_SPARK_CONTEXT); + PrintSimState(); UpdateTitle(); *************** *** 617,624 **** SparkContext::GetInstance().SetSelection(leaf); - - bool swapBuffers = true; - wxClientDC dc(this); - mCanvas->Render(dc, swapBuffers); } --- 624,627 ---- *************** *** 846,847 **** --- 849,867 ---- mSimState->SetValue(state + wxString::Format("t=%.1lf",now)); } + + void mainframe::OnSparkContext(SparkContextEvent& event) + { + switch (event.GetType()) + { + default: + assert(false); + break; + + case SparkContextEvent::T_SELECTION_CHANGED: + // redraw gl canvas + bool swapBuffers = true; + wxClientDC dc(this); + mCanvas->Render(dc, swapBuffers); + break; + } + } |