projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r636: Optimized Rebinning, Added Reconstruct with Rebinning option
[ctsim.git]
/
src
/
views.h
diff --git
a/src/views.h
b/src/views.h
index 14a7e0c93913d80b271d0391408b722c42231c7d..69c2a1424ee4f3dfe4b67481fc3ed3fecbeddae5 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.
45 2001/02/08 06:25:07
kevin Exp $
+** $Id: views.h,v 1.
51 2001/03/13 08:24: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
**
** 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
@@
-35,6
+35,7
@@
#include "wx/wx.h"
#include "docs.h"
#include "imagefile.h"
#include "wx/wx.h"
#include "docs.h"
#include "imagefile.h"
+#include "threadrecon.h"
#if wxUSE_GLCANVAS
#include "graph3dview.h"
#if wxUSE_GLCANVAS
#include "graph3dview.h"
@@
-90,6
+91,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);
@@
-182,12
+187,12
@@
public:
class ProjectionFileCanvas;
class ProjectionFileView : public wxView
{
class ProjectionFileCanvas;
class ProjectionFileView : public wxView
{
+private:
DECLARE_DYNAMIC_CLASS(ProjectionFileView)
DECLARE_DYNAMIC_CLASS(ProjectionFileView)
-
wxMemoryDC m_memoryDC;
+ wxMemoryDC m_memoryDC;
wxBitmap m_bitmap;
wxBitmap m_bitmap;
-private:
ProjectionFileCanvas *CreateCanvas (wxFrame* parent);
#if CTSIM_MDI
wxDocMDIChildFrame* m_pFrame;
ProjectionFileCanvas *CreateCanvas (wxFrame* parent);
#if CTSIM_MDI
wxDocMDIChildFrame* m_pFrame;
@@
-199,7
+204,7
@@
private:
ProjectionFileCanvas *m_pCanvas;
wxMenu* m_pFileMenu;
ProjectionFileCanvas *m_pCanvas;
wxMenu* m_pFileMenu;
-
+
int m_iDefaultNX;
int m_iDefaultNY;
int m_iDefaultFilter;
int m_iDefaultNX;
int m_iDefaultNY;
int m_iDefaultFilter;
@@
-236,10
+241,16
@@
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 OnConvertPolar (wxCommandEvent& event);
void OnConvertFFTPolar (wxCommandEvent& event);
void OnReconstructFourier (wxCommandEvent& event);
void OnConvertPolar (wxCommandEvent& event);
void OnConvertFFTPolar (wxCommandEvent& event);
-
+ void OnPlotTThetaSampling (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
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
#else
@@
-296,6
+307,7
@@
private:
int m_iDefaultTrace;
double m_dDefaultRotation;
double m_dDefaultFocalLength;
int m_iDefaultTrace;
double m_dDefaultRotation;
double m_dDefaultFocalLength;
+ double m_dDefaultCenterDetectorLength;
double m_dDefaultViewRatio;
double m_dDefaultScanRatio;
double m_dDefaultViewRatio;
double m_dDefaultScanRatio;