projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r647: *** empty log message ***
[ctsim.git]
/
src
/
ctsim.cpp
diff --git
a/src/ctsim.cpp
b/src/ctsim.cpp
index 120be5b495c6a79db3e1237db12527a759bae4d6..af65da3e5ddfab2a5ff74576ee67b83eb46e19c3 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.
96 2001/03/05 20:29:23
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
**
** 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 "ct.h"
+#include "ctndicom.h"
#include "ctsim.h"
#include "docs.h"
#include "views.h"
#include "ctsim.h"
#include "docs.h"
#include "views.h"
@@
-69,7
+70,7
@@
#endif
#endif
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.
96 2001/03/05 20:29:23
kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.
100 2001/03/29 21:25:50
kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
struct option CTSimApp::ctsimOptions[] =
{
@@
-292,6
+293,12
@@
CTSimApp::openConfig()
m_pConfig->Read ("StartupTips", &m_bShowStartupTips);
m_pConfig->Read ("CurrentTip", &m_iCurrentTip);
m_pConfig->Read ("UseBackgroundTasks", &m_bUseBackgroundTasks);
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
}
void
@@
-303,7
+310,13
@@
CTSimApp::closeConfig()
m_pConfig->Write ("StartupTips", m_bShowStartupTips);
m_pConfig->Write ("CurrentTip", m_iCurrentTip);
m_pConfig->Write ("UseBackgroundTasks", m_bUseBackgroundTasks);
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;
}
delete m_pConfig;
}
@@
-456,7
+469,7
@@
MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
m_dDefaultFilterBandwidth = 1.;
m_dDefaultFilterInputScale = 1.;
m_dDefaultFilterOutputScale = 1.;
m_dDefaultFilterBandwidth = 1.;
m_dDefaultFilterInputScale = 1.;
m_dDefaultFilterOutputScale = 1.;
- m_iDefaultImportFormat = ImageFile::IMPORT_FORMAT_P
PM
;
+ m_iDefaultImportFormat = ImageFile::IMPORT_FORMAT_P
NG
;
wxAcceleratorEntry accelEntries[15];
accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
wxAcceleratorEntry accelEntries[15];
accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
@@
-1021,9
+1034,16
@@
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{
long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L);
wxString strOSDesc = ::wxGetOsDescription();
{
long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L);
wxString strOSDesc = ::wxGetOsDescription();
- *theApp->getLog() << "Operati
on
System: " << strOSDesc;
+ *theApp->getLog() << "Operati
ng
System: " << strOSDesc;
if (lFreeMem > 0)
*theApp->getLog() << ", Free Memory: " << lFreeMem << " MB";
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);
*theApp->getLog() << "\n";
wxBitmap bmp (splash);
@@
-1042,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);
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";
}
}
}
}