projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r311: image comparison functions
[ctsim.git]
/
src
/
ctsim.h
diff --git
a/src/ctsim.h
b/src/ctsim.h
index 8367f21a9056b263c311f1c13a50e664241d71a8..dddf2105547c339dab97cf758d431ba826b3f128 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ctsim.h,v 1.
6 2000/09/07 01:28:33
kevin Exp $
+** $Id: ctsim.h,v 1.
12 2000/12/22 04:18:00
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
@@
-28,7
+28,6
@@
#ifndef __CTSIMH__
#define __CTSIMH__
#ifndef __CTSIMH__
#define __CTSIMH__
-#include "wx/docview.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@
-37,7
+36,11
@@
#endif
class wxMenu;
#endif
class wxMenu;
-class wxDocument;
+class wxDocument;
\r
+class ImageFileDocument;
\r
+#include <vector>
\r
+
+#include "wx/docview.h"
\r
// Define a new frame for main window
class MainFrame: public wxDocParentFrame
// Define a new frame for main window
class MainFrame: public wxDocParentFrame
@@
-47,7
+50,7
@@
private:
wxTextCtrl* m_pLog;
wxMenu* m_pWindowMenu;
wxTextCtrl* m_pLog;
wxMenu* m_pWindowMenu;
-
static const int MAX_WINDOW_MENUITEMS = 20
;
+
enum { MAX_WINDOW_MENUITEMS = 20 }
;
wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
@@
-106,6
+109,8
@@
public:
{ return m_docManager; }
wxString getUntitledFilename();
{ return m_docManager; }
wxString getUntitledFilename();
+
\r
+ void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
\r
private:
wxDocManager* m_docManager;
private:
wxDocManager* m_docManager;
@@
-131,11
+136,18
@@
enum {
IFMENU_FILE_PROPERTIES,
PJMENU_FILE_PROPERTIES,
PHMMENU_FILE_PROPERTIES,
IFMENU_FILE_PROPERTIES,
PJMENU_FILE_PROPERTIES,
PHMMENU_FILE_PROPERTIES,
- PJMENU_PROCESS_RECONSTRUCT,
+ PJMENU_PROCESS_RECONSTRUCT,
\r
+ IFMENU_PLOT_ROW,
\r
+ IFMENU_PLOT_COL,
IFMENU_VIEW_SCALE_AUTO,
IFMENU_VIEW_SCALE_AUTO,
- IFMENU_VIEW_SCALE_MINMAX,
+ IFMENU_VIEW_SCALE_MINMAX,
\r
+ IFMENU_COMPARE_IMAGES,
\r
+ IFMENU_COMPARE_ROW,
\r
+ IFMENU_COMPARE_COL,
\r
PHMMENU_PROCESS_RASTERIZE,
PHMMENU_PROCESS_RASTERIZE,
- PHMMENU_PROCESS_PROJECTIONS,
+ PHMMENU_PROCESS_PROJECTIONS,
\r
+ PLOTMENU_VIEW_SCALE_MINMAX,
\r
+ PLOTMENU_VIEW_SCALE_AUTO,
MAINMENU_WINDOW_BASE,
};
MAINMENU_WINDOW_BASE,
};