X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fctsim.cpp;h=af65da3e5ddfab2a5ff74576ee67b83eb46e19c3;hp=5bd53127267ae3bd857d87017cc6c28c38e4cf40;hb=728e9fcbe0b785e56e7dcd2bd305786c647050af;hpb=8cce345df80fdbeea1c03a04a71d805951a87b74

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 5bd5312..af65da3 100644
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.93 2001/03/04 03:14:47 kevin Exp $
+**  $Id: ctsim.cpp,v 1.100 2001/03/29 21:25:50 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
@@ -48,6 +48,7 @@
 
 
 #include "ct.h"
+#include "ctndicom.h"
 #include "ctsim.h"
 #include "docs.h"
 #include "views.h"
@@ -69,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.93 2001/03/04 03:14:47 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.100 2001/03/29 21:25:50 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -84,7 +85,7 @@ IMPLEMENT_APP(CTSimApp)
 CTSimApp::CTSimApp()
 :  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_pConfig(0), m_pLogDoc(0)
+m_docManager(NULL), m_pFrame(NULL), m_pConfig(0), m_pLog(0), m_pLogDoc(0)
 {
   theApp = this;
 }
@@ -229,7 +230,10 @@ CTSimApp::OnInit()
   if (getStartupTips())
     ShowTips();
   
+#ifdef HAVE_WXTHREADS
   m_pBackgroundMgr = new BackgroundManager;
+#endif
+
   return true;
 }
 
@@ -289,6 +293,12 @@ CTSimApp::openConfig()
   m_pConfig->Read ("StartupTips", &m_bShowStartupTips);
   m_pConfig->Read ("CurrentTip", &m_iCurrentTip);
   m_pConfig->Read ("UseBackgroundTasks", &m_bUseBackgroundTasks);
+#ifdef HAVE_FFTW
+  wxString strFftwWisdom;
+  m_pConfig->Read ("FftwWisdom", strFftwWisdom);
+  if (strFftwWisdom.size() > 0)
+    fftw_import_wisdom_from_string (strFftwWisdom.c_str());
+#endif
 }
 
 void
@@ -300,7 +310,13 @@ CTSimApp::closeConfig()
   m_pConfig->Write ("StartupTips", m_bShowStartupTips);
   m_pConfig->Write ("CurrentTip", m_iCurrentTip);
   m_pConfig->Write ("UseBackgroundTasks", m_bUseBackgroundTasks);
-  
+#ifdef HAVE_FFTW
+  const char* const pszWisdom = fftw_export_wisdom_to_string();
+  wxString strFftwWisdom (pszWisdom);
+  fftw_free ((void*) pszWisdom);
+  m_pConfig->Write ("FftwWisdom", strFftwWisdom);
+#endif
+
   delete m_pConfig;
 }
 
@@ -402,7 +418,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
   file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
   
   file_menu->AppendSeparator();
-  file_menu->Append (MAINMENU_IMPORT, "&Import...\tCtrl-I");
+  file_menu->Append (MAINMENU_IMPORT, "&Import...\tCtrl-M");
   file_menu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
   file_menu->Append(MAINMENU_FILE_EXIT, "E&xit");
   
@@ -453,13 +469,13 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
   m_dDefaultFilterBandwidth = 1.;
   m_dDefaultFilterInputScale = 1.;
   m_dDefaultFilterOutputScale = 1.;
-  m_iDefaultImportFormat = ImageFile::IMPORT_FORMAT_PPM;
+  m_iDefaultImportFormat = ImageFile::IMPORT_FORMAT_PNG;
   
   wxAcceleratorEntry accelEntries[15];
   accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
   accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
   accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
-  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('I'), MAINMENU_IMPORT);
+  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('M'), MAINMENU_IMPORT);
   accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
 #ifndef CTSIM_MDI
   for (i = 0; i < 10; i++)
@@ -1018,9 +1034,16 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
   long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L);
   wxString strOSDesc = ::wxGetOsDescription();
-  *theApp->getLog() << "Operation System: " << strOSDesc;
+  *theApp->getLog() << "Operating System: " << strOSDesc;
   if (lFreeMem > 0)
     *theApp->getLog() << ",  Free Memory: " << lFreeMem << " MB";
+  *theApp->getLog() << ", wxWindows: " << wxVERSION_STRING;
+#if defined(DEBUG)
+  *theApp->getLog() << ", Debug version";
+#else
+  *theApp->getLog() << ", Release version";
+#endif
+
   *theApp->getLog() << "\n";
   
   wxBitmap bmp (splash);
@@ -1039,6 +1062,7 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
     msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
     
     wxMessageBox(msg, "About CTSim", wxOK | wxICON_INFORMATION, this);
+    *theApp->getLog() << msg << "\n";
   }
 }