X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=45a1adc8813ae297cc865d4ac98db1e48feea782;hb=f1303ea0f1188b0a89846c67b5783f596e7ba1b7;hp=5f63c7398c0e9048fc4aff9ae450529dc3fbbc33;hpb=28ae79fe191111dfdb0bde7f66aa6e5378c6a44c;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 5f63c73..45a1adc 100644
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.81 2001/02/20 00:07:56 kevin Exp $
+**  $Id: ctsim.cpp,v 1.85 2001/02/21 20:13:03 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
@@ -72,7 +72,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.81 2001/02/20 00:07:56 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.85 2001/02/21 20:13:03 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -85,8 +85,8 @@ struct option CTSimApp::ctsimOptions[] =
 IMPLEMENT_APP(CTSimApp)
 
 CTSimApp::CTSimApp()
-: m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0),
-  m_bAdvancedOptions(false), m_bSetModifyNewDocs(true)
+:  m_bAdvancedOptions(false), m_bSetModifyNewDocs(true), m_bVerboseLogging(false),
+  m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0)
 {
 	theApp = this;
 }
@@ -276,6 +276,7 @@ CTSimApp::openConfig()
 	wxConfigBase::Set(m_pConfig);
   m_pConfig->Read ("AdvancedOptions", &m_bAdvancedOptions);
   m_pConfig->Read ("SetModifyNewDocs", &m_bSetModifyNewDocs);
+  m_pConfig->Read ("VerboseLogging", &m_bVerboseLogging);
 }
 
 void
@@ -283,6 +284,7 @@ CTSimApp::closeConfig()
 {
   m_pConfig->Write ("AdvancedOptions", m_bAdvancedOptions);
   m_pConfig->Write ("SetModifyNewDocs", m_bSetModifyNewDocs);
+  m_pConfig->Write ("VerboseLogging", m_bVerboseLogging);
 	delete m_pConfig;
 }
 
@@ -393,6 +395,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 	
 	wxMenu* help_menu = new wxMenu;
 	help_menu->Append (MAINMENU_HELP_CONTENTS, "&Contents\tF1");
+
   help_menu->Append (IDH_QUICKSTART, "&Quick Start");
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
 	help_menu->Append (MAINMENU_HELP_SECONDARY, "&Secondary Help");
@@ -432,13 +435,13 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 	accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
 	accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
 	accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
-#ifndef CTSIM_MDI
 	accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
+#ifndef CTSIM_MDI
 	for (i = 0; i < 10; i++)
 		accelEntries[i+4].Set (wxACCEL_CTRL, static_cast<int>('0'+i), MAINMENU_WINDOW_BASE+i);
 	wxAcceleratorTable accelTable (15, accelEntries);
 #else
-	wxAcceleratorTable accelTable (4, accelEntries);
+	wxAcceleratorTable accelTable (5, accelEntries);
 #endif
 	
 	SetAcceleratorTable (accelTable);
@@ -593,12 +596,13 @@ MainFrame::showHelp (int commandID)
 		m_htmlHelp.DisplayContents ();
 #endif
 		break;
-		
+
+
 	default:
 #ifdef CTSIM_WINHELP
     m_winHelp.DisplaySection (commandID);
 #else
-    m_htmlHelp.DisplaySection (commandID);
+    m_htmlHelp.Display (commandID);
 #endif
 		break;
 	}
@@ -823,10 +827,11 @@ void
 MainFrame::OnPreferences (wxCommandEvent& WXUNUSED(event) )
 {
   DialogPreferences dlg (this, "CTSim Preferences", theApp->getAdvancedOptions(), 
-    theApp->getAskDeleteNewDocs());
+    theApp->getAskDeleteNewDocs(), theApp->getVerboseLogging());
   if (dlg.ShowModal() == wxID_OK) {
     theApp->setAdvancedOptions (dlg.getAdvancedOptions());
     theApp->setAskDeleteNewDocs (dlg.getAskDeleteNewDocs());
+    theApp->setVerboseLogging (dlg.getVerboseLogging());
   }
 }
 
@@ -835,10 +840,17 @@ MainFrame::OnPreferences (wxCommandEvent& WXUNUSED(event) )
 void 
 MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-	wxBitmap bmp (splash);
+  long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L);
+  wxString strOSDesc = ::wxGetOsDescription();
+  *theApp->getLog() << "Operation System: " << strOSDesc;
+  if (lFreeMem > 0)
+    *theApp->getLog() << ",  Free Memory: " << lFreeMem << " MB";
+  *theApp->getLog() << "\n";
+
+  wxBitmap bmp (splash);
 	if (bmp.Ok()) {
 		BitmapDialog dlg (&bmp, "About CTSim");
-		dlg.Show(true);
+		dlg.ShowModal();
 	} else {
 		wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n";
 #ifdef CTSIMVERSION