bin_PROGRAMS = ctsim
-ctsim_SOURCES = ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp dlgreconstruct.h graph3dview.cpp graph3dview.h ctsim-map.h ctsim.xpm splash.xpm tips.cpp tips.h threadrecon.cpp threadrecon.h backgroundmgr.cpp backgroundmgr.h backgroundsupr.cpp backgroundsupr.h threadproj.cpp threadproj.h threadraster.cpp threadraster.h
+ctsim_SOURCES = ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp dlgreconstruct.h graph3dview.cpp graph3dview.h ctsim-map.h ctsim.xpm splash.xpm tips.cpp tips.h threadrecon.cpp threadrecon.h backgroundmgr.cpp backgroundmgr.h backgroundsupr.cpp backgroundsupr.h threadproj.cpp threadproj.h threadraster.cpp threadraster.h dlgezplot.cpp dlgezplot.h
ctsim_DEPENDENCIES = ../libctgraphics/libctgraphics.a ../libctsupport/libctsupport.a ../libctsim/libctsim.a ../include/ct.h
LIBS = @LIBS@
ctsim_OBJECTS = ctsim.o docs.o views.o dialogs.o dlgprojections.o \
dlgreconstruct.o graph3dview.o tips.o threadrecon.o backgroundmgr.o \
-backgroundsupr.o threadproj.o threadraster.o
+backgroundsupr.o threadproj.o threadraster.o dlgezplot.o
ctsim_LDFLAGS =
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
TAR = gtar
GZIP_ENV = --best
DEP_FILES = .deps/backgroundmgr.P .deps/backgroundsupr.P .deps/ctsim.P \
-.deps/dialogs.P .deps/dlgprojections.P .deps/dlgreconstruct.P \
-.deps/docs.P .deps/graph3dview.P .deps/threadproj.P \
-.deps/threadraster.P .deps/threadrecon.P .deps/tips.P .deps/views.P
+.deps/dialogs.P .deps/dlgezplot.P .deps/dlgprojections.P \
+.deps/dlgreconstruct.P .deps/docs.P .deps/graph3dview.P \
+.deps/threadproj.P .deps/threadraster.P .deps/threadrecon.P \
+.deps/tips.P .deps/views.P
SOURCES = $(ctsim_SOURCES)
OBJECTS = $(ctsim_OBJECTS)
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.h,v 1.61 2001/03/21 21:45:31 kevin Exp $
+** $Id: ctsim.h,v 1.62 2001/03/30 19:15:23 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
IFMENU_IMAGE_SUBTRACT,
IFMENU_IMAGE_MULTIPLY,
IFMENU_IMAGE_DIVIDE,
-#if wxUSE_GLCANVAS
+#ifdef wxUSE_GLCANVAS
IFMENU_IMAGE_CONVERT3D,
#endif
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.141 2001/03/28 16:44:41 kevin Exp $
+** $Id: views.cpp,v 1.142 2001/03/30 19:15:23 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
EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply)
EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide)
EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize)
-#if wxUSE_GLCANVAS
+#ifdef wxUSE_GLCANVAS
EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d)
#endif
#ifdef HAVE_FFT
double dScale3 = 3 * 255;
unsigned char* pixels = image.GetData();
ImageFileArray v = rIF.getArray();
- for (int ix = 0; ix < rIF.nx(); ix++) {
- for (int iy = 0; iy < rIF.ny(); iy++) {
+ for (unsigned int ix = 0; ix < rIF.nx(); ix++) {
+ for (unsigned int iy = 0; iy < rIF.ny(); iy++) {
unsigned int iBase = 3 * (iy * nx + ix);
if (ix == 0 && iy == 0 && (pixels[iBase] == pixels[iBase+1] && pixels[iBase+1] == pixels[iBase+2]))
bMonochrome = true;