r564: *** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index ea37d1015d67cb336f45dcb3e4a29d18660c4a6d..15cdf078d08eb9868640d5fa90583d7094278897 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ else
 EXTRA_DIRS3=
 endif
 
-SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include tools $(EXTRA_DIRS3) 
+SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include  $(EXTRA_DIRS3) tools
 
 EXTRA_DIST=acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
 

diff --git a/Makefile.in b/Makefile.in
index c4ecf25b06c86875f30f205ef0ec80edb67b451b..2d6f0ff874e0bb3fc019c372b0783aa1d1dcc3c8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,7 @@ wxlibs = @wxlibs@
 @HAVE_WXWINDOWS_TRUE@EXTRA_DIRS3 = src
 @HAVE_WXWINDOWS_FALSE@EXTRA_DIRS3 = 
 
-SUBDIRS = $(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include tools $(EXTRA_DIRS3) 
+SUBDIRS = $(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include  $(EXTRA_DIRS3) tools
 
 EXTRA_DIST = acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -114,7 +114,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 DIST_SUBDIRS =  getopt libctgraphics libctsupport libctsim man doc html \
-cgi-bin include tools src
+cgi-bin include src tools
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 

diff --git a/rpm/ctsim.spec b/rpm/ctsim.spec
index fccd54be2398d06aa43bce067e9fe3c8e7b5da06..8369d9fb6f6d4927ae25caac8efc806f14f0f4d6 100644 (file)
--- a/rpm/ctsim.spec
+++ b/rpm/ctsim.spec
@@ -1,5 +1,5 @@
 # Version of CTSim
-%define version 3.0.2
+%define version 3.0.3
 
 Summary: CTSim - Open-Source Computed Tomography Simulator
 Name: ctsim

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index d66101ff0e60bb038d51cd784b4176ee9306462c..c6df4ae743dce967d021bf82c80e6355beaebae4 100644 (file)
--- 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.82 2001/02/20 22:11:27 kevin Exp $
+**  $Id: ctsim.cpp,v 1.83 2001/02/21 00:09:31 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
@@ -72,7 +72,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.82 2001/02/20 22:11:27 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.83 2001/02/21 00:09:31 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -85,8 +85,8 @@ struct option CTSimApp::ctsimOptions[] =
 IMPLEMENT_APP(CTSimApp)
 
 CTSimApp::CTSimApp()
-: m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0),
-  m_bAdvancedOptions(false), m_bSetModifyNewDocs(true)
+:  m_bAdvancedOptions(false), m_bSetModifyNewDocs(true), 
+  m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0)
 {
        theApp = this;
 }
@@ -393,6 +393,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
        
        wxMenu* help_menu = new wxMenu;
        help_menu->Append (MAINMENU_HELP_CONTENTS, "&Contents\tF1");
+
   help_menu->Append (IDH_QUICKSTART, "&Quick Start");
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
        help_menu->Append (MAINMENU_HELP_SECONDARY, "&Secondary Help");
@@ -432,13 +433,13 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
        accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
        accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
        accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
-#ifndef CTSIM_MDI
        accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
+#ifndef CTSIM_MDI
        for (i = 0; i < 10; i++)
                accelEntries[i+4].Set (wxACCEL_CTRL, static_cast<int>('0'+i), MAINMENU_WINDOW_BASE+i);
        wxAcceleratorTable accelTable (15, accelEntries);
 #else
-       wxAcceleratorTable accelTable (4, accelEntries);
+       wxAcceleratorTable accelTable (5, accelEntries);
 #endif
        
        SetAcceleratorTable (accelTable);
@@ -593,12 +594,28 @@ MainFrame::showHelp (int commandID)
                m_htmlHelp.DisplayContents ();
 #endif
                break;
-               
+
+        case IDH_QUICKSTART:
+#ifdef CTSIM_WINHELP
+    m_winHelp.DisplaySection (commandID);
+#else
+    m_htmlHelp.Display (_T("Quick Start"));
+#endif
+    break;
+
+       case IDH_DLG_PROJECTIONS:
+#ifdef CTSIM_WINHELP
+    m_winHelp.DisplaySection (commandID);
+#else
+    m_htmlHelp.DisplaySection (_T("IDH_DLG_PROJECTIONS"));
+#endif
+    break;
+
        default:
 #ifdef CTSIM_WINHELP
     m_winHelp.DisplaySection (commandID);
 #else
-    m_htmlHelp.DisplaySection (commandID);
+    m_htmlHelp.Display (commandID);
 #endif
                break;
        }