From 83158c3c680f32c698a3be9d1dbf6d37b53d6bc8 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 5 May 2002 08:09:34 +0000 Subject: [PATCH] r1939: *** empty log message *** --- doc/Makefile | 5 +++-- doc/ctsim.htb | Bin 138853 -> 138766 bytes doc/maphhc.pl | 39 +++++++++++++++++++++++++++++++++++++++ src/ctsim-map.h | 5 +++-- src/ctsim.cpp | 13 ++++++------- 5 files changed, 51 insertions(+), 11 deletions(-) create mode 100755 doc/maphhc.pl diff --git a/doc/Makefile b/doc/Makefile index f732437..e965a70 100644 --- 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 GIT binary patch delta 9106 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 WpK@Bd?`^}r{j=SQ!zIprAMhXVh9oio delta 9194 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 { + 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 () { + $line=$_; + if ($line =~ m|(.*)\#IDH_([A-Za-z_]+)(.*)|) { + my $varname=$2; + print NEWHHC $1 . $3 . "\n"; + if ($map{$2}) { + print NEWHHC "\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 822135b..d4ab3d7 100644 --- 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 7f5193b..40a1ff4 100644 --- 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(m_pDocTemplProjection->CreateDocument ("")); if (newDoc) { - ProjectionFileView* pView = newDoc->getView(); newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName()); newDoc->SetDocumentTemplate (m_pDocTemplProjection); newDoc->OnNewDocument(); -- 2.34.1