From: Kevin M. Rosenberg Date: Fri, 26 Jan 2001 00:46:05 +0000 (+0000) Subject: r435: *** empty log message *** X-Git-Tag: debian-4.5.3-3~582 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=dd8faeb9c2a1633c96ca31bce81e338a591fab71 r435: *** empty log message *** --- diff --git a/doc/tex2rtf/Makefile.am b/doc/tex2rtf/Makefile.am new file mode 100644 index 0000000..1e81f14 --- /dev/null +++ b/doc/tex2rtf/Makefile.am @@ -0,0 +1,8 @@ +docs=ctsim.tex ctsim.bib texhelp.sty psbox.tex logo-huge.bmp tex2rtf.ini ctsim.hpj bullet.bmp verbatim.sty mytitle.sty makeidx.sty mysober.sty fancyhea.sty ctsim.bib +EXTRA_DIST = ${docs} + +dvi: ctsim.tex + bibtex ctsim + latex ctsim + makeindex ctsim + latex ctsim \ No newline at end of file diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 3cdd121..5a310ba 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,13 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP443.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP90.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.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c "C:\ctsim\src\views.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP443.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP444.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP90.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP91.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 xpmd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib" .\Debug\ctsim.obj @@ -28,7 +28,7 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w \wx2\lib\wxd.lib \wx2\lib\xpmd.lib ] -Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP444.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP91.tmp"

Output Window

