r340: no message

[ctsim.git] / src / views.h

diff --git a/src/views.h b/src/views.h
index 024b8857f9102da747f94ce20d59076078e4d34e..4490689db182153e14bc131f75897a76852ceaab 100644 (file)
--- 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;
-\r
-    int m_iDefaultExportFormatID;\r
+
+    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);\r
-\r
+    bool OnClose (bool deleteWindow = true);
+
     void OnScaleSize (wxCommandEvent& event);
-    void OnExport (wxCommandEvent& event);\r
+    void OnExport (wxCommandEvent& event);
+
     void OnProperties (wxCommandEvent& event);
-    void OnCompare (wxCommandEvent& event);\r
-    void OnInvertValues (wxCommandEvent& event);\r
-    void OnSquare (wxCommandEvent& event);\r
-    void OnSquareRoot (wxCommandEvent& event);\r
-    void OnLog (wxCommandEvent& event);\r
-    void OnExp (wxCommandEvent& event);\r
-    void OnAdd (wxCommandEvent& event);\r
-    void OnSubtract (wxCommandEvent& event);\r
-    void OnMultiply (wxCommandEvent& event);\r
-    void OnDivide (wxCommandEvent& event);\r
-    void OnFourier (wxCommandEvent& event);\r
-    void OnInverseFourier (wxCommandEvent& event);\r
-    void OnShuffleNaturalToFourierOrder (wxCommandEvent& event);\r
-    void OnShuffleFourierToNaturalOrder (wxCommandEvent& event);\r
-#ifdef HAVE_FFTW\r
-    void OnFFT (wxCommandEvent& event);\r
-    void OnIFFT (wxCommandEvent& event);\r
-#endif\r
-    void OnMagnitude (wxCommandEvent& event);\r
-    void OnPhase (wxCommandEvent& event);\r
+    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);\r
-         void OnPlotCol (wxCommandEvent& event);\r
-    void OnCompareRow (wxCommandEvent& event);\r
-    void OnCompareCol (wxCommandEvent& event);\r
-\r
-       wxFrame* getFrame()\r
-       { return m_frame; }\r
+         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<ImageFileDocument*>(wxView::GetDocument()); }
@@ -108,19 +114,19 @@ public:
 
 class ImageFileCanvas: public wxScrolledWindow
 {
-private:\r
-       int m_xCursor;\r
-       int m_yCursor;\r
-\r
+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);
-\r
-       void DrawRubberBandCursor (wxDC& dc, int x, int y);\r
-       bool GetCurrentCursor (int& x, int& y);\r
+       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);
-\r
-       wxFrame* getFrame ()\r
-       { return m_frame; }\r
+
+       wxFrame* getFrame ()
+       { return m_frame; }
 
     ProjectionFileDocument* GetDocument(void) 
        { return dynamic_cast<ProjectionFileDocument*>(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;\r
-    bool m_bMinSpecified;\r
-    bool m_bMaxSpecified;\r
-    double m_dMinPixel;\r
-    double m_dMaxPixel;\r
-    double m_dAutoScaleFactor;\r
+    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);\r
-    void OnScaleMinMax (wxCommandEvent& event);\r
+    void OnScaleAuto (wxCommandEvent& event);
+    void OnScaleMinMax (wxCommandEvent& event);
 
        wxFrame* getFrame ()
        { return m_frame; }
@@ -281,6 +286,5 @@ public:
 };
 
 
-
 #endif