From: Kevin M. Rosenberg Date: Tue, 2 Jan 2001 13:16:43 +0000 (+0000) Subject: r340: no message X-Git-Tag: debian-4.5.3-3~677 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=e74fec298090c956a06ac16e89a482cd89e3056b r340: no message --- diff --git a/src/ctsim.h b/src/ctsim.h index 9a26c00..4425db3 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsim.h,v 1.18 2001/01/02 06:29:23 kevin Exp $ +** $Id: ctsim.h,v 1.19 2001/01/02 13:16:43 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 @@ -36,11 +36,15 @@ #endif class wxMenu; -class wxDocument; -class ImageFileDocument; -#include +class wxDocument; + +class ImageFileDocument; + +#include + + +#include "wx/docview.h" -#include "wx/docview.h" // Define a new frame for main window class MainFrame: public wxDocParentFrame @@ -53,23 +57,26 @@ private: enum { MAX_WINDOW_MENUITEMS = 20 }; wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS]; wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS]; - - int m_iDefaultPhantomID; - int m_iDefaultFilterID; - int m_iDefaultFilterDomainID; - unsigned int m_iDefaultFilterXSize; - unsigned int m_iDefaultFilterYSize; - double m_dDefaultFilterParam; - double m_dDefaultFilterBandwidth; - double m_dDefaultFilterInputScale; - double m_dDefaultFilterOutputScale; + + + int m_iDefaultPhantomID; + int m_iDefaultFilterID; + int m_iDefaultFilterDomainID; + unsigned int m_iDefaultFilterXSize; + unsigned int m_iDefaultFilterYSize; + double m_dDefaultFilterParam; + double m_dDefaultFilterBandwidth; + double m_dDefaultFilterInputScale; + double m_dDefaultFilterOutputScale; + public: MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type); void OnAbout (wxCommandEvent& event); void OnHelpContents (wxCommandEvent& event); - void OnCreatePhantom (wxCommandEvent& event); + void OnCreatePhantom (wxCommandEvent& event); + void OnCreateFilter (wxCommandEvent& event); void OnExit (wxCommandEvent& event); @@ -120,11 +127,16 @@ public: { return m_docManager; } wxString getUntitledFilename(); - - void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector& vecIF); - - bool getSetModifyNewDocs() const - { return true; } + + + void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector& vecIF); + + + + bool getSetModifyNewDocs() const + + { return true; } + private: wxDocManager* m_docManager; @@ -143,46 +155,56 @@ extern class CTSimApp* theApp; enum { - MAINMENU_HELP_ABOUT = 500, - MAINMENU_HELP_CONTENTS, - MAINMENU_FILE_CREATE_PHANTOM, - MAINMENU_FILE_CREATE_FILTER, - MAINMENU_FILE_EXIT, - IFMENU_FILE_PROPERTIES, - PJMENU_FILE_PROPERTIES, - PHMMENU_FILE_PROPERTIES, - PJMENU_PROCESS_RECONSTRUCT, - IFMENU_FILE_EXPORT, - IFMENU_PLOT_ROW, + MAINMENU_HELP_ABOUT = 500, + MAINMENU_HELP_CONTENTS, + MAINMENU_FILE_CREATE_PHANTOM, + + MAINMENU_FILE_CREATE_FILTER, + MAINMENU_FILE_EXIT, + + IFMENU_FILE_PROPERTIES, + PJMENU_FILE_PROPERTIES, + PHMMENU_FILE_PROPERTIES, + PJMENU_PROCESS_RECONSTRUCT, + + IFMENU_FILE_EXPORT, + + IFMENU_PLOT_ROW, IFMENU_PLOT_COL, - IFMENU_VIEW_SCALE_AUTO, - IFMENU_VIEW_SCALE_MINMAX, - IFMENU_COMPARE_IMAGES, - IFMENU_COMPARE_ROW, - IFMENU_COMPARE_COL, - IFMENU_IMAGE_SCALESIZE, - IFMENU_IMAGE_ADD, - IFMENU_IMAGE_SUBTRACT, - IFMENU_IMAGE_MULTIPLY, - IFMENU_IMAGE_DIVIDE, - IFMENU_FILTER_INVERTVALUES, - IFMENU_FILTER_SQRT, - IFMENU_FILTER_SQUARE, - IFMENU_FILTER_LOG, - IFMENU_FILTER_EXP, - IFMENU_FILTER_FOURIER, - IFMENU_FILTER_INVERSE_FOURIER, - IFMENU_FILTER_FFT, - IFMENU_FILTER_IFFT, - IFMENU_FILTER_MAGNITUDE, - IFMENU_FILTER_PHASE, - IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, - IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, - PHMMENU_PROCESS_RASTERIZE, - PHMMENU_PROCESS_PROJECTIONS, - PLOTMENU_VIEW_SCALE_MINMAX, + IFMENU_PLOT_HISTOGRAM, + + IFMENU_VIEW_SCALE_AUTO, + IFMENU_VIEW_SCALE_MINMAX, + + IFMENU_COMPARE_IMAGES, + IFMENU_COMPARE_ROW, + IFMENU_COMPARE_COL, + IFMENU_IMAGE_SCALESIZE, + IFMENU_IMAGE_ADD, + IFMENU_IMAGE_SUBTRACT, + IFMENU_IMAGE_MULTIPLY, + IFMENU_IMAGE_DIVIDE, + + IFMENU_FILTER_INVERTVALUES, + IFMENU_FILTER_SQRT, + IFMENU_FILTER_SQUARE, + IFMENU_FILTER_LOG, + IFMENU_FILTER_EXP, + IFMENU_FILTER_FOURIER, + IFMENU_FILTER_INVERSE_FOURIER, + IFMENU_FILTER_FFT, + IFMENU_FILTER_IFFT, + IFMENU_FILTER_MAGNITUDE, + IFMENU_FILTER_PHASE, + IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, + IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, + + PHMMENU_PROCESS_RASTERIZE, + PHMMENU_PROCESS_PROJECTIONS, + + PLOTMENU_VIEW_SCALE_MINMAX, PLOTMENU_VIEW_SCALE_AUTO, - MAINMENU_WINDOW_BASE, + MAINMENU_WINDOW_BASE, }; #endif diff --git a/src/views.h b/src/views.h index 024b885..4490689 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.21 2001/01/02 05:34:57 kevin Exp $ +** $Id: views.h,v 1.22 2001/01/02 13:16:43 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 @@ -55,8 +55,8 @@ private: double m_dMinPixel; double m_dMaxPixel; double m_dAutoScaleFactor; - - int m_iDefaultExportFormatID; + + int m_iDefaultExportFormatID; public: ImageFileView(void); @@ -65,40 +65,46 @@ public: bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); void OnUpdate(wxView *sender, wxObject *hint = NULL); - bool OnClose (bool deleteWindow = true); - + bool OnClose (bool deleteWindow = true); + void OnScaleSize (wxCommandEvent& event); - void OnExport (wxCommandEvent& event); + void OnExport (wxCommandEvent& event); + void OnProperties (wxCommandEvent& event); - void OnCompare (wxCommandEvent& event); - void OnInvertValues (wxCommandEvent& event); - void OnSquare (wxCommandEvent& event); - void OnSquareRoot (wxCommandEvent& event); - void OnLog (wxCommandEvent& event); - void OnExp (wxCommandEvent& event); - void OnAdd (wxCommandEvent& event); - void OnSubtract (wxCommandEvent& event); - void OnMultiply (wxCommandEvent& event); - void OnDivide (wxCommandEvent& event); - void OnFourier (wxCommandEvent& event); - void OnInverseFourier (wxCommandEvent& event); - void OnShuffleNaturalToFourierOrder (wxCommandEvent& event); - void OnShuffleFourierToNaturalOrder (wxCommandEvent& event); -#ifdef HAVE_FFTW - void OnFFT (wxCommandEvent& event); - void OnIFFT (wxCommandEvent& event); -#endif - void OnMagnitude (wxCommandEvent& event); - void OnPhase (wxCommandEvent& event); + void OnCompare (wxCommandEvent& event); + + void OnInvertValues (wxCommandEvent& event); + void OnSquare (wxCommandEvent& event); + void OnSquareRoot (wxCommandEvent& event); + void OnLog (wxCommandEvent& event); + void OnExp (wxCommandEvent& event); + void OnAdd (wxCommandEvent& event); + void OnSubtract (wxCommandEvent& event); + void OnMultiply (wxCommandEvent& event); + void OnDivide (wxCommandEvent& event); + void OnFourier (wxCommandEvent& event); + void OnInverseFourier (wxCommandEvent& event); + void OnShuffleNaturalToFourierOrder (wxCommandEvent& event); + void OnShuffleFourierToNaturalOrder (wxCommandEvent& event); + +#ifdef HAVE_FFTW + void OnFFT (wxCommandEvent& event); + void OnIFFT (wxCommandEvent& event); +#endif + + void OnMagnitude (wxCommandEvent& event); + void OnPhase (wxCommandEvent& event); + void OnScaleAuto (wxCommandEvent& event); void OnScaleMinMax (wxCommandEvent& event); - void OnPlotRow (wxCommandEvent& event); - void OnPlotCol (wxCommandEvent& event); - void OnCompareRow (wxCommandEvent& event); - void OnCompareCol (wxCommandEvent& event); - - wxFrame* getFrame() - { return m_frame; } + void OnPlotRow (wxCommandEvent& event); + void OnPlotCol (wxCommandEvent& event); + void OnHistogram (wxCommandEvent& event); + void OnCompareRow (wxCommandEvent& event); + void OnCompareCol (wxCommandEvent& event); + + wxFrame* getFrame() + { return m_frame; } ImageFileDocument* GetDocument(void) { return dynamic_cast(wxView::GetDocument()); } @@ -108,19 +114,19 @@ public: class ImageFileCanvas: public wxScrolledWindow { -private: - int m_xCursor; - int m_yCursor; - +private: + + int m_xCursor; + int m_yCursor; + public: ImageFileView* m_pView; ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); virtual void OnDraw(wxDC& dc); void OnMouseEvent(wxMouseEvent& event); - - void DrawRubberBandCursor (wxDC& dc, int x, int y); - bool GetCurrentCursor (int& x, int& y); + void DrawRubberBandCursor (wxDC& dc, int x, int y); + bool GetCurrentCursor (int& x, int& y); DECLARE_EVENT_TABLE() }; @@ -163,9 +169,9 @@ public: bool OnClose (bool deleteWindow = true); void OnProperties (wxCommandEvent& event); void OnReconstruct (wxCommandEvent& event); - - wxFrame* getFrame () - { return m_frame; } + + wxFrame* getFrame () + { return m_frame; } ProjectionFileDocument* GetDocument(void) { return dynamic_cast(wxView::GetDocument()); } @@ -227,9 +233,7 @@ public: PhantomView* m_pView; PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); - virtual void OnDraw(wxDC& dc); - }; class PlotFileCanvas; @@ -243,12 +247,13 @@ private: PlotFileCanvas *m_canvas; wxFrame *m_frame; - EZPlot* m_pEZPlot; - bool m_bMinSpecified; - bool m_bMaxSpecified; - double m_dMinPixel; - double m_dMaxPixel; - double m_dAutoScaleFactor; + EZPlot* m_pEZPlot; + + bool m_bMinSpecified; + bool m_bMaxSpecified; + double m_dMinPixel; + double m_dMaxPixel; + double m_dAutoScaleFactor; public: PlotFileView(void); @@ -259,8 +264,8 @@ public: void OnUpdate(wxView *sender, wxObject *hint = NULL); bool OnClose (bool deleteWindow = true); void OnProperties (wxCommandEvent& event); - void OnScaleAuto (wxCommandEvent& event); - void OnScaleMinMax (wxCommandEvent& event); + void OnScaleAuto (wxCommandEvent& event); + void OnScaleMinMax (wxCommandEvent& event); wxFrame* getFrame () { return m_frame; } @@ -281,6 +286,5 @@ public: }; - #endif