From c70eb596eeeeda21f872065d9e11a67996394626 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 13 Jan 2001 03:56:23 +0000 Subject: [PATCH] r387: no message --- include/ct.h | 4 +- include/ctglobals.h | 6 +- libctsim/Makefile.am | 2 +- libctsim/globalvars.cpp | 38 +++++ libctsim/procsignal.cpp | 3 +- libctsupport/syserror.cpp | 6 +- msvc/ctsim/ctsim.plg | 64 ++++++-- src/ctsim.cpp | 6 +- src/ctsim.h | 303 +++++++++++++++++++------------------- tools/ctsimtext.cpp | 21 ++- 10 files changed, 276 insertions(+), 177 deletions(-) create mode 100644 libctsim/globalvars.cpp diff --git a/include/ct.h b/include/ct.h index e6ebd5d..a36412f 100644 --- a/include/ct.h +++ b/include/ct.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ct.h,v 1.52 2001/01/12 16:41:56 kevin Exp $ +** $Id: ct.h,v 1.53 2001/01/13 03:51:35 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 @@ -159,7 +159,6 @@ extern "C" { #endif #include "ctsupport.h" -#include "ctglobals.h" #include "fnetorderstream.h" #ifdef HAVE_SGP @@ -182,6 +181,7 @@ extern "C" { #include "plotfile.h" #include "trace.h" +#include "ctglobals.h" #endif diff --git a/include/ctglobals.h b/include/ctglobals.h index 26c96db..4e0da2e 100644 --- a/include/ctglobals.h +++ b/include/ctglobals.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: ctglobals.h,v 1.1 2001/01/12 16:41:56 kevin Exp $ +** $Id: ctglobals.h,v 1.2 2001/01/13 03:51:35 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 @@ -30,7 +30,11 @@ #define __CTGLOBALS_H #ifdef HAVE_WXWINDOWS +#include "../src/ctsim.h" +class CTSimApp; extern bool g_bRunningWXWindows; // variable defined in syserror.cpp +extern CTSimApp* theApp; + #endif #endif diff --git a/libctsim/Makefile.am b/libctsim/Makefile.am index e8def37..1ff192f 100644 --- a/libctsim/Makefile.am +++ b/libctsim/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libctsim.a -libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp +libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp INCLUDES=@my_includes@ EXTRA_DIST=Makefile.nt diff --git a/libctsim/globalvars.cpp b/libctsim/globalvars.cpp new file mode 100644 index 0000000..e3923ed --- /dev/null +++ b/libctsim/globalvars.cpp @@ -0,0 +1,38 @@ +/***************************************************************************** +** FILE IDENTIFICATION +** +** Name: globalvars.cpp +** Purpose: Global variables +** Programmer: Kevin Rosenberg +** Date Started: Jan 2001 +** +** This is part of the CTSim program +** Copyright (C) 1983-2001 Kevin Rosenberg +** +** $Id: globalvars.cpp,v 1.1 2001/01/13 03:56:23 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 +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +******************************************************************************/ + +#include "ct.h" + +#ifdef HAVE_WXWINDOWS + +#include "../src/ctsim.h" + +bool g_bRunningWXWindows = false; +class CTSimApp* theApp = NULL; + +#endif + diff --git a/libctsim/procsignal.cpp b/libctsim/procsignal.cpp index 155d894..3077793 100644 --- a/libctsim/procsignal.cpp +++ b/libctsim/procsignal.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: procsignal.cpp,v 1.21 2001/01/13 02:55:14 kevin Exp $ +** $Id: procsignal.cpp,v 1.22 2001/01/13 03:51:35 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 @@ -192,7 +192,6 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw double* adFrequencyFilter = new double [m_nFilterPoints]; filter.copyFilterData (adFrequencyFilter, 0, m_nFilterPoints); #if defined(HAVE_WXWINDOWS) && (defined(DEBUG) || defined(_DEBUG)) - EZPlotDialog* pEZPlotDlg = NULL; if (g_bRunningWXWindows && m_traceLevel > 0) { EZPlotDialog dlgEZPlot; dlgEZPlot.getEZPlot()->ezset ("title Filter Response: Natural Order"); diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index 1b9aff4..623e662 100644 --- a/libctsupport/syserror.cpp +++ b/libctsupport/syserror.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: syserror.cpp,v 1.14 2001/01/12 16:41:56 kevin Exp $ +** $Id: syserror.cpp,v 1.15 2001/01/13 03:51:35 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 @@ -40,10 +40,6 @@ static int s_reportErrorLevel = ERR_WARNING; // Set error reporting level -#ifdef HAVE_WXWINDOWS -#include "../src/ctsim.h" -bool g_bRunningWXWindows = false; -#endif void sys_error (int severity, const char *msg, ...) { diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index deb8023..aba249f 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,27 @@ --------------------Configuration: libctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B7.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP200.tmp" with contents [ /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"C:\ctsim\libctsim\backprojectors.cpp" +"C:\ctsim\libctsim\filter.cpp" +"C:\ctsim\libctsim\fourier.cpp" +"C:\ctsim\libctsupport\hashtable.cpp" +"C:\ctsim\libctsim\imagefile.cpp" +"C:\ctsim\libctsim\phantom.cpp" +"C:\ctsim\libctsupport\plotfile.cpp" +"C:\ctsim\libctgraphics\pol.cpp" "C:\ctsim\libctsim\procsignal.cpp" +"C:\ctsim\libctsim\projections.cpp" +"C:\ctsim\libctsim\reconstruct.cpp" +"C:\ctsim\libctsim\scanner.cpp" +"C:\ctsim\libctsupport\syserror.cpp" +"C:\ctsim\libctsim\trace.cpp" +"C:\ctsim\libctsim\globalvars.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B7.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B8.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP200.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP201.tmp" with contents [ /nologo /out:"Debug\libctsim.lib" .\Debug\array2dfile.obj @@ -43,23 +57,44 @@ Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B8.tmp" with conten .\Debug\trace.obj .\Debug\transformmatrix.obj .\Debug\xform.obj +.\Debug\globalvars.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B8.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP201.tmp"

Output Window

Compiling... procsignal.cpp +backprojectors.cpp +filter.cpp +fourier.cpp +hashtable.cpp +imagefile.cpp +phantom.cpp +plotfile.cpp +pol.cpp +projections.cpp +reconstruct.cpp +scanner.cpp +syserror.cpp +trace.cpp +globalvars.cpp Creating library...

--------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B9.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP202.tmp" with contents [ /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.5.0\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0beta1\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"C:\ctsim\src\ctsim.cpp" +"C:\ctsim\src\dialogs.cpp" +"C:\ctsim\src\dlgprojections.cpp" +"C:\ctsim\src\dlgreconstruct.cpp" +"C:\ctsim\src\docs.cpp" "C:\ctsim\src\views.cpp" +"C:\ctsim\src\dlgezplot.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B9.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1BA.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP202.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP203.tmp" with contents [ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" .\Debug\ctsim.obj @@ -75,16 +110,25 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w "\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib" \wx2\lib\wxd.lib ] -Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1BA.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP203.tmp"

