projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r572: no message
[ctsim.git]
/
src
/
ctsim.cpp
diff --git
a/src/ctsim.cpp
b/src/ctsim.cpp
index 45a1adc8813ae297cc865d4ac98db1e48feea782..c1283c0f3393dfe9e0a63f51bce26aa97c7544eb 100644
(file)
--- a/
src/ctsim.cpp
+++ b/
src/ctsim.cpp
@@
-7,9
+7,9
@@
** Date Started: July 2000
**
** This is part of the CTSim program
** Date Started: July 2000
**
** This is part of the CTSim program
-** Copyright (
C) 1983-2000
Kevin Rosenberg
+** Copyright (
c) 1983-2001
Kevin Rosenberg
**
**
-** $Id: ctsim.cpp,v 1.8
5 2001/02/21 20:13:03
kevin Exp $
+** $Id: ctsim.cpp,v 1.8
8 2001/02/22 15:00:20
kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
@@
-29,13
+29,8
@@
#define strdup _strdup
#endif
#define strdup _strdup
#endif
-// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/wxprec.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
@@
-57,6
+52,8
@@
#include "docs.h"
#include "views.h"
#include "dialogs.h"
#include "docs.h"
#include "views.h"
#include "dialogs.h"
+#include "tips.h"
+#include "backgroundmgr.h"
#if defined(HAVE_CONFIG_H)
#include "config.h"
#if defined(HAVE_CONFIG_H)
#include "config.h"
@@
-72,7
+69,7
@@
#endif
#endif
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.8
5 2001/02/21 20:13:03
kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.8
8 2001/02/22 15:00:20
kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
struct option CTSimApp::ctsimOptions[] =
{
@@
-85,7
+82,8
@@
struct option CTSimApp::ctsimOptions[] =
IMPLEMENT_APP(CTSimApp)
CTSimApp::CTSimApp()
IMPLEMENT_APP(CTSimApp)
CTSimApp::CTSimApp()
-: m_bAdvancedOptions(false), m_bSetModifyNewDocs(true), m_bVerboseLogging(false),
+: m_bAdvancedOptions(false), m_bSetModifyNewDocs(true), m_bVerboseLogging(false), m_bShowStartupTips(true),
+ m_iCurrentTip(0), m_bUseBackgroundTasks(false),
m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0)
{
theApp = this;
m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0)
{
theApp = this;
@@
-228,10
+226,21
@@
CTSimApp::OnInit()
m_pFrame->AddPendingEvent(closeEvent);
}
m_pFrame->AddPendingEvent(closeEvent);
}
+ if (getStartupTips())
+ ShowTips();
+ m_pBackgroundMgr = new BackgroundManager;
return true;
}
return true;
}
+void
+CTSimApp::ShowTips()
+{
+ CTSimTipProvider tipProvider (m_iCurrentTip);
+ setStartupTips (::wxShowTip (m_pFrame, &tipProvider, getStartupTips()));
+ m_iCurrentTip = tipProvider.GetCurrentTip();
+}
+
#include "./ctsim.xpm"
void
#include "./ctsim.xpm"
void
@@
-277,6
+286,9
@@
CTSimApp::openConfig()
m_pConfig->Read ("AdvancedOptions", &m_bAdvancedOptions);
m_pConfig->Read ("SetModifyNewDocs", &m_bSetModifyNewDocs);
m_pConfig->Read ("VerboseLogging", &m_bVerboseLogging);
m_pConfig->Read ("AdvancedOptions", &m_bAdvancedOptions);
m_pConfig->Read ("SetModifyNewDocs", &m_bSetModifyNewDocs);
m_pConfig->Read ("VerboseLogging", &m_bVerboseLogging);
+ m_pConfig->Read ("StartupTips", &m_bShowStartupTips);
+ m_pConfig->Read ("CurrentTip", &m_iCurrentTip);
+ m_pConfig->Read ("UseBackgroundTasks", &m_bUseBackgroundTasks);
}
void
}
void
@@
-285,6
+297,10
@@
CTSimApp::closeConfig()
m_pConfig->Write ("AdvancedOptions", m_bAdvancedOptions);
m_pConfig->Write ("SetModifyNewDocs", m_bSetModifyNewDocs);
m_pConfig->Write ("VerboseLogging", m_bVerboseLogging);
m_pConfig->Write ("AdvancedOptions", m_bAdvancedOptions);
m_pConfig->Write ("SetModifyNewDocs", m_bSetModifyNewDocs);
m_pConfig->Write ("VerboseLogging", m_bVerboseLogging);
+ m_pConfig->Write ("StartupTips", m_bShowStartupTips);
+ m_pConfig->Write ("CurrentTip", m_iCurrentTip);
+ m_pConfig->Write ("UseBackgroundTasks", m_bUseBackgroundTasks);
+
delete m_pConfig;
}
delete m_pConfig;
}
@@
-316,7
+332,9
@@
BEGIN_EVENT_TABLE(MainFrame, wxDocParentFrame)
EVT_MENU(MAINMENU_FILE_PREFERENCES, MainFrame::OnPreferences)
EVT_MENU(MAINMENU_HELP_ABOUT, MainFrame::OnAbout)
EVT_MENU(MAINMENU_HELP_CONTENTS, MainFrame::OnHelpContents)
EVT_MENU(MAINMENU_FILE_PREFERENCES, MainFrame::OnPreferences)
EVT_MENU(MAINMENU_HELP_ABOUT, MainFrame::OnAbout)
EVT_MENU(MAINMENU_HELP_CONTENTS, MainFrame::OnHelpContents)
+EVT_MENU(MAINMENU_HELP_TIPS, MainFrame::OnHelpTips)
EVT_MENU(IDH_QUICKSTART, MainFrame::OnHelpButton)
EVT_MENU(IDH_QUICKSTART, MainFrame::OnHelpButton)
+EVT_MENU(MAINMENU_LOG_EVENT, MainFrame::OnLogEvent)
EVT_BUTTON(IDH_DLG_RASTERIZE, MainFrame::OnHelpButton)
EVT_BUTTON(IDH_DLG_PROJECTIONS, MainFrame::OnHelpButton)
EVT_BUTTON(IDH_DLG_RECONSTRUCTION, MainFrame::OnHelpButton)
EVT_BUTTON(IDH_DLG_RASTERIZE, MainFrame::OnHelpButton)
EVT_BUTTON(IDH_DLG_PROJECTIONS, MainFrame::OnHelpButton)
EVT_BUTTON(IDH_DLG_RECONSTRUCTION, MainFrame::OnHelpButton)
@@
-395,7
+413,7
@@
MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
wxMenu* help_menu = new wxMenu;
help_menu->Append (MAINMENU_HELP_CONTENTS, "&Contents\tF1");
wxMenu* help_menu = new wxMenu;
help_menu->Append (MAINMENU_HELP_CONTENTS, "&Contents\tF1");
-
+ help_menu->Append (MAINMENU_HELP_TIPS, "&Tips");
help_menu->Append (IDH_QUICKSTART, "&Quick Start");
#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
help_menu->Append (MAINMENU_HELP_SECONDARY, "&Secondary Help");
help_menu->Append (IDH_QUICKSTART, "&Quick Start");
#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
help_menu->Append (MAINMENU_HELP_SECONDARY, "&Secondary Help");
@@
-496,7
+514,8
@@
MainFrame::OnCreatePhantom(wxCommandEvent& event)
int dialogReturn = dialogPhantom.ShowModal();
if (dialogReturn == wxID_OK) {
wxString selection (dialogPhantom.getPhantom());
int dialogReturn = dialogPhantom.ShowModal();
if (dialogReturn == wxID_OK) {
wxString selection (dialogPhantom.getPhantom());
- *theApp->getLog() << "Selected phantom " << selection.c_str() << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Selected phantom " << selection.c_str() << "\n";
wxString filename = selection + ".phm";
m_iDefaultPhantomID = Phantom::convertNameToPhantomID (selection.c_str());
theApp->getDocManager()->CreateDocument (filename, wxDOC_SILENT);
wxString filename = selection + ".phm";
m_iDefaultPhantomID = Phantom::convertNameToPhantomID (selection.c_str());
theApp->getDocManager()->CreateDocument (filename, wxDOC_SILENT);
@@
-564,6
+583,18
@@
CTSimApp::getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<Imag
}
}
+void
+MainFrame::OnLogEvent (wxCommandEvent& event)
+{
+ *theApp->getLog() << event.GetString();
+}
+
+void
+MainFrame::OnHelpTips (wxCommandEvent& event)
+{
+ theApp->ShowTips();
+}
+
void
MainFrame::OnHelpContents (wxCommandEvent& event)
{
void
MainFrame::OnHelpContents (wxCommandEvent& event)
{
@@
-827,11
+858,14
@@
void
MainFrame::OnPreferences (wxCommandEvent& WXUNUSED(event) )
{
DialogPreferences dlg (this, "CTSim Preferences", theApp->getAdvancedOptions(),
MainFrame::OnPreferences (wxCommandEvent& WXUNUSED(event) )
{
DialogPreferences dlg (this, "CTSim Preferences", theApp->getAdvancedOptions(),
- theApp->getAskDeleteNewDocs(), theApp->getVerboseLogging());
+ theApp->getAskDeleteNewDocs(), theApp->getVerboseLogging(), theApp->getStartupTips(),
+ theApp->getUseBackgroundTasks());
if (dlg.ShowModal() == wxID_OK) {
theApp->setAdvancedOptions (dlg.getAdvancedOptions());
theApp->setAskDeleteNewDocs (dlg.getAskDeleteNewDocs());
theApp->setVerboseLogging (dlg.getVerboseLogging());
if (dlg.ShowModal() == wxID_OK) {
theApp->setAdvancedOptions (dlg.getAdvancedOptions());
theApp->setAskDeleteNewDocs (dlg.getAskDeleteNewDocs());
theApp->setVerboseLogging (dlg.getVerboseLogging());
+ theApp->setStartupTips (dlg.getStartupTips());
+ theApp->setUseBackgroundTasks (dlg.getUseBackgroundTasks());
}
}
}
}