From 0b7751a41a5a51daa7f919e5ba492a5f629c1393 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sat, 13 Jan 2001 04:52:01 +0000
Subject: [PATCH] r390: no message

---
 include/Makefile.am                  |  3 +-
 {src => include}/dlgezplot.h         |  5 ++-
 libctgraphics/Makefile.am            |  2 +-
 {src => libctgraphics}/dlgezplot.cpp |  8 +++-
 libctsim/Makefile.am                 |  2 +-
 libctsim/procsignal.cpp              |  4 +-
 msvc/ctsim/ctsim.plg                 | 63 +++++-----------------------
 src/Makefile.am                      |  2 +-
 tools/ctsimtext.cpp                  | 18 ++++----
 9 files changed, 35 insertions(+), 72 deletions(-)
 rename {src => include}/dlgezplot.h (95%)
 rename {src => libctgraphics}/dlgezplot.cpp (96%)

diff --git a/include/Makefile.am b/include/Makefile.am
index 9bf06fe..c670848 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,5 @@
-noinst_HEADERS=ct.h ezplot.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h fnetorderstream.h phantom.h timer.h sstream_subst scanner.h projections.h ctsupport.h filter.h array2dfile.h trace.h transformmatrix.h procsignal.h reconstruct.h plotfile.h hashtable.h fourier.h ctglobals.h
+noinst_HEADERS=ct.h ezplot.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h fnetorderstream.h phantom.h timer.h sstream_subst scanner.h projections.h ctsupport.h filter.h array2dfile.h trace.h transformmatrix.h procsignal.h reconstruct.h plotfile.h hashtable.h fourier.h ctglobals.h dlgezplot.h
+
 
 
 
diff --git a/src/dlgezplot.h b/include/dlgezplot.h
similarity index 95%
rename from src/dlgezplot.h
rename to include/dlgezplot.h
index 0ab8806..33aa7c3 100644
--- a/src/dlgezplot.h
+++ b/include/dlgezplot.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgezplot.h,v 1.2 2001/01/12 21:53:27 kevin Exp $
+**  $Id: dlgezplot.h,v 1.1 2001/01/13 04:47: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
@@ -25,7 +25,7 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifndef __DLGEZPLOT_H_
+#if defined(HAVE_WXWINDOWS) && ! defined(__DLGEZPLOT_H_)
 #define __DLGEZPLOT_H_
 
 #ifdef __GNUG__
@@ -88,5 +88,6 @@ public:
    EZPlot* getEZPlot ()
    { if (m_pEZPlotCtrl) return m_pEZPlotCtrl->getEZPlot(); else return NULL; }
 };
+
 #endif
 
diff --git a/libctgraphics/Makefile.am b/libctgraphics/Makefile.am
index 8946871..de1e66b 100644
--- a/libctgraphics/Makefile.am
+++ b/libctgraphics/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = libctgraphics.a
-libctgraphics_a_SOURCES=ezplot.cpp ezset.cpp pol.cpp sgp.cpp transformmatrix.cpp
+libctgraphics_a_SOURCES=ezplot.cpp ezset.cpp pol.cpp sgp.cpp transformmatrix.cpp dlgezplot.cpp
 INCLUDES=@my_includes@
 EXTRA_DIST=Makefile.nt
 
diff --git a/src/dlgezplot.cpp b/libctgraphics/dlgezplot.cpp
similarity index 96%
rename from src/dlgezplot.cpp
rename to libctgraphics/dlgezplot.cpp
index bdb8cb7..d59f11f 100644
--- a/src/dlgezplot.cpp
+++ b/libctgraphics/dlgezplot.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgezplot.cpp,v 1.2 2001/01/12 21:53:27 kevin Exp $
+**  $Id: dlgezplot.cpp,v 1.1 2001/01/13 04:47: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
@@ -25,6 +25,8 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
+#ifdef HAVE_WXWINDOWS
+
 #ifdef __GNUG__
 #pragma implementation "dlgezplot.h"
 #endif
