r2134: *** empty log message ***

diff --git a/doc/Makefile b/doc/Makefile
index c11b8e89a948bbb88866d6a7cf0916cadfcf58c0..2aa8f5a179efabda7128ddd346308066ee81633b 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -46,13 +46,13 @@ html: htmlhelp
        mv *.html html
 
 
-.PHONY: winhelp
-winhelp: $(docs)
-       rm -f $(pkg).rtf $(pkg).cnt
-       cp $(pkg)-tex2rtf.bib $(pkg).bib
-       tex2rtf $(pkg).tex $(pkg).rtf -winhelp
-       ./maphhc.pl
-       hcw /c /m /e $(pkg).hpj
-       mv $(PKG).HLP $(pkg).hlp
-       cp $(pkg).hlp $(pkg).cnt ../msvc/$(pkg)/
+#.PHONY: winhelp
+#winhelp: $(docs)
+#      rm -f $(pkg).rtf $(pkg).cnt
+#      cp $(pkg)-tex2rtf.bib $(pkg).bib
+#      tex2rtf $(pkg).tex $(pkg).rtf -winhelp
+#      ./maphhc.pl
+#      hcw /c /m /e $(pkg).hpj
+#      mv $(PKG).HLP $(pkg).hlp
+#      cp $(pkg).hlp $(pkg).cnt ../docs/$(pkg)/
 

diff --git a/doc/ctsim.hlp b/doc/ctsim.hlp
index b6dda6dc61cfbe01934f4dee15f6ca7df9f9e0db..bc7c224ca31feb3c9ca85c79d3eec0636b38fe6c 100644 (file)
Binary files a/doc/ctsim.hlp and b/doc/ctsim.hlp differ

diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp
index 44676f080ccd112fe9d913b9126c02bf75f6545a..bcc38a9cf5e54212e07698bbbf5237a2fd6ae5c2 100644 (file)
--- a/msvc/ctsim/ctsim.dsp
+++ b/msvc/ctsim/ctsim.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /I "\ctn\include" /D "_WINDOWS" /D "__WIN95__" /D "__WIN32__" /D "__WXMSW__" /D "MSVC" /D "NDEBUG" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /YX /FD /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /c\r
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /I "\ctn\include" /D "NDEBUG" /D VERSION=\"3.5.5\" /D "_WINDOWS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "WIN32" /D "HAVE_CTN_DICOM" /D CTSIMVERSION=\"3.5.5\" /YX /FD /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /I "\ctn\include" /D "_WINDOWS" /D "_DEBUG" /D "DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /YX /FD /GZ /c\r
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /I "\ctn\include" /D "_DEBUG" /D "DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D WINVER=0x0400 /D "STRICT" /D VERSION=3.5.5 /D "_WINDOWS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "WIN32" /D "HAVE_CTN_DICOM" /D CTSIMVERSION=\"3.5.5\" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 wsock32.lib  comctl32.lib winmm.lib rpcrt4.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib opengl32.lib fftw2st.lib rfftw2st.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 ctn_lib.lib htmlhelp.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"\fftw-2.1.3\win32\fftw2st\Debug" /libpath:"\fftw-2.1.3\win32\rfftw2st\Debug" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Debug"\r
+# ADD LINK32 wsock32.lib comctl32.lib winmm.lib rpcrt4.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib opengl32.lib fftw2st.lib rfftw2st.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 ctn_lib.lib htmlhelp.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"\fftw-2.1.3\win32\fftw2st\Debug" /libpath:"\fftw-2.1.3\win32\rfftw2st\Debug" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Debug"\r
 \r
 !ENDIF \r
 \r

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index 8f2eb1830b66b6d35e89703121629ed448a00368..392cc83e4eed66393c19f213d02fc6344a751148 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,7 +6,7 @@
 --------------------Configuration: ctsim - Win32 Release--------------------\r
 </h3>\r
 <h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP215.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP37A.tmp" with contents\r
 [\r
 ctn_lib.lib winmm.lib wx.lib png.lib tiff.lib jpeg.lib xpm.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 ctn_lib.lib comctl32.lib rpcrt4.lib fftw2st.lib rfftw2st.lib opengl32.lib wsock32.lib htmlhelp.lib /nologo /subsystem:windows /incremental:no /pdb:"Release/ctsim.pdb" /machine:I386 /out:"Release/ctsim.exe" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Release" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Release" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Release" \r
 .\Release\backgroundmgr.obj\r
@@ -17,18 +17,18 @@ ctn_lib.lib winmm.lib wx.lib png.lib tiff.lib jpeg.lib xpm.lib kernel32.lib user
 .\Release\dlgprojections.obj\r
 .\Release\dlgreconstruct.obj\r
 .\Release\docs.obj\r
+.\Release\getopt.obj\r
+.\Release\getopt1.obj\r
 .\Release\graph3dview.obj\r
 .\Release\threadproj.obj\r
-.\Release\tips.obj\r
-.\Release\views.obj\r
 .\Release\threadraster.obj\r
 .\Release\threadrecon.obj\r
-.\Release\getopt1.obj\r
-.\Release\getopt.obj\r
+.\Release\tips.obj\r
+.\Release\views.obj\r
 .\Release\ctsim.res\r
 \ctsim\msvc\libctsim\Release\libctsim.lib\r
 ]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP215.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP37A.tmp"\r
 <h3>Output Window</h3>\r
 Linking...\r
 LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF\r

