r647: *** empty log message ***

diff --git a/src/Makefile.in b/src/Makefile.in
index 30fc3783595c0a7889755a680f824aaadbf9f487..e8906ae61e31348c14a1fcaadbd6c5277719b90f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -92,7 +92,7 @@ wxlibs = @wxlibs@
 
 bin_PROGRAMS = ctsim
 
 
 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
 
 
 ctsim_DEPENDENCIES = ../libctgraphics/libctgraphics.a ../libctsupport/libctsupport.a ../libctsim/libctsim.a ../include/ct.h


@@ -109,7 +109,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ctsim_OBJECTS =  ctsim.o docs.o views.o dialogs.o dlgprojections.o \
 dlgreconstruct.o graph3dview.o tips.o threadrecon.o backgroundmgr.o \
 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)
 ctsim_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)


@@ -127,9 +127,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/backgroundmgr.P .deps/backgroundsupr.P .deps/ctsim.P \
 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)
 
 SOURCES = $(ctsim_SOURCES)
 OBJECTS = $(ctsim_OBJECTS)
 

diff --git a/src/ctsim.h b/src/ctsim.h
index 4b992da8479d9f48c5a418030b422a8e22a24401..5b49cdc5c929994069f7c202221dea708fdee930 100644 (file)
--- a/src/ctsim.h
+++ b/src/ctsim.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: 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
 **
 **  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


@@ -341,7 +341,7 @@ enum {
     IFMENU_IMAGE_SUBTRACT,
     IFMENU_IMAGE_MULTIPLY,
     IFMENU_IMAGE_DIVIDE,
     IFMENU_IMAGE_SUBTRACT,
     IFMENU_IMAGE_MULTIPLY,
     IFMENU_IMAGE_DIVIDE,

-#if wxUSE_GLCANVAS
+#ifdef wxUSE_GLCANVAS

     IFMENU_IMAGE_CONVERT3D,
 #endif
 
     IFMENU_IMAGE_CONVERT3D,
 #endif
 

diff --git a/src/views.cpp b/src/views.cpp
index 631f481f78cda69482ea5bf6fa66551721812252..ebca038c6c32fbc6ad3929523fbe2adcddfe7bc4 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -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.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
 **
 **  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


@@ -228,7 +228,7 @@ EVT_MENU(IFMENU_IMAGE_SUBTRACT, ImageFileView::OnSubtract)
 EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply)
 EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide)
 EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize)
 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
 EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d)
 #endif
 #ifdef HAVE_FFT


@@ -1195,8 +1195,8 @@ ImageFileView::OnEditPaste (wxCommandEvent& event)
       double dScale3 = 3 * 255;
       unsigned char* pixels = image.GetData();
       ImageFileArray v = rIF.getArray();
       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;
           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;