Compiling... views.cpp diff --git a/src/ctsim.cpp b/src/ctsim.cpp index ee7b4a8..d0cc8c6 100644 --- 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.40 2001/01/20 17:43:41 kevin Exp $ +** $Id: ctsim.cpp,v 1.41 2001/01/26 00:45:24 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.40 2001/01/20 17:43:41 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.41 2001/01/26 00:45:24 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -207,6 +207,11 @@ CTSimApp::usage(const char* program) int CTSimApp::OnExit() { + if (theApp->getConfig()) + theApp->getDocManager()->FileHistorySave (*theApp->getConfig()); + delete theApp->getDocManager(); + m_docManager = NULL; + #ifdef HAVE_DMALLOC dmalloc_shutdown(); #endif @@ -293,6 +298,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const file_menu->Append(MAINMENU_FILE_EXIT, "E&xit"); // history of files visited + theApp->getDocManager()->FileHistoryAddFilesToMenu(file_menu); theApp->getDocManager()->FileHistoryUseMenu(file_menu); #ifndef CTSIM_MDI @@ -355,9 +361,6 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const MainFrame::~MainFrame() { - if (theApp->getConfig()) - theApp->getDocManager()->FileHistorySave (*theApp->getConfig()); - delete theApp->getDocManager(); } void @@ -546,7 +549,7 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent) void MainFrame::OnMRUFile (wxCommandEvent& event) { - wxString fileName (theApp->getDocManager()->GetHistoryFile(event.GetSelection())); + wxString fileName (theApp->getDocManager()->GetHistoryFile(event.GetId() - wxID_FILE1)); if (fileName != "") theApp->getDocManager()->CreateDocument(fileName, wxDOC_SILENT); } diff --git a/src/views.cpp b/src/views.cpp index 167c76e..65ab9f6 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.cpp,v 1.69 2001/01/20 17:43:41 kevin Exp $ +** $Id: views.cpp,v 1.70 2001/01/26 00:45:24 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 @@ -81,6 +81,8 @@ ImageFileCanvas::~ImageFileCanvas() if (m_pView) { wxMenu* pMenu = m_pView->getFileMenu(); theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + m_pView->canvasClosed(); + m_pView = NULL; } } @@ -996,10 +998,10 @@ ImageFileView::OnClose (bool deleteWindow) // m_canvas->Clear(); // m_canvas->setView(NULL); -// m_canvas = NULL; + m_canvas = NULL; wxString s(theApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); +// if (m_frame) +// m_frame->SetTitle(s); SetFrame(NULL); Activate(false); @@ -1705,6 +1707,8 @@ PhantomCanvas::~PhantomCanvas () if (m_pView) { wxMenu* pMenu = m_pView->getFileMenu(); theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + m_pView->canvasClosed(); + m_pView = NULL; } } @@ -2021,7 +2025,7 @@ PhantomView::OnClose (bool deleteWindow) // m_canvas->Clear(); // m_canvas->setView(NULL); -// m_canvas = NULL; + m_canvas = NULL; wxString s(wxTheApp->GetAppName()); if (m_frame) m_frame->SetTitle(s); @@ -2029,8 +2033,10 @@ PhantomView::OnClose (bool deleteWindow) Activate(false); - if (deleteWindow) + if (deleteWindow) { delete m_frame; + m_frame = NULL; + } return true; } @@ -2060,6 +2066,8 @@ ProjectionFileCanvas::~ProjectionFileCanvas () if (m_pView) { wxMenu* pMenu = m_pView->getFileMenu(); theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + m_pView->canvasClosed(); + m_pView = NULL; } } @@ -2339,6 +2347,8 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); #endif + theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *convert_menu = new wxMenu; convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L"); @@ -2474,12 +2484,12 @@ ProjectionFileView::OnClose (bool deleteWindow) if (!GetDocument()->Close()) return false; -// m_canvas->Clear(); -// m_canvas->setView(NULL); -// m_canvas = NULL; - wxString s(wxTheApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); + //m_canvas->Clear(); + //m_canvas->setView(NULL); + m_canvas = NULL; +// wxString s(wxTheApp->GetAppName()); +// if (m_frame) +// m_frame->SetTitle(s); SetFrame(NULL); Activate(false); @@ -2505,6 +2515,8 @@ PlotFileCanvas::~PlotFileCanvas () if (m_pView) { wxMenu* pMenu = m_pView->getFileMenu(); theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + m_pView->canvasClosed(); + m_pView = NULL; } } @@ -2798,12 +2810,12 @@ PlotFileView::OnClose (bool deleteWindow) if (!GetDocument()->Close()) return false; -// m_canvas->Clear(); -// m_canvas->setView (NULL); -// m_canvas = NULL; - wxString s(wxTheApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); + //m_canvas->Clear(); + //m_canvas->setView (NULL); + m_canvas = NULL; +// wxString s(wxTheApp->GetAppName()); +// if (m_frame) +// m_frame->SetTitle(s); SetFrame(NULL); Activate(false); @@ -2823,8 +2835,6 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) TextEditView::~TextEditView() { - if (m_pFileMenu) - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) @@ -2945,5 +2955,7 @@ TextEditCanvas::~TextEditCanvas () if (m_pView) { wxMenu* pMenu = m_pView->getFileMenu(); theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + m_pView->canvasClosed(); + m_pView = NULL; } } diff --git a/src/views.h b/src/views.h index 834bdfe..9f57f55 100644 --- a/src/views.h +++ b/src/views.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.h,v 1.28 2001/01/20 17:43:41 kevin Exp $ +** $Id: views.h,v 1.29 2001/01/26 00:45:24 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 @@ -69,6 +69,8 @@ private: public: ImageFileView(void); virtual ~ImageFileView(void); + void canvasClosed() + { m_canvas = NULL; m_frame = NULL; } wxMenu* getFileMenu() { return m_pFileMenu; } @@ -201,6 +203,8 @@ private: public: ProjectionFileView(void); virtual ~ProjectionFileView(void); + void canvasClosed() + { m_canvas = NULL; m_frame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); @@ -274,6 +278,8 @@ private: public: PhantomView(void); virtual ~PhantomView(void); + void canvasClosed() + { m_canvas = NULL; m_frame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnUpdate(wxView *sender, wxObject *hint = NULL); @@ -333,6 +339,8 @@ private: public: PlotFileView(void); virtual ~PlotFileView(void); + void canvasClosed() + { m_canvas = NULL; m_frame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); @@ -385,6 +393,8 @@ public: : wxView() , m_pFrame(0), m_pCanvas(0) {} ~TextEditView(); + void canvasClosed() + { m_pFrame = NULL; } wxFrame *CreateChildFrame(wxDocument *doc, wxView *view);