From: Kevin M. Rosenberg Date: Sat, 27 Jan 2001 02:01:41 +0000 (+0000) Subject: r445: no message X-Git-Tag: debian-4.5.3-3~572 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=af2b058715fb690c708734708ac178490371b3ad r445: no message --- diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 3f80d03..287fbbe 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,16 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP181.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP18B.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\ctsim.cpp" +"C:\ctsim\src\dialogs.cpp" +"C:\ctsim\src\docs.cpp" "C:\ctsim\src\views.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP181.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP182.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP18B.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP18C.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,16 +31,14 @@ 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\RSP182.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP18C.tmp"

Output Window

Compiling... +ctsim.cpp views.cpp -Linking... +dialogs.cpp +cl.exe terminated at user request. - - -

Results

-ctsim.exe - 0 error(s), 0 warning(s) diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 01f9e8e..bbb3d4b 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.47 2001/01/27 01:54:55 kevin Exp $ +** $Id: ctsim.cpp,v 1.48 2001/01/27 01:57:29 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.47 2001/01/27 01:54:55 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.48 2001/01/27 01:57:29 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -151,7 +151,7 @@ CTSimApp::OnInit() int xDisplay, yDisplay; ::wxDisplaySize (&xDisplay, &yDisplay); m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0), - wxSize(nearest(xDisplay * .75), nearest(yDisplay * .755), wxDEFAULT_FRAME_STYLE); + wxSize(nearest(xDisplay * .75), nearest(yDisplay * .755)), wxDEFAULT_FRAME_STYLE); setIconForFrame (m_pFrame); m_pFrame->Centre(wxBOTH); @@ -376,7 +376,9 @@ void MainFrame::OnSize (wxSizeEvent& event) { #ifdef CTSIM_MDI - wxSize sizeClient = wxMDIParentFrame::GetClientSize(); + int xSize, ySize; + wxMDIParentFrame::GetClientSize(&xSize, &ySize); + wxSize sizeClient (xSize, ySize); #else wxSize sizeClient = GetClientSize(); #endif diff --git a/src/views.cpp b/src/views.cpp index e2c0c47..4e4313d 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.76 2001/01/27 01:51:47 kevin Exp $ +** $Id: views.cpp,v 1.77 2001/01/27 02:01:41 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 @@ -224,7 +224,7 @@ EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram) END_EVENT_TABLE() ImageFileView::ImageFileView() -: wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0) +: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) { m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; } diff --git a/src/views.h b/src/views.h index 81cf6a7..94b41fe 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.33 2001/01/27 01:51:47 kevin Exp $ +** $Id: views.h,v 1.34 2001/01/27 02:01:41 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 @@ -53,9 +53,9 @@ private: wxDocChildFrame* m_pFrame; wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); #endif - wxMenu* m_pFileMenu; - ImageFileCanvas *m_canvas; + ImageFileCanvas *m_pCanvas; + wxMenu* m_pFileMenu; bool m_bMinSpecified; bool m_bMaxSpecified; double m_dMinPixel; @@ -75,7 +75,7 @@ public: ImageFileView(); virtual ~ImageFileView(); void canvasClosed() - { m_canvas = NULL; m_pFrame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } wxMenu* getFileMenu() { return m_pFileMenu; } @@ -182,7 +182,7 @@ private: wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); #endif - ProjectionFileCanvas *m_canvas; + ProjectionFileCanvas *m_pCanvas; wxMenu* m_pFileMenu; int m_iDefaultNX; @@ -213,7 +213,7 @@ public: ProjectionFileView(); virtual ~ProjectionFileView(); void canvasClosed() - { m_canvas = NULL; m_pFrame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); @@ -266,7 +266,7 @@ private: wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); #endif - PhantomCanvas *m_canvas; + PhantomCanvas *m_pCanvas; wxMenu* m_pFileMenu; int m_iDefaultNDet; @@ -293,7 +293,7 @@ public: PhantomFileView(); virtual ~PhantomFileView(); void canvasClosed() - { m_canvas = NULL; m_pFrame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnUpdate(wxView *sender, wxObject *hint = NULL); @@ -330,7 +330,6 @@ class PlotFileView : public wxView DECLARE_DYNAMIC_CLASS(PlotFileView) private: - PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); #if CTSIM_MDI wxDocMDIChildFrame* m_pFrame; wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); @@ -339,9 +338,9 @@ private: wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); #endif - PlotFileCanvas *m_canvas; - wxMenu* m_pFileMenu; + PlotFileCanvas *m_pCanvas; EZPlot* m_pEZPlot; + wxMenu* m_pFileMenu; bool m_bMinSpecified; bool m_bMaxSpecified; @@ -349,6 +348,7 @@ private: double m_dMaxPixel; double m_dAutoScaleFactor; + PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); wxWindow* getFrameForChild() #if CTSIM_MDI { return theApp->getMainFrame()->GetClientWindow(); } @@ -360,7 +360,7 @@ public: PlotFileView(); virtual ~PlotFileView(); void canvasClosed() - { m_canvas = NULL; m_pFrame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc);