r1939: *** empty log message ***

diff --git a/doc/Makefile b/doc/Makefile
index f732437545a11bf60e2afff47ea2f716044d0823..e965a700b2d96ea352e0d501aee8f38aed590e3e 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -2,7 +2,7 @@ docs := ctsim.tex texhelp.sty psbox.tex logo.eps logo.gif ctsim-sgp.tex ctsim-co
 
 pkg=ctsim
 
-all: htmlhelp html pdf ps
+all: htmlhelp html pdf 
 
 CLEANFILES=$(pkg).ps $(pkg).hhc $(pkg).hhp $(pkg).hhk $(pkg).bib $(pkg).zip $(pkg).ilg $(pkg).ind $(pkg).dvi $(pkg).pdf $(pkg).htb $(pkg).bb $(pkg).blg $(pkg).idx $(pkg).toc $(pkg).bbl $(pkg).con $(pkg).ref $(pkg).blg
 
@@ -32,9 +32,10 @@ $(pkg).dvi: $(docs)
 
 .PHONY: htmlhelp
 htmlhelp: $(docs)
-       rm -f $(pkg)*.html $(pkg).hhp $(pkg).hhc $(pkg).hhk $(pkg).zip
+       rm -f $(pkg)*.html $(pkg).hh[pck] $(pkg).zip
        cp $(pkg)-tex2rtf.bib $(pkg).bib
        tex2rtf $(pkg).tex $(pkg).html -html  > /dev/null
+       ./maphhc.pl
        zip -q $(pkg).zip *.html *.gif $(pkg).hh[pck]
        mv $(pkg).zip $(pkg).htb
 

diff --git a/doc/ctsim.htb b/doc/ctsim.htb
index 662236631c5a65aa57bb1d52b4034eb974743212..fd3fd16853a4f6c4b3ee16bcf46e09447c9da385 100644 (file)
Binary files a/doc/ctsim.htb and b/doc/ctsim.htb differ

diff --git a/doc/maphhc.pl b/doc/maphhc.pl
new file mode 100755 (executable)
index 0000000..da839d0
--- /dev/null
+++ b/doc/maphhc.pl
@@ -0,0 +1,39 @@
+#!/usr/bin/perl -Tw
+
+my $mapfile = "../src/ctsim-map.h";
+my $hhcfile = "ctsim.hhc";
+my $newhhc = "ctsim-new.hhc";
+my %map;
+
+open (MAP, $mapfile) || print "Unable to open map file $mapfile";
+while (<MAP>) {
+    m|^\W*#define\W+IDH_(\w+)\W+(\w+)|;
+    $map{$1} = $2 if ($1 && $2);
+}
+close (MAP);
+
+open(HHC,$hhcfile) || print "Unable to open existing hhc file $hhcfile";
+open(NEWHHC,"> $newhhc") || print "Unable to open new hhc file $newhhc";
+while (<HHC>) {
+    $line=$_;
+    if ($line =~ m|(.*)\#IDH_([A-Za-z_]+)(.*)|) {
+       my $varname=$2;
+       print NEWHHC  $1 . $3 . "\n";
+       if ($map{$2}) {
+           print NEWHHC "<param name=\"ID\" value=\"$map{$2}\">\n";
+       } else {
+           print "Warning: unable to find IDH_$varname in $mapfile";
+       }
+    } else {
+       print NEWHHC $line;
+    }
+
+}
+
+close(HHC);
+close(NEWHHC);
+
+unlink($hhcfile);
+rename($newhhc,$hhcfile);
+
+exit(0);

diff --git a/src/ctsim-map.h b/src/ctsim-map.h
index 822135b7b3fb65cc141e1202a413753053e33ba6..d4ab3d7ed9b6b0d0b8fa63c358c7d8a1cba0888a 100644 (file)
--- a/src/ctsim-map.h
+++ b/src/ctsim-map.h
@@ -13,8 +13,9 @@
 #define IDH_DLG_POLAR          8613
 #define IDH_DLG_FFT_POLAR      8614
 #define IDH_DLG_RECON_FOURIER  8615
+#define IDH_DLG_RECONSTRUCTION_REBIN 8617
 
 // Need to add to .tex file
-#define IDH_DLG_IMPORT         8614
-#define IDH_DLG_THETA_RANGE    8615
+#define IDH_DLG_IMPORT         8620
+#define IDH_DLG_THETA_RANGE    8621
 

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 7f5193b520dfb931e643a4832a3895a21d24b9b9..40a1ff452aef7ec76aa2971b81e61ddab64e8894 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.107 2002/05/03 09:57:41 kevin Exp $
+**  $Id: ctsim.cpp,v 1.108 2002/05/05 08:09:34 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
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.107 2002/05/03 09:57:41 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.108 2002/05/05 08:09:34 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -201,8 +201,8 @@ CTSimApp::OnInit()
   if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
     *m_pLog << "Cannot initialize the Windows Help system" << "\n";
 #else
-  if (! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim") &&
-    ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/share/ctsim/ctsim"))
+  if (! m_pFrame->getHtmlHelpController().AddBook("/usr/share/ctsim/ctsim.htb") &&
+    ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/share/ctsim/ctsim.htb"))
     *m_pLog << "Cannot initialize the HTML Help system" << "\n";
   else {
     if (::wxDirExists ("/tmp"))
@@ -670,7 +670,7 @@ MainFrame::OnHelpButton (wxCommandEvent& event)
 void
 MainFrame::OnHelpSecondary (wxCommandEvent& event)
 {
-  m_htmlHelp.DisplayContents();
+  m_htmlHelp.Display ("Contents");
 }
 #endif
 
@@ -683,7 +683,7 @@ MainFrame::showHelp (int commandID)
 #ifdef CTSIM_WINHELP
     m_winHelp.DisplayContents ();
 #else
-    m_htmlHelp.DisplayContents ();
+    m_htmlHelp.Display ("Contents");
 #endif
     break;
     
@@ -1058,7 +1058,6 @@ CTSimApp::newProjectionDoc()
 {
   ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
   if (newDoc) {
-    ProjectionFileView* pView = newDoc->getView();
     newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplProjection);
     newDoc->OnNewDocument();