projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4388: Automatic commit for debian_version_4_2_3-3
[ctsim.git]
/
src
/
views.h
diff --git
a/src/views.h
b/src/views.h
index 38ea68519962de6a43f4eda0c4d117fe2c8b6bf3..0dc47c91f55f241147f44285c4a708df006a3a15 100644
(file)
--- a/
src/views.h
+++ b/
src/views.h
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.h,v 1.
48 2001/03/10 23:14:16
kevin Exp $
+** $Id: views.h,v 1.
61 2003/03/15 10:27:30
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
**
** 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
@@
-25,10
+25,6
@@
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-#ifdef __GNUG__
-// #pragma interface
-#endif
-
#ifndef __VIEWSH__
#define __VIEWSH__
#ifndef __VIEWSH__
#define __VIEWSH__
@@
-48,7
+44,7
@@
private:
DECLARE_DYNAMIC_CLASS(ImageFileView)
wxMemoryDC m_memoryDC;
DECLARE_DYNAMIC_CLASS(ImageFileView)
wxMemoryDC m_memoryDC;
- wxBitmap
m_b
itmap;
+ wxBitmap
* m_pB
itmap;
wxMenu* m_pMenuAnalyze;
ImageFileCanvas *CreateCanvas (wxFrame* parent);
wxMenu* m_pMenuAnalyze;
ImageFileCanvas *CreateCanvas (wxFrame* parent);
@@
-62,6
+58,7
@@
private:
ImageFileCanvas *m_pCanvas;
wxMenu* m_pFileMenu;
ImageFileCanvas *m_pCanvas;
wxMenu* m_pFileMenu;
+ wxMenu* m_pFilterMenu;
bool m_bMinSpecified;
bool m_bMaxSpecified;
double m_dMinPixel;
bool m_bMinSpecified;
bool m_bMaxSpecified;
double m_dMinPixel;
@@
-91,6
+88,10
@@
public:
void OnUpdate(wxView *sender, wxObject *hint = NULL);
bool OnClose (bool deleteWindow = true);
void OnUpdate(wxView *sender, wxObject *hint = NULL);
bool OnClose (bool deleteWindow = true);
+ void OnEditCopy (wxCommandEvent& event);
+ void OnEditCut (wxCommandEvent& event);
+ void OnEditPaste (wxCommandEvent& event);
+
void OnRevert (wxCommandEvent& event);
void OnExport (wxCommandEvent& event);
void OnProperties (wxCommandEvent& event);
void OnRevert (wxCommandEvent& event);
void OnExport (wxCommandEvent& event);
void OnProperties (wxCommandEvent& event);
@@
-125,6
+126,8
@@
public:
void OnMagnitude (wxCommandEvent& event);
void OnPhase (wxCommandEvent& event);
void OnMagnitude (wxCommandEvent& event);
void OnPhase (wxCommandEvent& event);
+ void OnReal (wxCommandEvent& event);
+ void OnImaginary (wxCommandEvent& event);
void OnScaleAuto (wxCommandEvent& event);
void OnScaleMinMax (wxCommandEvent& event);
void OnScaleAuto (wxCommandEvent& event);
void OnScaleMinMax (wxCommandEvent& event);
@@
-144,6
+147,7
@@
public:
#else
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
#else
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
+ void setInitialClientSize();
wxMenu* getMenuAnalyze() { return m_pMenuAnalyze; }
wxMenu* getMenuAnalyze() { return m_pMenuAnalyze; }
@@
-187,7
+191,7
@@
private:
DECLARE_DYNAMIC_CLASS(ProjectionFileView)
wxMemoryDC m_memoryDC;
DECLARE_DYNAMIC_CLASS(ProjectionFileView)
wxMemoryDC m_memoryDC;
- wxBitmap
m_b
itmap;
+ wxBitmap
* m_pB
itmap;
ProjectionFileCanvas *CreateCanvas (wxFrame* parent);
#if CTSIM_MDI
ProjectionFileCanvas *CreateCanvas (wxFrame* parent);
#if CTSIM_MDI
@@
-200,6
+204,8
@@
private:
ProjectionFileCanvas *m_pCanvas;
wxMenu* m_pFileMenu;
ProjectionFileCanvas *m_pCanvas;
wxMenu* m_pFileMenu;
+ wxMenu* m_pReconstructMenu;
+ wxMenu* m_pConvertMenu;
int m_iDefaultNX;
int m_iDefaultNY;
int m_iDefaultNX;
int m_iDefaultNY;
@@
-237,19
+243,28
@@
public:
bool OnClose (bool deleteWindow = true);
void OnProperties (wxCommandEvent& event);
void OnReconstructFBP (wxCommandEvent& event);
bool OnClose (bool deleteWindow = true);
void OnProperties (wxCommandEvent& event);
void OnReconstructFBP (wxCommandEvent& event);
+ void OnReconstructFBPRebin (wxCommandEvent& event);
void OnReconstructFourier (wxCommandEvent& event);
void OnReconstructFourier (wxCommandEvent& event);
+ void OnConvertRectangular (wxCommandEvent& event);
void OnConvertPolar (wxCommandEvent& event);
void OnConvertFFTPolar (wxCommandEvent& event);
void OnPlotTThetaSampling (wxCommandEvent& event);
void OnConvertPolar (wxCommandEvent& event);
void OnConvertFFTPolar (wxCommandEvent& event);
void OnPlotTThetaSampling (wxCommandEvent& event);
-
+ void OnPlotHistogram (wxCommandEvent& event);
+ void OnConvertParallel (wxCommandEvent& event);
+ void OnArtifactReduction (wxCommandEvent& event);
+
+ void doReconstructFBP (const Projections& rProj, bool bRebinToParallel);
+
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
#else
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
ProjectionFileCanvas* getCanvas() { return m_pCanvas; }
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
#else
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
ProjectionFileCanvas* getCanvas() { return m_pCanvas; }
+ void setInitialClientSize();
wxMenu* getFileMenu() { return m_pFileMenu; }
wxMenu* getFileMenu() { return m_pFileMenu; }
+ wxMenu* getReconstructMenu() { return m_pReconstructMenu; }
ProjectionFileDocument* GetDocument()
{ return dynamic_cast<ProjectionFileDocument*>(wxView::GetDocument()); }
ProjectionFileDocument* GetDocument()
{ return dynamic_cast<ProjectionFileDocument*>(wxView::GetDocument()); }
@@
-293,6
+308,7
@@
private:
int m_iDefaultNDet;
int m_iDefaultNView;
int m_iDefaultNDet;
int m_iDefaultNView;
+ int m_iDefaultOffsetView;
int m_iDefaultNSample;
int m_iDefaultGeometry;
int m_iDefaultTrace;
int m_iDefaultNSample;
int m_iDefaultGeometry;
int m_iDefaultTrace;
@@
-408,6
+424,7
@@
public:
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
+ void setInitialClientSize();
wxMenu* getFileMenu() { return m_pFileMenu; }
PlotFileDocument* GetDocument()
{ return dynamic_cast<PlotFileDocument*>(wxView::GetDocument()); }
wxMenu* getFileMenu() { return m_pFileMenu; }
PlotFileDocument* GetDocument()
{ return dynamic_cast<PlotFileDocument*>(wxView::GetDocument()); }
@@
-425,6
+442,7
@@
public:
virtual ~PlotFileCanvas();
virtual void OnDraw(wxDC& dc);
virtual ~PlotFileCanvas();
virtual void OnDraw(wxDC& dc);
+ virtual wxSize GetBestSize() const;
void setView (PlotFileView* pView)
{ m_pView = pView; }
void setView (PlotFileView* pView)
{ m_pView = pView; }
@@
-479,6
+497,7
@@
class TextFileCanvas: public wxTextCtrl
public:
TextFileCanvas (TextFileView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
~TextFileCanvas ();
public:
TextFileCanvas (TextFileView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
~TextFileCanvas ();
+ virtual wxSize GetBestSize() const;
};
};