Output Window

Compiling... +ctsim.cpp +c:\wx2\include\wx\buffer.h(33) : error C2065: 'strdup' : undeclared identifier +c:\wx2\include\wx\buffer.h(33) : error C2446: ':' : no conversion from 'char *' to 'int' + This conversion requires a reinterpret_cast, a C-style cast or function-style cast +dialogs.cpp +dlgprojections.cpp +dlgreconstruct.cpp +docs.cpp views.cpp -Linking... +dlgezplot.cpp +Error executing cl.exe.

Results

-ctsim.exe - 0 error(s), 0 warning(s) +ctsim.exe - 2 error(s), 0 warning(s) diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 1c3d334..7a7c74b 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.27 2001/01/12 16:41:56 kevin Exp $ +** $Id: ctsim.cpp,v 1.28 2001/01/13 03:51:35 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 @@ -61,9 +61,7 @@ #endif #endif -static const char* rcsindent = "$Id: ctsim.cpp,v 1.27 2001/01/12 16:41:56 kevin Exp $"; - -class CTSimApp* theApp = NULL; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.28 2001/01/13 03:51:35 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { diff --git a/src/ctsim.h b/src/ctsim.h index 9093b9b..6edcfcf 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsim.h,v 1.22 2001/01/06 15:33:15 kevin Exp $ +** $Id: ctsim.h,v 1.23 2001/01/13 03:51:35 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 @@ -47,8 +47,14 @@ class ImageFileDocument; #include +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif #include "wx/docview.h" +#include "wx/textctrl.h" +#include "wx/menu.h" +#include "dlgezplot.h" // Define a new frame for main window @@ -58,66 +64,65 @@ class MainFrame: public wxMDIParentFrame class MainFrame: public wxDocParentFrame #endif { - DECLARE_CLASS(MainFrame) + DECLARE_CLASS(MainFrame) private: - wxTextCtrl* m_pLog; - wxMenu* m_pWindowMenu; - - enum { MAX_WINDOW_MENUITEMS = 20 }; - wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS]; - wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS]; - - - int m_iDefaultPhantomID; - int m_iDefaultFilterID; - int m_iDefaultFilterDomainID; - unsigned int m_iDefaultFilterXSize; - unsigned int m_iDefaultFilterYSize; - double m_dDefaultFilterParam; - double m_dDefaultFilterBandwidth; - double m_dDefaultFilterInputScale; - double m_dDefaultFilterOutputScale; - - + wxTextCtrl* m_pLog; + wxMenu* m_pWindowMenu; + + enum { MAX_WINDOW_MENUITEMS = 20 }; + wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS]; + wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS]; + + int m_iDefaultPhantomID; + int m_iDefaultFilterID; + int m_iDefaultFilterDomainID; + unsigned int m_iDefaultFilterXSize; + unsigned int m_iDefaultFilterYSize; + double m_dDefaultFilterParam; + double m_dDefaultFilterBandwidth; + double m_dDefaultFilterInputScale; + double m_dDefaultFilterOutputScale; + + public: - MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type); - - void OnAbout (wxCommandEvent& event); - void OnHelpContents (wxCommandEvent& event); - void OnCreatePhantom (wxCommandEvent& event); - - void OnCreateFilter (wxCommandEvent& event); - void OnExit (wxCommandEvent& event); - - void OnUpdateUI (wxUpdateUIEvent& event); - - wxTextCtrl* getLog() - { return m_pLog; } - - void OnWindowMenu0 (wxCommandEvent& event); - void OnWindowMenu1 (wxCommandEvent& event); - void OnWindowMenu2 (wxCommandEvent& event); - void OnWindowMenu3 (wxCommandEvent& event); - void OnWindowMenu4 (wxCommandEvent& event); - void OnWindowMenu5 (wxCommandEvent& event); - void OnWindowMenu6 (wxCommandEvent& event); - void OnWindowMenu7 (wxCommandEvent& event); - void OnWindowMenu8 (wxCommandEvent& event); - void OnWindowMenu9 (wxCommandEvent& event); - void OnWindowMenu10 (wxCommandEvent& event); - void OnWindowMenu11 (wxCommandEvent& event); - void OnWindowMenu12 (wxCommandEvent& event); - void OnWindowMenu13 (wxCommandEvent& event); - void OnWindowMenu14 (wxCommandEvent& event); - void OnWindowMenu15 (wxCommandEvent& event); - void OnWindowMenu16 (wxCommandEvent& event); - void OnWindowMenu17 (wxCommandEvent& event); - void OnWindowMenu18 (wxCommandEvent& event); - void OnWindowMenu19 (wxCommandEvent& event); - - void DoWindowMenu (int iMenuPosition, wxCommandEvent& event); - - DECLARE_EVENT_TABLE() + MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type); + + void OnAbout (wxCommandEvent& event); + void OnHelpContents (wxCommandEvent& event); + void OnCreatePhantom (wxCommandEvent& event); + + void OnCreateFilter (wxCommandEvent& event); + void OnExit (wxCommandEvent& event); + + void OnUpdateUI (wxUpdateUIEvent& event); + + wxTextCtrl* getLog() + { return m_pLog; } + + void OnWindowMenu0 (wxCommandEvent& event); + void OnWindowMenu1 (wxCommandEvent& event); + void OnWindowMenu2 (wxCommandEvent& event); + void OnWindowMenu3 (wxCommandEvent& event); + void OnWindowMenu4 (wxCommandEvent& event); + void OnWindowMenu5 (wxCommandEvent& event); + void OnWindowMenu6 (wxCommandEvent& event); + void OnWindowMenu7 (wxCommandEvent& event); + void OnWindowMenu8 (wxCommandEvent& event); + void OnWindowMenu9 (wxCommandEvent& event); + void OnWindowMenu10 (wxCommandEvent& event); + void OnWindowMenu11 (wxCommandEvent& event); + void OnWindowMenu12 (wxCommandEvent& event); + void OnWindowMenu13 (wxCommandEvent& event); + void OnWindowMenu14 (wxCommandEvent& event); + void OnWindowMenu15 (wxCommandEvent& event); + void OnWindowMenu16 (wxCommandEvent& event); + void OnWindowMenu17 (wxCommandEvent& event); + void OnWindowMenu18 (wxCommandEvent& event); + void OnWindowMenu19 (wxCommandEvent& event); + + void DoWindowMenu (int iMenuPosition, wxCommandEvent& event); + + DECLARE_EVENT_TABLE() }; @@ -125,37 +130,35 @@ class wxDocManager; class CTSimApp: public wxApp { public: - CTSimApp(); - bool OnInit(); - int OnExit(); - MainFrame* getMainFrame() const - { return m_pFrame; } - wxTextCtrl* getLog() - { return m_pFrame->getLog(); } - wxDocManager* getDocManager() - { return m_docManager; } - - wxString getUntitledFilename(); - - - void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector& vecIF); - - - - bool getSetModifyNewDocs() const - - { return true; } - - + CTSimApp(); + bool OnInit(); + int OnExit(); + MainFrame* getMainFrame() const + { return m_pFrame; } + wxTextCtrl* getLog() + { return m_pFrame->getLog(); } + wxDocManager* getDocManager() + { return m_docManager; } + + wxString getUntitledFilename(); + + EZPlotDialog* makeEZPlotDialog() + { return new EZPlotDialog (m_pFrame); } + + void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector& vecIF); + + bool getSetModifyNewDocs() const + { return true; } + private: - wxDocManager* m_docManager; - MainFrame* m_pFrame; - - void usage (const char* program); - - static struct option ctsimOptions[]; - - enum { O_HELP, O_VERSION }; + wxDocManager* m_docManager; + MainFrame* m_pFrame; + + void usage (const char* program); + + static struct option ctsimOptions[]; + + enum { O_HELP, O_VERSION }; }; DECLARE_APP(CTSimApp) @@ -165,67 +168,67 @@ extern class CTSimApp* theApp; enum { MAINMENU_HELP_ABOUT = 500, - MAINMENU_WINDOW_BASE, - MAINMENU_HELP_CONTENTS, - MAINMENU_FILE_CREATE_PHANTOM, - - MAINMENU_FILE_CREATE_FILTER, - MAINMENU_FILE_EXIT, - - PJMENU_FILE_PROPERTIES, - PJMENU_RECONSTRUCT_FBP, - PJMENU_RECONSTRUCT_FOURIER, - PJMENU_CONVERT_POLAR, - PJMENU_CONVERT_FFT_POLAR, - - IFMENU_FILE_EXPORT, - IFMENU_FILE_PROPERTIES, - - IFMENU_PLOT_ROW, - IFMENU_PLOT_COL, - IFMENU_PLOT_FFT_ROW, - IFMENU_PLOT_FFT_COL, - IFMENU_PLOT_HISTOGRAM, - - IFMENU_VIEW_SCALE_AUTO, - IFMENU_VIEW_SCALE_MINMAX, - IFMENU_VIEW_SCALE_FULL, - - IFMENU_COMPARE_IMAGES, - IFMENU_COMPARE_ROW, - IFMENU_COMPARE_COL, - IFMENU_IMAGE_SCALESIZE, - IFMENU_IMAGE_ADD, - IFMENU_IMAGE_SUBTRACT, - IFMENU_IMAGE_MULTIPLY, - IFMENU_IMAGE_DIVIDE, - - IFMENU_FILTER_INVERTVALUES, - IFMENU_FILTER_SQRT, - IFMENU_FILTER_SQUARE, - IFMENU_FILTER_LOG, - IFMENU_FILTER_EXP, - IFMENU_FILTER_FOURIER, - IFMENU_FILTER_INVERSE_FOURIER, - IFMENU_FILTER_FFT, - IFMENU_FILTER_IFFT, - IFMENU_FILTER_FFT_ROWS, - IFMENU_FILTER_FFT_COLS, - IFMENU_FILTER_IFFT_ROWS, - IFMENU_FILTER_IFFT_COLS, - IFMENU_FILTER_MAGNITUDE, - IFMENU_FILTER_PHASE, - IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, - IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, - - PHMMENU_FILE_PROPERTIES, - PHMMENU_PROCESS_RASTERIZE, - PHMMENU_PROCESS_PROJECTIONS, - - PLOTMENU_VIEW_SCALE_MINMAX, - PLOTMENU_VIEW_SCALE_AUTO, - PLOTMENU_VIEW_SCALE_FULL, - + MAINMENU_WINDOW_BASE, + MAINMENU_HELP_CONTENTS, + MAINMENU_FILE_CREATE_PHANTOM, + + MAINMENU_FILE_CREATE_FILTER, + MAINMENU_FILE_EXIT, + + PJMENU_FILE_PROPERTIES, + PJMENU_RECONSTRUCT_FBP, + PJMENU_RECONSTRUCT_FOURIER, + PJMENU_CONVERT_POLAR, + PJMENU_CONVERT_FFT_POLAR, + + IFMENU_FILE_EXPORT, + IFMENU_FILE_PROPERTIES, + + IFMENU_PLOT_ROW, + IFMENU_PLOT_COL, + IFMENU_PLOT_FFT_ROW, + IFMENU_PLOT_FFT_COL, + IFMENU_PLOT_HISTOGRAM, + + IFMENU_VIEW_SCALE_AUTO, + IFMENU_VIEW_SCALE_MINMAX, + IFMENU_VIEW_SCALE_FULL, + + IFMENU_COMPARE_IMAGES, + IFMENU_COMPARE_ROW, + IFMENU_COMPARE_COL, + IFMENU_IMAGE_SCALESIZE, + IFMENU_IMAGE_ADD, + IFMENU_IMAGE_SUBTRACT, + IFMENU_IMAGE_MULTIPLY, + IFMENU_IMAGE_DIVIDE, + + IFMENU_FILTER_INVERTVALUES, + IFMENU_FILTER_SQRT, + IFMENU_FILTER_SQUARE, + IFMENU_FILTER_LOG, + IFMENU_FILTER_EXP, + IFMENU_FILTER_FOURIER, + IFMENU_FILTER_INVERSE_FOURIER, + IFMENU_FILTER_FFT, + IFMENU_FILTER_IFFT, + IFMENU_FILTER_FFT_ROWS, + IFMENU_FILTER_FFT_COLS, + IFMENU_FILTER_IFFT_ROWS, + IFMENU_FILTER_IFFT_COLS, + IFMENU_FILTER_MAGNITUDE, + IFMENU_FILTER_PHASE, + IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, + IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, + + PHMMENU_FILE_PROPERTIES, + PHMMENU_PROCESS_RASTERIZE, + PHMMENU_PROCESS_PROJECTIONS, + + PLOTMENU_VIEW_SCALE_MINMAX, + PLOTMENU_VIEW_SCALE_AUTO, + PLOTMENU_VIEW_SCALE_FULL, + }; #endif diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp index 242689a..6983cb0 100644 --- a/tools/ctsimtext.cpp +++ b/tools/ctsimtext.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsimtext.cpp,v 1.8 2001/01/10 21:21:53 kevin Exp $ +** $Id: ctsimtext.cpp,v 1.9 2001/01/13 03:51:35 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 @@ -45,7 +45,7 @@ extern "C" { // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that // linked name as name of function. -static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.8 2001/01/10 21:21:53 kevin Exp $"; +static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.9 2001/01/13 03:51:35 kevin Exp $"; static const char* const s_szProgramName = "ctsimtext"; extern int if1_main (int argc, char* const argv[]); @@ -272,3 +272,20 @@ main (int argc, char* argv[]) return (retval); } + +// Hack to fix linking problems when not linking with wxWindows and CTSim GUI routines + +#ifdef HAVE_WXWINDOWS +#include "../src/dlgezplot.h" + +EZPlotDialog::EZPlotDialog (wxWindow* parent) +{} + +EZPlotDialog::~EZPlotDialog() +{} + +unsigned long +wxDialog::OnCtlColor(unsigned long a,unsigned long b,unsigned int c,unsigned int d,unsigned int e,long f) +{return 0;} + +#endif \ No newline at end of file -- 2.34.1