diff --git a/msvc/ctsimtext/ctsimtext.dsp b/msvc/ctsimtext/ctsimtext.dsp
index 108ca73b410aff570af83663b3c6906ad63ae4a2..e0002f5d4463bb3497c6ecae1bf9b7198a96bdc3 100644 (file)
--- a/msvc/ctsimtext/ctsimtext.dsp
+++ b/msvc/ctsimtext/ctsimtext.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_CONSOLE" /D "NOMAIN" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /YX /FD /GZ /c\r
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_CONSOLE" /D "NOMAIN" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D VERSION=3.5.5 /D "WIN32" /D "HAVE_CTN_DICOM" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /i "\wx2\include" /i "\wx2\contrib\include" /d "_DEBUG"\r
 BSC32=bscmake.exe\r

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 5297830900e048ac32a77fe7f50de50ab50441b9..eea9e604afc462a078fa334cf802bb9d3f218e29 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
 **
-**  $Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 kevin Exp $
+**  $Id: ctsim.cpp,v 1.118 2002/06/20 11:55:44 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
@@ -46,7 +46,6 @@
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
 #endif
 
-
 #include "ct.h"
 #include "ctndicom.h"
 #include "ctsim.h"
@@ -70,7 +69,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.118 2002/06/20 11:55:44 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -118,10 +117,10 @@ CTSimApp::OnInit()
     switch (c) {
     case O_VERSION:
       std::cout << rcsindent << std::endl;
-#ifdef CTSIMVERSION
+#ifdef VERSION
+      std::cout << "Version: " << VERSION << std::endl;\r
+#elif defined(CTSIMVERSION)\r
       std::cout << "Version: " << CTSIMVERSION << std::endl;
-#elif defined(VERSION)
-      std::cout << "Version: " << VERSION << std::endl;
 #endif
       exit(0);
     case O_HELP:
@@ -196,16 +195,21 @@ CTSimApp::OnInit()
   
   wxString helpDir;
   if (! m_pConfig->Read("HelpDir", &helpDir))
-    helpDir = ::wxGetCwd();
+    helpDir = ::wxGetCwd();\r
 #ifdef CTSIM_WINHELP
   if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
     *m_pLog << "Cannot initialize the Windows Help system" << "\n";
-#else
-  wxString docDir (DATADIR);
+#else\r
+#ifdef DATADIR
+  wxString docDir (DATADIR);\r
+#else\r
+  wxString docDir (::wxGetCwd());\r
+#endif
   wxString docFile = docDir + "ctsim.htb";
   if (! m_pFrame->getHtmlHelpController().AddBook(docFile) &&
-    ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim.htb"))
-    *m_pLog << "Cannot initialize the HTML Help system" << "\n";
+    ! m_pFrame->getHtmlHelpController().AddBook("/usr/share/ctsim/ctsim.htb") &&
+       ! m_pFrame->getHtmlHelpController().AddBook("/tmp/ctsim.htb"))\r
+        *m_pLog << "Cannot initialize the HTML Help system" << "\n";
   else {
     if (::wxDirExists ("/tmp"))
       m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp"));
@@ -688,8 +692,7 @@ MainFrame::showHelp (int commandID)
     m_htmlHelp.Display ("Contents");
 #endif
     break;
-    
-    
+        
   default:
 #ifdef CTSIM_WINHELP
     m_winHelp.DisplaySection (commandID);
@@ -1026,15 +1029,14 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   *theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
 #endif
 #if defined(DEBUG)
-  *theApp->getLog() << ", CTSim Debug version" << "\n";
+  *theApp->getLog() << ", Debug version";
 #else
-  *theApp->getLog() << ", CTSim Release version" << "\n";
+  *theApp->getLog() << ", Release version";
 #endif
-#ifdef CTSIMVERSION
-  *theApp->getLog() << "Version ";
-  *theApp->getLog() << CTSIMVERSION;
-#elif defined(VERSION)
-    *theApp->getLog() << "Version: " <<  VERSION;
+#ifdef VERSION
+    *theApp->getLog() << " " <<  VERSION;\r
+#elif defined(CTSIMVERSION)\r
+    *theApp->getLog() << " " <<  CTSIMVERSION;\r
 #endif
   *theApp->getLog() << "\n";
   
@@ -1044,12 +1046,10 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
     dlg.ShowModal();
   } else {
     wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n";
-#ifdef CTSIMVERSION
-    msg += "Version ";
-    msg += CTSIMVERSION;
-    msg += "\n\n";
-#elif defined(VERSION)
+#ifdef VERSION
     msg << "Version: " <<  VERSION << "\n\n";
+#elif defined(CTSIMVERSION)\r
+    msg << "Version: " <<  CTSIMVERSION << "\n\n";\r
 #endif
     msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
     
@@ -1058,21 +1058,8 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   }
 }
 
-#if 0
-ProjectionFileDocument*
-CTSimApp::newProjectionDoc()
-{
-  ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>
-    (m_pDocTemplProjection->CreateDocument (""));
-  if (newDoc) {
-    newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
-    newDoc->SetDocumentTemplate (m_pDocTemplProjection);
-    newDoc->OnNewDocument();
-  }
-  
-  return newDoc;
-}
-#endif
+\r
+// Create new documents\r
 
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()

diff --git a/src/ctsim.h b/src/ctsim.h
index 9895231f7f7b3c1558e5bceeb548d53d948cc162..89026e547098cb36474e695cc164751696a9a20c 100644 (file)
--- a/src/ctsim.h
+++ b/src/ctsim.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.h,v 1.64 2002/05/05 10:54:34 kevin Exp $
+**  $Id: ctsim.h,v 1.65 2002/06/20 11:55:44 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
@@ -24,7 +24,7 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
-
+\r
 #ifndef __CTSIMH__
 #define __CTSIMH__
 
@@ -82,7 +82,7 @@ class Graph3dFileDocument;
 
 
 #if defined(__WXMSW__) || defined (MSVC)
-#define CTSIM_WINHELP   1
+// #define CTSIM_WINHELP   1
 #endif
 
 // Define a new frame for main window