@@ -50,7 +52,7 @@
 #endif
 
 #include "ct.h"
-#include "ctsim.h"
+#include "../src/ctsim.h"
 #include "dlgezplot.h"
 
 
@@ -144,3 +146,5 @@ EZPlotDialog::~EZPlotDialog()
     m_parentTop->Enable(TRUE);
 }
 
+
+#endif // HAVE_WXWINDOWS
diff --git a/libctsim/Makefile.am b/libctsim/Makefile.am
index 1ff192f..8971851 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 globalvars.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/procsignal.cpp b/libctsim/procsignal.cpp
index 3077793..456e01a 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.22 2001/01/13 03:51:35 kevin Exp $
+**  $Id: procsignal.cpp,v 1.23 2001/01/13 04:52:01 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
@@ -28,7 +28,7 @@
 #include "ct.h"
 
 #ifdef HAVE_WXWINDOWS
-#include "../src/dlgezplot.h"
+#include "dlgezplot.h"
 #endif
 
 // FilterMethod ID/Names
diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index aba249f..028cfc1 100644
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,27 +6,13 @@
 --------------------Configuration: libctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP200.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP213.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\RSP200.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP201.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP213.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP214.tmp" with contents
 [
 /nologo /out:"Debug\libctsim.lib" 
 .\Debug\array2dfile.obj
@@ -59,42 +45,22 @@ Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP201.tmp" with conten
 .\Debug\xform.obj
 .\Debug\globalvars.obj
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP201.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP214.tmp"
 <h3>Output Window</h3>
 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...
 <h3>
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP202.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP215.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\RSP202.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP203.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP215.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP216.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
@@ -110,25 +76,16 @@ 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\RSP203.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP216.tmp"
 <h3>Output Window</h3>
 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
-dlgezplot.cpp
-Error executing cl.exe.
+Linking...
 
 
 
 <h3>Results</h3>
-ctsim.exe - 2 error(s), 0 warning(s)
+ctsim.exe - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>
diff --git a/src/Makefile.am b/src/Makefile.am
index f6cc485..c9bd27f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS=ctsim
 
-ctsim_SOURCES=ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp dlgreconstruct.h dlgezplot.cpp
+ctsim_SOURCES=ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp dlgreconstruct.h 
 ctsim_DEPENDENCIES=../libctgraphics/libctgraphics.a ../libctsupport/libctsupport.a ../libctsim/libctsim.a ../include/ct.h
 ctsim_LDADD=-L../libctgraphics -L../libctsupport -L../libctsim @ctlibs@
 
diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 44a3746..994fea0 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.10 2001/01/13 04:14:03 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.11 2001/01/13 04:44:47 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.10 2001/01/13 04:14:03 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.11 2001/01/13 04:44:47 kevin Exp $";
 static const char* const s_szProgramName = "ctsimtext";
 static const char* const s_szProgramName2 = "ctsimtext.exe";
 
@@ -107,6 +107,10 @@ ctsimtext_main (int argc, char * argv[])
   if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) {
     argv = &argv[1];
     argc--;
+    if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) {
+      argv = &argv[2];
+      argc--;
+    }
     iReturn = processCommand (argc, argv);
   } else if (argc > 1){
     iReturn = processCommand (argc, argv);
@@ -275,19 +279,15 @@ main (int argc, char* argv[])
 
 
 // Hack to fix linking problems when not linking with wxWindows and CTSim GUI routines
-
-#ifdef HAVE_WXWINDOWS
-#include "../src/dlgezplot.h"
-
 #ifdef MSVC
 unsigned long
 wxDialog::OnCtlColor(unsigned long a,unsigned long b,unsigned int c,unsigned int d,unsigned int e,long f)
 {return 0;}
-
-#else // not MSVC
-
 #endif
 
+#if 0
+#include "../src/dlgezplot.h"
+
 EZPlotDialog::EZPlotDialog (wxWindow* parent)
   : wxDialog(), m_pEZPlotCtrl(NULL)
 {}
-- 
2.34.1