/*****************************************************************************
** FILE IDENTIFICATION
**
-** Name: imagefile.cpp
-** Purpose: Imagefile classes
+** Name: imagefile.cpp
+** Purpose: Imagefile classes
** Programmer: Kevin Rosenberg
** Date Started: June 2000
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: imagefile.cpp,v 1.37 2001/01/28 19:10:18 kevin Exp $
+** $Id: imagefile.cpp,v 1.38 2001/03/01 20:02:18 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
#include "ct.h"
-const int ImageFile::FORMAT_INVALID = -1;
-const int ImageFile::FORMAT_PGM = 0;
-const int ImageFile::FORMAT_PGMASCII = 1;
+const double ImageFile::s_dRedGrayscaleFactor = 0.299;
+const double ImageFile::s_dGreenGrayscaleFactor = 0.587;
+const double ImageFile::s_dBlueGrayscaleFactor = 0.114;
+
+
+const int ImageFile::EXPORT_FORMAT_INVALID = -1;
+const int ImageFile::EXPORT_FORMAT_PGM = 0;
+const int ImageFile::EXPORT_FORMAT_PGMASCII = 1;
#ifdef HAVE_PNG
-const int ImageFile::FORMAT_PNG = 2;
-const int ImageFile::FORMAT_PNG16 = 3;
+const int ImageFile::EXPORT_FORMAT_PNG = 2;
+const int ImageFile::EXPORT_FORMAT_PNG16 = 3;
+#endif
+#ifdef HAVE_CTN_DICOM
+const int ImageFile::EXPORT_FORMAT_DICOM = 4;
#endif
-const char* ImageFile::s_aszFormatName[] =
+const char* ImageFile::s_aszExportFormatName[] =
{
{"pgm"},
{"pgmascii"},
{"png"},
{"png16"},
#endif
+#ifdef HAVE_CTN_DICOM
+ {"dicom"},
+#endif
};
-const char* ImageFile::s_aszFormatTitle[] =
+const char* ImageFile::s_aszExportFormatTitle[] =
{
{"PGM"},
{"PGM ASCII"},
{"PNG"},
{"PNG 16-bit"},
+#ifdef HAVE_CTN_DICOM
+ {"Dicom"},
+#endif
+};
+const int ImageFile::s_iExportFormatCount = sizeof(s_aszExportFormatName) / sizeof(const char*);
+
+
+const int ImageFile::IMPORT_FORMAT_INVALID = -1;
+const int ImageFile::IMPORT_FORMAT_PPM = 0;
+#ifdef HAVE_PNG
+const int ImageFile::IMPORT_FORMAT_PNG = 1;
+#endif
+#ifdef HAVE_CTN_DICOM
+const int ImageFile::IMPORT_FORMAT_DICOM = 2;
+#endif
+
+
+const char* ImageFile::s_aszImportFormatName[] =
+{
+ {"ppm"},
+#ifdef HAVE_PNG
+ {"png"},
+#endif
+#ifdef HAVE_CTN_DICOM
+ {"dicom"},
+#endif
};
-const int ImageFile::s_iFormatCount = sizeof(s_aszFormatName) / sizeof(const char*);
+const char* ImageFile::s_aszImportFormatTitle[] =
+{
+ {"PPM"},
+ {"PNG"},
+#ifdef HAVE_CTN_DICOM
+ {"Dicom"},
+#endif
+};
+const int ImageFile::s_iImportFormatCount = sizeof(s_aszImportFormatName) / sizeof(const char*);
iXCenter = m_nx / 2;
else
iXCenter = (m_nx - 1) / 2;
-
+
if (isEven (m_ny))
iYCenter = m_ny / 2;
else
unsigned int iXCenter, iYCenter;
getCenterCoordinates (iXCenter, iYCenter);
-
+
for (unsigned int ix = 0; ix < m_nx; ix++)
for (unsigned int iy = 0; iy < m_ny; iy++) {
long lD2 = ((ix - iXCenter) * (ix - iXCenter)) + ((iy - iYCenter) * (iy - iYCenter));
if (result.isComplex()) {
if (isComplex())
vResultImag[ix][iy] = (1 - dXFrac) * (1 - dYFrac) * vImag[scaleNX][scaleNY] +
- dXFrac * (1 - dYFrac) * vImag[scaleNX+1][scaleNY] +
- dYFrac * (1 - dXFrac) * vImag[scaleNX][scaleNY+1] +
- dXFrac * dYFrac * vImag[scaleNX+1][scaleNY+1];
+ dXFrac * (1 - dYFrac) * vImag[scaleNX+1][scaleNY] +
+ dYFrac * (1 - dXFrac) * vImag[scaleNX][scaleNY+1] +
+ dXFrac * dYFrac * vImag[scaleNX+1][scaleNY+1];
else
vResultImag[ix][iy] = 0;
}
fftw_plan plan = fftw_create_plan (m_nx, FFTW_FORWARD, FFTW_IN_PLACE);
std::complex<double>* pcRow = new std::complex<double> [m_nx];
-
+
unsigned int ix, iy;
unsigned int iArray = 0;
for (iy = 0; iy < m_ny; iy++) {
else
in[ix].im = 0;
}
-
+
fftw_one (plan, in, NULL);
-
+
for (ix = 0; ix < m_nx; ix++)
pcRow[ix] = std::complex<double>(in[ix].re, in[ix].im);
-
+
Fourier::shuffleFourierToNaturalOrder (pcRow, m_nx);
for (ix = 0; ix < m_nx; ix++) {
vReal[ix][iy] = pcRow[ix].real();
}
}
delete [] pcRow;
-
- fftw_destroy_plan (plan);
- delete in;
-
- return true;
+
+ fftw_destroy_plan (plan);
+ delete in;
+
+ return true;
}
bool
fftw_plan plan = fftw_create_plan (m_nx, FFTW_BACKWARD, FFTW_IN_PLACE);
std::complex<double>* pcRow = new std::complex<double> [m_nx];
-
+
unsigned int ix, iy;
unsigned int iArray = 0;
for (iy = 0; iy < m_ny; iy++) {
dImag = vImag[ix][iy];
pcRow[ix] = std::complex<double> (vReal[ix][iy], dImag);
}
-
+
Fourier::shuffleNaturalToFourierOrder (pcRow, m_nx);
-
+
for (ix = 0; ix < m_nx; ix++) {
in[ix].re = pcRow[ix].real();
in[ix].im = pcRow[ix].imag();
}
-
+
fftw_one (plan, in, NULL);
-
+
for (ix = 0; ix < m_nx; ix++) {
vReal[ix][iy] = in[ix].re;
vImag[ix][iy] = in[ix].im;
}
delete [] pcRow;
- fftw_destroy_plan (plan);
- delete in;
-
- return true;
+ fftw_destroy_plan (plan);
+ delete in;
+
+ return true;
}
bool
}
int
-ImageFile::convertFormatNameToID (const char* const formatName)
+ImageFile::convertExportFormatNameToID (const char* const formatName)
{
- int formatID = FORMAT_INVALID;
+ int formatID = EXPORT_FORMAT_INVALID;
- for (int i = 0; i < s_iFormatCount; i++)
- if (strcasecmp (formatName, s_aszFormatName[i]) == 0) {
+ for (int i = 0; i < s_iExportFormatCount; i++)
+ if (strcasecmp (formatName, s_aszExportFormatName[i]) == 0) {
formatID = i;
break;
}
}
const char*
-ImageFile::convertFormatIDToName (int formatID)
+ImageFile::convertExportFormatIDToName (int formatID)
{
static const char *formatName = "";
- if (formatID >= 0 && formatID < s_iFormatCount)
- return (s_aszFormatName[formatID]);
+ if (formatID >= 0 && formatID < s_iExportFormatCount)
+ return (s_aszExportFormatName[formatID]);
return (formatName);
}
const char*
-ImageFile::convertFormatIDToTitle (const int formatID)
+ImageFile::convertExportFormatIDToTitle (const int formatID)
{
static const char *formatTitle = "";
- if (formatID >= 0 && formatID < s_iFormatCount)
- return (s_aszFormatTitle[formatID]);
+ if (formatID >= 0 && formatID < s_iExportFormatCount)
+ return (s_aszExportFormatTitle[formatID]);
+
+ return (formatTitle);
+}
+
+int
+ImageFile::convertImportFormatNameToID (const char* const formatName)
+{
+ int formatID = IMPORT_FORMAT_INVALID;
+
+ for (int i = 0; i < s_iImportFormatCount; i++)
+ if (strcasecmp (formatName, s_aszImportFormatName[i]) == 0) {
+ formatID = i;
+ break;
+ }
+
+ return (formatID);
+}
+
+const char*
+ImageFile::convertImportFormatIDToName (int formatID)
+{
+ static const char *formatName = "";
+
+ if (formatID >= 0 && formatID < s_iImportFormatCount)
+ return (s_aszImportFormatName[formatID]);
+
+ return (formatName);
+}
+
+const char*
+ImageFile::convertImportFormatIDToTitle (const int formatID)
+{
+ static const char *formatTitle = "";
+
+ if (formatID >= 0 && formatID < s_iImportFormatCount)
+ return (s_aszImportFormatTitle[formatID]);
return (formatTitle);
}
bool
-ImageFile::exportImage (const char* const pszFormat, const char* const pszFilename, int nxcell, int nycell, double densmin, double densmax)
+ImageFile::importImage (const char* const pszFormat, const char* const pszFilename)
{
- int iFormatID = convertFormatNameToID (pszFormat);
- if (iFormatID == FORMAT_INVALID) {
- sys_error (ERR_SEVERE, "Invalid format %s [ImageFile::exportImage]", pszFormat);
+ int iFormatID = convertImportFormatNameToID (pszFormat);
+
+ if (iFormatID == IMPORT_FORMAT_PPM)
+ return readImagePPM (pszFilename);
+#ifdef HAVE_PNG
+ else if (iFormatID == IMPORT_FORMAT_PNG)
+ return readImagePNG (pszFilename);
+#endif
+#ifdef HAVE_CTN_DICOM
+ else if (iFormatID == IMPORT_FORMAT_DICOM)
+ return readImageDicom (pszFilename);
+#endif
+
+ sys_error (ERR_SEVERE, "Invalid format %s [ImageFile::importImage]", pszFormat);
+ return false;
+}
+
+bool
+ImageFile::readImageDicom (const char* const pszFile)
+{
+ return false;
+}
+
+void
+ImageFile::skipSpacePPM (FILE* fp)
+{
+ int c = fgetc (fp);
+ while (isspace (c) || c == '#') {
+ if (c == '#') { // comment until end of line
+ c = fgetc(fp);
+ while (c != 13 && c != 10)
+ c = fgetc(fp);
+ }
+ else
+ c = fgetc(fp);
+ }
+
+ ungetc (c, fp);
+}
+
+bool
+ImageFile::readImagePPM (const char* const pszFile)
+{
+ FILE* fp = fopen (pszFile, "r");
+ if ((fp = fopen (pszFile, "r")) == NULL)
+ return false;
+ char cSignature = toupper(fgetc(fp));
+ if (cSignature != 'P') {
+ fclose(fp);
+ return false;
+ }
+ cSignature = fgetc(fp);
+ if (cSignature == '5' || cSignature == '6') { // binary modes
+ fclose(fp);
+ fp = fopen(pszFile, "rb"); // reopen in binary mode
+ fgetc(fp);
+ fgetc(fp);
+ } else if (cSignature != '2' && cSignature != '3') {
+ fclose(fp);
+ return false;
+ }
+
+ int nRows, nCols, iMaxValue;
+ skipSpacePPM (fp);
+ if (fscanf (fp, "%d", &nCols) != 1) {
+ fclose(fp);
+ return false;
+ }
+ skipSpacePPM (fp);
+ if (fscanf (fp, "%d", &nRows) != 1) {
+ fclose(fp);
+ return false;
+ }
+ skipSpacePPM (fp);
+ if (fscanf (fp, "%d", &iMaxValue) != 1) {
+ fclose(fp);
+ return false;
+ }
+ setArraySize (nRows, nCols);
+
+ if (cSignature == '5' || cSignature == '6') { // binary modes
+ int c = fgetc(fp);
+ if (c == 13) {
+ c = fgetc(fp);
+ if (c != 10) // read msdos 13-10 newline
+ ungetc(c, fp);
+ }
+ } else
+ skipSpacePPM (fp); // ascii may have comments
+
+ double dMaxValue = iMaxValue;
+ ImageFileArray v = getArray();
+ for (int iy = nRows - 1; iy >= 0; iy--) {
+ for (int ix = 0; ix < nCols; ix++) {
+ int iGS, iR, iG, iB;
+ double dR, dG, dB;
+ switch (cSignature) {
+ case '2':
+ if (fscanf(fp, "%d ", &iGS) != 1) {
+ fclose(fp);
+ return false;
+ }
+ v[ix][iy] = iGS / dMaxValue;
+ break;
+ case '5':
+ iGS = fgetc(fp);
+ if (iGS == EOF) {
+ fclose(fp);
+ return false;
+ }
+ v[ix][iy] = iGS / dMaxValue;
+ break;
+ case '3':
+ if (fscanf (fp, "%d %d %d ", &iR, &iG, &iB) != 3) {
+ fclose(fp);
+ return false;
+ }
+ dR = iR / dMaxValue;
+ dG = iG / dMaxValue;
+ dB = iB / dMaxValue;
+ v[ix][iy] = colorToGrayscale (dR, dG, dB);
+ break;
+ case '6':
+ iR = fgetc(fp);
+ iG = fgetc(fp);
+ iB = fgetc(fp);
+ if (iB == EOF) {
+ fclose(fp);
+ return false;
+ }
+ dR = iR / dMaxValue;
+ dG = iG / dMaxValue;
+ dB = iB / dMaxValue;
+ v[ix][iy] = colorToGrayscale (dR, dG, dB);
+ break;
+ }
+ }
+ }
+
+ fclose(fp);
+ return true;
+}
+
+#ifdef HAVE_PNG
+bool
+ImageFile::readImagePNG (const char* const pszFile)
+{
+ FILE* fp = fopen(pszFile, "rb");
+ if (!fp)
+ return false;
+ unsigned char header[8];
+ fread (header, 1, 8, fp);
+ if (png_sig_cmp (header, 0, 8)) {
+ fclose (fp);
+ return false;
+ }
+
+ png_structp png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ if (!png_ptr) {
+ fclose(fp);
+ return false;
+ }
+
+ png_infop info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr) {
+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+ fclose(fp);
+ return false;
+ }
+
+ png_infop end_info = png_create_info_struct(png_ptr);
+ if (!end_info) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ fclose(fp);
return false;
}
- if (iFormatID == FORMAT_PGM)
+ if (setjmp(png_ptr->jmpbuf)) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ fclose(fp);
+ return false;
+ }
+
+ png_init_io(png_ptr, fp);
+ png_set_sig_bytes(png_ptr, 8);
+ png_read_info(png_ptr, info_ptr);
+
+ int width = png_get_image_width (png_ptr, info_ptr);
+ int height = png_get_image_height (png_ptr, info_ptr);
+ int bit_depth = png_get_bit_depth (png_ptr, info_ptr);
+ int color_type = png_get_color_type (png_ptr, info_ptr);
+
+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth <= 8)
+ png_set_expand(png_ptr);
+
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+ png_set_expand(png_ptr);
+
+ if (bit_depth < 8)
+ png_set_packing(png_ptr);
+
+ if (color_type & PNG_COLOR_MASK_ALPHA)
+ png_set_strip_alpha(png_ptr);
+
+ if (bit_depth == 16)
+ png_set_swap(png_ptr); // convert to little-endian format
+
+ png_read_update_info(png_ptr, info_ptr); // update with transformations
+ int rowbytes = png_get_rowbytes (png_ptr, info_ptr);
+ bit_depth = png_get_bit_depth (png_ptr, info_ptr);
+ color_type = png_get_color_type (png_ptr, info_ptr);
+
+ png_bytep* row_pointers = new png_bytep [height];
+ int i;
+ for (i = 0; i < height; i++)
+ row_pointers[i] = new unsigned char [rowbytes];
+
+ png_read_image(png_ptr, row_pointers);
+
+ setArraySize (width, height);
+ ImageFileArray v = getArray();
+ for (int iy = 0; iy < height; iy++) {
+ for (int ix = 0; ix < width; ix++) {
+ double dV;
+ if (color_type == PNG_COLOR_TYPE_GRAY) {
+ if (bit_depth == 8)
+ dV = row_pointers[iy][ix] / 255.;
+ else if (bit_depth == 16) {
+ int iBase = ix * 2;
+ dV = (row_pointers[iy][iBase] + (row_pointers[iy][iBase+1] << 8)) / 65536.;
+ }
+ } else if (color_type == PNG_COLOR_TYPE_RGB) {
+ if (bit_depth == 8) {
+ int iBase = ix * 3;
+ double dR = row_pointers[iy][iBase] / 255.;
+ double dG = row_pointers[iy][iBase+1] / 255.;
+ double dB = row_pointers[iy][iBase+2] / 255.;
+ dV = colorToGrayscale (dR, dG, dR);
+ }
+ }
+ v[ix][height-iy-1] = dV;
+ }
+ }
+
+ png_read_end(png_ptr, end_info);
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+
+ for (i = 0; i < height; i++)
+ delete row_pointers[i];
+ delete row_pointers;
+
+ fclose (fp);
+ return true;
+}
+#endif
+
+bool
+ImageFile::exportImage (const char* const pszFormat, const char* const pszFilename, int nxcell, int nycell, double densmin, double densmax)
+{
+ int iFormatID = convertExportFormatNameToID (pszFormat);
+
+ if (iFormatID == EXPORT_FORMAT_PGM)
return writeImagePGM (pszFilename, nxcell, nycell, densmin, densmax);
- else if (iFormatID == FORMAT_PGMASCII)
+ else if (iFormatID == EXPORT_FORMAT_PGMASCII)
return writeImagePGMASCII (pszFilename, nxcell, nycell, densmin, densmax);
- else if (iFormatID == FORMAT_PNG)
+ else if (iFormatID == EXPORT_FORMAT_PNG)
return writeImagePNG (pszFilename, 8, nxcell, nycell, densmin, densmax);
- else if (iFormatID == FORMAT_PNG16)
+ else if (iFormatID == EXPORT_FORMAT_PNG16)
return writeImagePNG (pszFilename, 16, nxcell, nycell, densmin, densmax);
sys_error (ERR_SEVERE, "Invalid format %s [ImageFile::exportImage]", pszFormat);
return false;
}
+
bool
ImageFile::writeImagePGM (const char* const outfile, int nxcell, int nycell, double densmin, double densmax)
{
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.89 2001/02/25 10:52:55 kevin Exp $
+** $Id: ctsim.cpp,v 1.90 2001/03/01 20:02:18 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
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.89 2001/02/25 10:52:55 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.90 2001/03/01 20:02:18 kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
- {"help", 0, 0, O_HELP},
- {"version", 0, 0, O_VERSION},
+ {"help", 0, 0, O_HELP},
+ {"version", 0, 0, O_VERSION},
{"print", 0, 0, O_PRINT},
- {0, 0, 0, 0}
+ {0, 0, 0, 0}
};
IMPLEMENT_APP(CTSimApp)
CTSimApp::CTSimApp()
: m_bAdvancedOptions(false), m_bSetModifyNewDocs(true), m_bVerboseLogging(false), m_bShowStartupTips(true),
- m_iCurrentTip(0), m_bUseBackgroundTasks(false),
- m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0)
+m_iCurrentTip(0), m_bUseBackgroundTasks(false),
+m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0)
{
- theApp = this;
+ theApp = this;
}
#ifdef HAVE_SYS_TIME_H
CTSimApp::OnInit()
{
#ifdef HAVE_SETPRIORITY
- setpriority (PRIO_PROCESS, 0, 15); // set to low scheduling priority
+ setpriority (PRIO_PROCESS, 0, 15); // set to low scheduling priority
#endif
-
- openConfig();
-
- g_bRunningWXWindows = true;
+
+ openConfig();
+
+ g_bRunningWXWindows = true;
bool bPrintFiles = false;
- // process options
- while (1) {
- int c = getopt_long (argc, argv, "", ctsimOptions, NULL);
- if (c == -1)
- break;
-
- switch (c) {
- case O_VERSION:
- std::cout << rcsindent << std::endl;
+ // process options
+ while (1) {
+ int c = getopt_long (argc, argv, "", ctsimOptions, NULL);
+ if (c == -1)
+ break;
+
+ switch (c) {
+ case O_VERSION:
+ std::cout << rcsindent << std::endl;
#ifdef CTSIMVERSION
- std::cout << "Version: CTSIMVERSION" << std::endl;
+ std::cout << "Version: CTSIMVERSION" << std::endl;
#elif defined(VERSION)
- std::cout << "Version: VERSION" << std::endl;
+ std::cout << "Version: VERSION" << std::endl;
#endif
- exit(0);
- case O_HELP:
- case '?':
- usage (argv[0]);
- exit (0);
+ exit(0);
+ case O_HELP:
+ case '?':
+ usage (argv[0]);
+ exit (0);
case O_PRINT:
bPrintFiles = true;
break;
- default:
- usage (argv[0]);
- exit (1);
- }
- }
-
- m_docManager = new wxDocManager (wxDEFAULT_DOCMAN_FLAGS, true);
-
- m_pDocTemplImage = new wxDocTemplate (m_docManager, "ImageFile", "*.if", "", "if", "ImageFile", "ImageView", CLASSINFO(ImageFileDocument), CLASSINFO(ImageFileView));
- m_pDocTemplProjection = new wxDocTemplate (m_docManager, "ProjectionFile", "*.pj", "", "pj", "ProjectionFile", "ProjectionView", CLASSINFO(ProjectionFileDocument), CLASSINFO(ProjectionFileView));
- m_pDocTemplPhantom = new wxDocTemplate (m_docManager, "PhantomFile", "*.phm", "", "phm", "PhantomFile", "PhantomView", CLASSINFO(PhantomFileDocument), CLASSINFO(PhantomFileView));
- m_pDocTemplPlot = new wxDocTemplate (m_docManager, "PlotFile", "*.plt", "", "plt", "PlotFile", "PlotView", CLASSINFO(PlotFileDocument), CLASSINFO(PlotFileView));
- m_pDocTemplText = new wxDocTemplate (m_docManager, "TextFile", "*.txt", "", "txt", "TextFile", "TextView", CLASSINFO(TextFileDocument), CLASSINFO(TextFileView), wxTEMPLATE_INVISIBLE);
+ default:
+ usage (argv[0]);
+ exit (1);
+ }
+ }
+
+ m_docManager = new wxDocManager (wxDEFAULT_DOCMAN_FLAGS, true);
+
+ m_pDocTemplImage = new wxDocTemplate (m_docManager, "ImageFile", "*.if", "", "if", "ImageFile", "ImageView", CLASSINFO(ImageFileDocument), CLASSINFO(ImageFileView));
+ m_pDocTemplProjection = new wxDocTemplate (m_docManager, "ProjectionFile", "*.pj", "", "pj", "ProjectionFile", "ProjectionView", CLASSINFO(ProjectionFileDocument), CLASSINFO(ProjectionFileView));
+ m_pDocTemplPhantom = new wxDocTemplate (m_docManager, "PhantomFile", "*.phm", "", "phm", "PhantomFile", "PhantomView", CLASSINFO(PhantomFileDocument), CLASSINFO(PhantomFileView));
+ m_pDocTemplPlot = new wxDocTemplate (m_docManager, "PlotFile", "*.plt", "", "plt", "PlotFile", "PlotView", CLASSINFO(PlotFileDocument), CLASSINFO(PlotFileView));
+ m_pDocTemplText = new wxDocTemplate (m_docManager, "TextFile", "*.txt", "", "txt", "TextFile", "TextView", CLASSINFO(TextFileDocument), CLASSINFO(TextFileView), wxTEMPLATE_INVISIBLE);
#if wxUSE_GLCANVAS
- m_pDocTemplGraph3d = new wxDocTemplate (m_docManager, "Graph3dFile", "*.g3d", "", "g3d", "Graph3dFile", "Graph3dView", CLASSINFO(Graph3dFileDocument), CLASSINFO(Graph3dFileView), wxTEMPLATE_INVISIBLE);
+ m_pDocTemplGraph3d = new wxDocTemplate (m_docManager, "Graph3dFile", "*.g3d", "", "g3d", "Graph3dFile", "Graph3dView", CLASSINFO(Graph3dFileDocument), CLASSINFO(Graph3dFileView), wxTEMPLATE_INVISIBLE);
#endif
-
+
#if wxUSE_GIF
- wxImage::AddHandler(new wxGIFHandler); // Required for images in the online documentation
+ wxImage::AddHandler(new wxGIFHandler); // Required for images in the online documentation
#endif
-
+
#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
- wxFileSystem::AddHandler(new wxZipFSHandler); // Required for advanced HTML help
+ wxFileSystem::AddHandler(new wxZipFSHandler); // Required for advanced HTML help
#endif
-
- // Create the main frame window
- int xDisplay, yDisplay;
- ::wxDisplaySize (&xDisplay, &yDisplay);
- m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0),
- wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .755)), wxDEFAULT_FRAME_STYLE);
-
- setIconForFrame (m_pFrame);
- m_pFrame->Centre(wxBOTH);
- m_pFrame->Show(true);
- SetTopWindow (m_pFrame);
-
- if (m_pConfig)
- m_docManager->FileHistoryLoad(*m_pConfig);
-
+
+ // Create the main frame window
+ int xDisplay, yDisplay;
+ ::wxDisplaySize (&xDisplay, &yDisplay);
+ m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0),
+ wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .755)), wxDEFAULT_FRAME_STYLE);
+
+ setIconForFrame (m_pFrame);
+ m_pFrame->Centre(wxBOTH);
+ m_pFrame->Show(true);
+ SetTopWindow (m_pFrame);
+
+ if (m_pConfig)
+ m_docManager->FileHistoryLoad(*m_pConfig);
+
#ifdef CTSIM_MDI
- m_pLogDoc = newTextDoc();
- if (m_pLogDoc) {
- m_pLog = m_pLogDoc->getTextCtrl();
- m_pLogDoc->SetDocumentName("Log.txt");
- m_pLogDoc->SetFilename("Log.txt");
- m_pLogDoc->getView()->getFrame()->SetTitle("Log");
- int xSize, ySize;
- m_pFrame->GetClientSize(&xSize, &ySize);
- int yLogSize = ySize / 4;
- m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
- m_pLogDoc->getView()->getFrame()->Show (true);
- } else
+ m_pLogDoc = newTextDoc();
+ if (m_pLogDoc) {
+ m_pLog = m_pLogDoc->getTextCtrl();
+ m_pLogDoc->SetDocumentName("Log.txt");
+ m_pLogDoc->SetFilename("Log.txt");
+ m_pLogDoc->getView()->getFrame()->SetTitle("Log");
+ int xSize, ySize;
+ m_pFrame->GetClientSize(&xSize, &ySize);
+ int yLogSize = ySize / 4;
+ m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+ m_pLogDoc->getView()->getFrame()->Show (true);
+ } else
#else
- m_pLog = new wxTextCtrl (m_pFrame, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
+ m_pLog = new wxTextCtrl (m_pFrame, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
#endif
- wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog));
-
- wxString helpDir;
- if (! m_pConfig->Read("HelpDir", &helpDir))
- helpDir = ::wxGetCwd();
+ wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog));
+
+ wxString helpDir;
+ if (! m_pConfig->Read("HelpDir", &helpDir))
+ helpDir = ::wxGetCwd();
#ifdef CTSIM_WINHELP
- if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
- *m_pLog << "Cannot initialize the Windows Help system" << "\n";
+ if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
+ *m_pLog << "Cannot initialize the Windows Help system" << "\n";
#else
- if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") &&
- ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim"))
- *m_pLog << "Cannot initialize the HTML Help system" << "\n";
- else {
- if (::wxDirExists ("/tmp"))
- m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp"));
- m_pFrame->getHtmlHelpController().UseConfig (m_pConfig);
- }
+ if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") &&
+ ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim"))
+ *m_pLog << "Cannot initialize the HTML Help system" << "\n";
+ else {
+ if (::wxDirExists ("/tmp"))
+ m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp"));
+ m_pFrame->getHtmlHelpController().UseConfig (m_pConfig);
+ }
#endif
-
- for (int i = optind + 1; i <= argc; i++) {
- wxString filename = argv [i - 1];
- wxDocument* pNewDoc = m_docManager->CreateDocument (filename, wxDOC_SILENT);
+
+ for (int i = optind + 1; i <= argc; i++) {
+ wxString filename = argv [i - 1];
+ wxDocument* pNewDoc = m_docManager->CreateDocument (filename, wxDOC_SILENT);
if (bPrintFiles) {
wxView* pNewView = pNewDoc->GetFirstView();
wxPrintout *printout = pNewView->OnCreatePrintout();
nullEvent.SetId (wxID_CLOSE);
m_docManager->OnFileClose (nullEvent);
}
- }
+ }
if (bPrintFiles) {
wxCommandEvent closeEvent;
closeEvent.SetInt (MAINMENU_FILE_EXIT);
m_pFrame->AddPendingEvent(closeEvent);
}
-
+
if (getStartupTips())
ShowTips();
-
+
m_pBackgroundMgr = new BackgroundManager;
return true;
}
void
CTSimApp::ShowTips()
{
- CTSimTipProvider tipProvider (m_iCurrentTip);
- setStartupTips (::wxShowTip (m_pFrame, &tipProvider, getStartupTips()));
- m_iCurrentTip = tipProvider.GetCurrentTip();
+ CTSimTipProvider tipProvider (m_iCurrentTip);
+ setStartupTips (::wxShowTip (m_pFrame, &tipProvider, getStartupTips()));
+ m_iCurrentTip = tipProvider.GetCurrentTip();
}
void
CTSimApp::setIconForFrame(wxFrame* pFrame)
{
- wxIcon iconApp (ctsim16_xpm);
-
- if (iconApp.Ok())
- pFrame->SetIcon (iconApp);
+ wxIcon iconApp (ctsim16_xpm);
+
+ if (iconApp.Ok())
+ pFrame->SetIcon (iconApp);
}
void
CTSimApp::usage(const char* program)
{
- std::cout << "usage: " << fileBasename(program) << " [files-to-open...] [OPTIONS]\n";
- std::cout << "Computed Tomography Simulator (Graphical Shell)\n";
- std::cout << "\n";
- std::cout << " --version Display version\n";
- std::cout << " --help Display this help message\n";
+ std::cout << "usage: " << fileBasename(program) << " [files-to-open...] [OPTIONS]\n";
+ std::cout << "Computed Tomography Simulator (Graphical Shell)\n";
+ std::cout << "\n";
+ std::cout << " --version Display version\n";
+ std::cout << " --help Display this help message\n";
}
int
CTSimApp::OnExit()
{
closeConfig();
-
+
#ifdef HAVE_DMALLOC
- dmalloc_shutdown();
+ dmalloc_shutdown();
#endif
- return 0;
+ return 0;
}
void
#else
m_pConfig = new wxConfig("ctsim", "Kevin Rosenberg", ".ctsim", "", wxCONFIG_USE_LOCAL_FILE);
#endif
-
- wxConfigBase::Set(m_pConfig);
+
+ wxConfigBase::Set(m_pConfig);
m_pConfig->Read ("AdvancedOptions", &m_bAdvancedOptions);
m_pConfig->Read ("SetModifyNewDocs", &m_bSetModifyNewDocs);
m_pConfig->Read ("VerboseLogging", &m_bVerboseLogging);
m_pConfig->Write ("StartupTips", m_bShowStartupTips);
m_pConfig->Write ("CurrentTip", m_iCurrentTip);
m_pConfig->Write ("UseBackgroundTasks", m_bUseBackgroundTasks);
-
- delete m_pConfig;
+
+ delete m_pConfig;
}
wxString
CTSimApp::getUntitledFilename()
{
- static int untitledNumber = 1;
-
- wxString filename ("Untitled");
- filename << untitledNumber++;
-
- return (filename);
+ static int untitledNumber = 1;
+
+ wxString filename ("Untitled");
+ filename << untitledNumber++;
+
+ return (filename);
}
EVT_MENU(MAINMENU_HELP_ABOUT, MainFrame::OnAbout)
EVT_MENU(MAINMENU_HELP_CONTENTS, MainFrame::OnHelpContents)
EVT_MENU(MAINMENU_HELP_TIPS, MainFrame::OnHelpTips)
+EVT_MENU(MAINMENU_IMPORT, MainFrame::OnImport)
EVT_MENU(IDH_QUICKSTART, MainFrame::OnHelpButton)
EVT_MENU(MAINMENU_LOG_EVENT, MainFrame::OnLogEvent)
EVT_BUTTON(IDH_DLG_RASTERIZE, MainFrame::OnHelpButton)
#endif
{
m_bShuttingDown = false;
-
- //// Make a menubar
- wxMenu *file_menu = new wxMenu;
-
- file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
- file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
- file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
-
- file_menu->AppendSeparator();
+
+ //// Make a menubar
+ wxMenu *file_menu = new wxMenu;
+
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
+ file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
+ file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
+
+ file_menu->AppendSeparator();
+ file_menu->Append (MAINMENU_IMPORT, "&Import...\tCtrl-I");
file_menu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
- file_menu->Append(MAINMENU_FILE_EXIT, "E&xit");
-
- // history of files visited
- theApp->getDocManager()->FileHistoryAddFilesToMenu(file_menu);
- theApp->getDocManager()->FileHistoryUseMenu(file_menu);
-
+ file_menu->Append(MAINMENU_FILE_EXIT, "E&xit");
+
+ // history of files visited
+ theApp->getDocManager()->FileHistoryAddFilesToMenu(file_menu);
+ theApp->getDocManager()->FileHistoryUseMenu(file_menu);
+
#ifndef CTSIM_MDI
- m_pWindowMenu = new wxMenu;
- m_pWindowMenu->UpdateUI (this);
+ m_pWindowMenu = new wxMenu;
+ m_pWindowMenu->UpdateUI (this);
#endif
-
- wxMenu* help_menu = new wxMenu;
- help_menu->Append (MAINMENU_HELP_CONTENTS, "&Contents\tF1");
+
+ wxMenu* help_menu = new wxMenu;
+ help_menu->Append (MAINMENU_HELP_CONTENTS, "&Contents\tF1");
help_menu->Append (MAINMENU_HELP_TIPS, "&Tips");
help_menu->Append (IDH_QUICKSTART, "&Quick Start");
#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
- help_menu->Append (MAINMENU_HELP_SECONDARY, "&Secondary Help");
+ help_menu->Append (MAINMENU_HELP_SECONDARY, "&Secondary Help");
#endif
- help_menu->Append (MAINMENU_HELP_ABOUT, "&About");
-
- wxMenuBar* menu_bar = new wxMenuBar;
-
- menu_bar->Append(file_menu, "&File");
+ help_menu->Append (MAINMENU_HELP_ABOUT, "&About");
+
+ wxMenuBar* menu_bar = new wxMenuBar;
+
+ menu_bar->Append(file_menu, "&File");
#ifndef CTSIM_MDI
- menu_bar->Append(m_pWindowMenu, "&Window");
+ menu_bar->Append(m_pWindowMenu, "&Window");
#endif
- menu_bar->Append(help_menu, "&Help");
-
- SetMenuBar(menu_bar);
-
+ menu_bar->Append(help_menu, "&Help");
+
+ SetMenuBar(menu_bar);
+
+
#ifndef CTSIM_MDI
- int i;
- for (i = 0; i < MAX_WINDOW_MENUITEMS; i++) {
- m_apWindowMenuItems[i] = new wxMenuItem (m_pWindowMenu, MAINMENU_WINDOW_BASE+i, wxString("[EMPTY]"));
- m_pWindowMenu->Append (m_apWindowMenuItems[i]);
- m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
- }
+ int i;
+ for (i = 0; i < MAX_WINDOW_MENUITEMS; i++) {
+ m_apWindowMenuItems[i] = new wxMenuItem (m_pWindowMenu, MAINMENU_WINDOW_BASE+i, wxString("[EMPTY]"));
+ m_pWindowMenu->Append (m_apWindowMenuItems[i]);
+ m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
+ }
#endif
-
- m_iDefaultPhantomID = Phantom::PHM_HERMAN;
- m_iDefaultFilterID = SignalFilter::FILTER_BANDLIMIT;
- m_iDefaultFilterDomainID = SignalFilter::DOMAIN_FREQUENCY;
- m_iDefaultFilterXSize = 256;
- m_iDefaultFilterYSize = 256;
- m_dDefaultFilterParam = 1.;
- m_dDefaultFilterBandwidth = 1.;
- m_dDefaultFilterInputScale = 1.;
- m_dDefaultFilterOutputScale = 1.;
-
- wxAcceleratorEntry accelEntries[15];
- accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
- accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
- accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
- accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
+
+ m_iDefaultPhantomID = Phantom::PHM_HERMAN;
+ m_iDefaultFilterID = SignalFilter::FILTER_BANDLIMIT;
+ m_iDefaultFilterDomainID = SignalFilter::DOMAIN_FREQUENCY;
+ m_iDefaultFilterXSize = 256;
+ m_iDefaultFilterYSize = 256;
+ m_dDefaultFilterParam = 1.;
+ m_dDefaultFilterBandwidth = 1.;
+ m_dDefaultFilterInputScale = 1.;
+ m_dDefaultFilterOutputScale = 1.;
+ m_iDefaultImportFormat = ImageFile::IMPORT_FORMAT_PPM;
+
+ wxAcceleratorEntry accelEntries[16];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
+ accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
+ accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('I'), MAINMENU_IMPORT);
+ accelEntries[5].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
#ifndef CTSIM_MDI
- for (i = 0; i < 10; i++)
- accelEntries[i+4].Set (wxACCEL_CTRL, static_cast<int>('0'+i), MAINMENU_WINDOW_BASE+i);
- wxAcceleratorTable accelTable (15, accelEntries);
+ for (i = 0; i < 10; i++)
+ accelEntries[i+5].Set (wxACCEL_CTRL, static_cast<int>('0'+i), MAINMENU_WINDOW_BASE+i);
+ wxAcceleratorTable accelTable (15, accelEntries);
#else
- wxAcceleratorTable accelTable (5, accelEntries);
+ wxAcceleratorTable accelTable (5, accelEntries);
#endif
-
- SetAcceleratorTable (accelTable);
+
+ SetAcceleratorTable (accelTable);
}
MainFrame::~MainFrame()
m_bShuttingDown = true; // Currently used so that Log Window will close
#if 0
// delete all non-modified documents
- wxList& rListDocs = theApp->getDocManager()->GetDocuments();
- for (wxNode* pNode = rListDocs.GetFirst(); pNode != NULL; pNode = pNode->GetNext()) {
- wxDocument* pDoc = dynamic_cast<wxDocument*>(pNode->GetData());
+ wxList& rListDocs = theApp->getDocManager()->GetDocuments();
+ for (wxNode* pNode = rListDocs.GetFirst(); pNode != NULL; pNode = pNode->GetNext()) {
+ wxDocument* pDoc = dynamic_cast<wxDocument*>(pNode->GetData());
if (pDoc && ! pDoc->IsModified()) {
theApp->getDocManager()->RemoveDocument(pDoc);
delete pDoc;
}
- }
+ }
#endif
::wxYield();
- if (theApp->getConfig())
- theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
+ if (theApp->getConfig())
+ theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
::wxYield();
- delete theApp->getDocManager();
-
+ delete theApp->getDocManager();
+
}
void
MainFrame::OnSize (wxSizeEvent& event)
{
#ifdef CTSIM_MDI
- if (theApp->getLogDoc()) {
- int xSize, ySize;
- GetClientSize(&xSize, &ySize);
- int yLogSize = ySize / 4;
+ if (theApp->getLogDoc()) {
+ int xSize, ySize;
+ GetClientSize(&xSize, &ySize);
+ int yLogSize = ySize / 4;
theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
- theApp->getLogDoc()->getView()->getFrame()->Show (true);
- }
+ theApp->getLogDoc()->getView()->getFrame()->Show (true);
+ }
#endif
-
+
#if CTSIM_MDI
- wxDocMDIParentFrame::OnSize (event);
+ wxDocMDIParentFrame::OnSize (event);
#else
- wxDocParentFrame::OnSize (event);
+ wxDocParentFrame::OnSize (event);
#endif
}
void
MainFrame::OnCreatePhantom(wxCommandEvent& event)
{
- DialogGetPhantom dialogPhantom (this, m_iDefaultPhantomID);
- int dialogReturn = dialogPhantom.ShowModal();
- if (dialogReturn == wxID_OK) {
- wxString selection (dialogPhantom.getPhantom());
+ DialogGetPhantom dialogPhantom (this, m_iDefaultPhantomID);
+ int dialogReturn = dialogPhantom.ShowModal();
+ if (dialogReturn == wxID_OK) {
+ wxString selection (dialogPhantom.getPhantom());
if (theApp->getVerboseLogging())
- *theApp->getLog() << "Selected phantom " << selection.c_str() << "\n";
- wxString filename = selection + ".phm";
- m_iDefaultPhantomID = Phantom::convertNameToPhantomID (selection.c_str());
- theApp->getDocManager()->CreateDocument (filename, wxDOC_SILENT);
- }
-
+ *theApp->getLog() << "Selected phantom " << selection.c_str() << "\n";
+ wxString filename = selection + ".phm";
+ m_iDefaultPhantomID = Phantom::convertNameToPhantomID (selection.c_str());
+ theApp->getDocManager()->CreateDocument (filename, wxDOC_SILENT);
+ }
+
}
void
MainFrame::OnCreateFilter (wxCommandEvent& WXUNUSED(event))
{
- DialogGetFilterParameters dialogFilter (this, m_iDefaultFilterXSize, m_iDefaultFilterYSize, m_iDefaultFilterID, m_dDefaultFilterParam, m_dDefaultFilterBandwidth, m_iDefaultFilterDomainID, m_dDefaultFilterInputScale, m_dDefaultFilterOutputScale);
- int dialogReturn = dialogFilter.ShowModal();
- if (dialogReturn == wxID_OK) {
- wxString strFilter (dialogFilter.getFilterName());
- wxString strDomain (dialogFilter.getDomainName());
- m_iDefaultFilterID = SignalFilter::convertFilterNameToID (strFilter.c_str());
- m_iDefaultFilterDomainID = SignalFilter::convertDomainNameToID (strDomain.c_str());
- m_iDefaultFilterXSize = dialogFilter.getXSize();
- m_iDefaultFilterYSize = dialogFilter.getYSize();
- m_dDefaultFilterBandwidth = dialogFilter.getBandwidth();
- m_dDefaultFilterParam= dialogFilter.getFilterParam();
- m_dDefaultFilterInputScale = dialogFilter.getInputScale();
- m_dDefaultFilterOutputScale = dialogFilter.getOutputScale();
- std::ostringstream os;
- os << "Generate Filter=" << strFilter.c_str()
- << ", size=(" << static_cast<int>(m_iDefaultFilterXSize) << "," << static_cast<int>(m_iDefaultFilterYSize)
- << "), domain=" << strDomain.c_str() << ", filterParam=" << m_dDefaultFilterParam << ", bandwidth=" << m_dDefaultFilterBandwidth
- << ", inputScale=" << m_dDefaultFilterInputScale << ", outputScale=" << m_dDefaultFilterOutputScale;
- *theApp->getLog() << os.str().c_str() << "\n";
- wxString filename = "untitled.if";
- ImageFileDocument* pFilterDoc = theApp->newImageDoc();
+ DialogGetFilterParameters dialogFilter (this, m_iDefaultFilterXSize, m_iDefaultFilterYSize, m_iDefaultFilterID, m_dDefaultFilterParam, m_dDefaultFilterBandwidth, m_iDefaultFilterDomainID, m_dDefaultFilterInputScale, m_dDefaultFilterOutputScale);
+ int dialogReturn = dialogFilter.ShowModal();
+ if (dialogReturn == wxID_OK) {
+ wxString strFilter (dialogFilter.getFilterName());
+ wxString strDomain (dialogFilter.getDomainName());
+ m_iDefaultFilterID = SignalFilter::convertFilterNameToID (strFilter.c_str());
+ m_iDefaultFilterDomainID = SignalFilter::convertDomainNameToID (strDomain.c_str());
+ m_iDefaultFilterXSize = dialogFilter.getXSize();
+ m_iDefaultFilterYSize = dialogFilter.getYSize();
+ m_dDefaultFilterBandwidth = dialogFilter.getBandwidth();
+ m_dDefaultFilterParam= dialogFilter.getFilterParam();
+ m_dDefaultFilterInputScale = dialogFilter.getInputScale();
+ m_dDefaultFilterOutputScale = dialogFilter.getOutputScale();
+ std::ostringstream os;
+ os << "Generate Filter=" << strFilter.c_str()
+ << ", size=(" << static_cast<int>(m_iDefaultFilterXSize) << "," << static_cast<int>(m_iDefaultFilterYSize)
+ << "), domain=" << strDomain.c_str() << ", filterParam=" << m_dDefaultFilterParam << ", bandwidth=" << m_dDefaultFilterBandwidth
+ << ", inputScale=" << m_dDefaultFilterInputScale << ", outputScale=" << m_dDefaultFilterOutputScale;
+ *theApp->getLog() << os.str().c_str() << "\n";
+ wxString filename = "untitled.if";
+ ImageFileDocument* pFilterDoc = theApp->newImageDoc();
pFilterDoc->setBadFileOpen();
- if (! pFilterDoc) {
- sys_error (ERR_SEVERE, "Unable to create filter image");
- return;
- }
- ImageFile& rIF = pFilterDoc->getImageFile();
- rIF.setArraySize (m_iDefaultFilterXSize, m_iDefaultFilterYSize);
- rIF.filterResponse (strDomain.c_str(), m_dDefaultFilterBandwidth, strFilter.c_str(), m_dDefaultFilterParam, m_dDefaultFilterInputScale, m_dDefaultFilterOutputScale);
- rIF.labelAdd (os.str().c_str());
+ if (! pFilterDoc) {
+ sys_error (ERR_SEVERE, "Unable to create filter image");
+ return;
+ }
+ ImageFile& rIF = pFilterDoc->getImageFile();
+ rIF.setArraySize (m_iDefaultFilterXSize, m_iDefaultFilterYSize);
+ rIF.filterResponse (strDomain.c_str(), m_dDefaultFilterBandwidth, strFilter.c_str(), m_dDefaultFilterParam, m_dDefaultFilterInputScale, m_dDefaultFilterOutputScale);
+ rIF.labelAdd (os.str().c_str());
if (theApp->getAskDeleteNewDocs())
pFilterDoc->Modify (true);
- pFilterDoc->UpdateAllViews();
- pFilterDoc->GetFirstView()->OnUpdate (NULL, NULL);
- pFilterDoc->getView()->getFrame()->SetClientSize(m_iDefaultFilterXSize, m_iDefaultFilterYSize);
- pFilterDoc->getView()->getFrame()->Show(true);
- }
+ pFilterDoc->UpdateAllViews();
+ pFilterDoc->GetFirstView()->OnUpdate (NULL, NULL);
+ pFilterDoc->getView()->getFrame()->SetClientSize(m_iDefaultFilterXSize, m_iDefaultFilterYSize);
+ pFilterDoc->getView()->getFrame()->Show(true);
+ }
}
void
CTSimApp::getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF)
{
- const ImageFile& rIF = pIFDoc->getImageFile();
- unsigned int nx = rIF.nx();
- unsigned int ny = rIF.ny();
- wxList& rListDocs = m_docManager->GetDocuments();
- for (wxNode* pNode = rListDocs.GetFirst(); pNode != NULL; pNode = pNode->GetNext()) {
- wxDocument* pDoc = reinterpret_cast<wxDocument*>(pNode->GetData());
- ImageFileDocument* pIFCompareDoc = dynamic_cast<ImageFileDocument*>(pDoc);
- if (pIFCompareDoc && (pIFDoc != pIFCompareDoc)) {
- const ImageFile& rCompareIF = pIFCompareDoc->getImageFile();
- if (rCompareIF.nx() == nx && rCompareIF.ny() == ny)
- vecIF.push_back (pIFCompareDoc);
- }
- }
+ const ImageFile& rIF = pIFDoc->getImageFile();
+ unsigned int nx = rIF.nx();
+ unsigned int ny = rIF.ny();
+ wxList& rListDocs = m_docManager->GetDocuments();
+ for (wxNode* pNode = rListDocs.GetFirst(); pNode != NULL; pNode = pNode->GetNext()) {
+ wxDocument* pDoc = reinterpret_cast<wxDocument*>(pNode->GetData());
+ ImageFileDocument* pIFCompareDoc = dynamic_cast<ImageFileDocument*>(pDoc);
+ if (pIFCompareDoc && (pIFDoc != pIFCompareDoc)) {
+ const ImageFile& rCompareIF = pIFCompareDoc->getImageFile();
+ if (rCompareIF.nx() == nx && rCompareIF.ny() == ny)
+ vecIF.push_back (pIFCompareDoc);
+ }
+ }
}
void
MainFrame::OnHelpContents (wxCommandEvent& event)
{
- showHelp (event.GetId());
+ showHelp (event.GetId());
}
void
MainFrame::OnHelpButton (wxCommandEvent& event)
{
- showHelp (event.GetId());
+ showHelp (event.GetId());
}
#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
void
MainFrame::OnHelpSecondary (wxCommandEvent& event)
{
- m_htmlHelp.DisplayContents();
+ m_htmlHelp.DisplayContents();
}
#endif
void
MainFrame::showHelp (int commandID)
{
- switch (commandID) {
-
- case MAINMENU_HELP_CONTENTS:
+ switch (commandID) {
+
+ case MAINMENU_HELP_CONTENTS:
#ifdef CTSIM_WINHELP
- m_winHelp.DisplayContents ();
+ m_winHelp.DisplayContents ();
#else
- m_htmlHelp.DisplayContents ();
+ m_htmlHelp.DisplayContents ();
#endif
- break;
-
-
- default:
+ break;
+
+
+ default:
#ifdef CTSIM_WINHELP
m_winHelp.DisplaySection (commandID);
#else
m_htmlHelp.Display (commandID);
#endif
- break;
- }
+ break;
+ }
}
void
MainFrame::OnExit (wxCommandEvent& WXUNUSED(event) )
{
- Close(true);
+ Close(true);
}
void
MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
{
#ifndef CTSIM_MDI
- int iPos = 0;
- wxList& rListDocs = theApp->getDocManager()->GetDocuments();
- wxNode* pNode = rListDocs.GetFirst();
- while (iPos < MAX_WINDOW_MENUITEMS && pNode != NULL) {
- wxDocument* pDoc = static_cast<wxDocument*>(pNode->GetData());
- wxString strFilename = pDoc->GetFilename();
- if (iPos < 10) {
- strFilename += "\tCtrl-";
- strFilename += static_cast<char>('0' + iPos);
- }
- static_cast<wxMenuItemBase*>(m_apWindowMenuItems[iPos])->SetName (strFilename);
- m_apWindowMenuData[iPos] = pDoc;
- m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+iPos, true);
- iPos++;
- pNode = pNode->GetNext();
- }
- for (int i = iPos; i < MAX_WINDOW_MENUITEMS; i++) {
- m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
- static_cast<wxMenuItemBase*>(m_apWindowMenuItems[i])->SetName (wxString("[EMPTY]"));
- m_apWindowMenuData[i] = NULL;
- }
+ int iPos = 0;
+ wxList& rListDocs = theApp->getDocManager()->GetDocuments();
+ wxNode* pNode = rListDocs.GetFirst();
+ while (iPos < MAX_WINDOW_MENUITEMS && pNode != NULL) {
+ wxDocument* pDoc = static_cast<wxDocument*>(pNode->GetData());
+ wxString strFilename = pDoc->GetFilename();
+ if (iPos < 10) {
+ strFilename += "\tCtrl-";
+ strFilename += static_cast<char>('0' + iPos);
+ }
+ static_cast<wxMenuItemBase*>(m_apWindowMenuItems[iPos])->SetName (strFilename);
+ m_apWindowMenuData[iPos] = pDoc;
+ m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+iPos, true);
+ iPos++;
+ pNode = pNode->GetNext();
+ }
+ for (int i = iPos; i < MAX_WINDOW_MENUITEMS; i++) {
+ m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
+ static_cast<wxMenuItemBase*>(m_apWindowMenuItems[i])->SetName (wxString("[EMPTY]"));
+ m_apWindowMenuData[i] = NULL;
+ }
#endif
}
void
MainFrame::OnMRUFile (wxCommandEvent& event)
{
- wxString fileName (theApp->getDocManager()->GetHistoryFile(event.GetId() - wxID_FILE1));
- if (fileName != "")
- theApp->getDocManager()->CreateDocument(fileName, wxDOC_SILENT);
+ wxString fileName (theApp->getDocManager()->GetHistoryFile(event.GetId() - wxID_FILE1));
+ if (fileName != "")
+ theApp->getDocManager()->CreateDocument(fileName, wxDOC_SILENT);
}
#endif
void
MainFrame::DoWindowMenu (int iMenuPosition, wxCommandEvent& event)
{
- if (wxDocument* pDoc = m_apWindowMenuData [iMenuPosition]) {
- wxString strFilename = pDoc->GetFilename();
- const wxView* pView = pDoc->GetFirstView();
- if (pView) {
- wxFrame* pFrame = pView->GetFrame();
- pFrame->SetFocus();
- pFrame->Raise();
- }
- }
+ if (wxDocument* pDoc = m_apWindowMenuData [iMenuPosition]) {
+ wxString strFilename = pDoc->GetFilename();
+ const wxView* pView = pDoc->GetFirstView();
+ if (pView) {
+ wxFrame* pFrame = pView->GetFrame();
+ pFrame->SetFocus();
+ pFrame->Raise();
+ }
+ }
}
void MainFrame::OnWindowMenu0 (wxCommandEvent& event)
class BitmapControl : public wxPanel
{
private:
- DECLARE_DYNAMIC_CLASS (BitmapControl)
- DECLARE_EVENT_TABLE ()
- wxBitmap* m_pBitmap;
-
+ DECLARE_DYNAMIC_CLASS (BitmapControl)
+ DECLARE_EVENT_TABLE ()
+ wxBitmap* m_pBitmap;
+
public:
- BitmapControl (wxBitmap* pBitmap, wxWindow *parent, wxWindowID id = -1,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxSTATIC_BORDER,
- const wxValidator& validator = wxDefaultValidator,
- const wxString& name = "BitmapCtrl");
-
-
- virtual ~BitmapControl();
-
- virtual wxSize GetBestSize() const;
-
- wxBitmap* getBitmap()
- { return m_pBitmap; }
-
- void OnPaint(wxPaintEvent& event);
+ BitmapControl (wxBitmap* pBitmap, wxWindow *parent, wxWindowID id = -1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxSTATIC_BORDER,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = "BitmapCtrl");
+
+
+ virtual ~BitmapControl();
+
+ virtual wxSize GetBestSize() const;
+
+ wxBitmap* getBitmap()
+ { return m_pBitmap; }
+
+ void OnPaint(wxPaintEvent& event);
};
long style, const wxValidator& validator, const wxString& name)
: m_pBitmap(pBitmap)
{
- Create(parent, id, pos, size, style, name);
-
- SetSize (GetBestSize());
+ Create(parent, id, pos, size, style, name);
+
+ SetSize (GetBestSize());
}
wxSize
BitmapControl::GetBestSize () const
{
- if (m_pBitmap)
- return wxSize (m_pBitmap->GetWidth(), m_pBitmap->GetHeight());
- else
- return wxSize(0,0);
+ if (m_pBitmap)
+ return wxSize (m_pBitmap->GetWidth(), m_pBitmap->GetHeight());
+ else
+ return wxSize(0,0);
}
BitmapControl::~BitmapControl()
void
BitmapControl::OnPaint (wxPaintEvent& event)
{
- wxPaintDC dc(this);
- if (m_pBitmap)
- dc.DrawBitmap (*m_pBitmap, 0, 0);
+ wxPaintDC dc(this);
+ if (m_pBitmap)
+ dc.DrawBitmap (*m_pBitmap, 0, 0);
}
class BitmapDialog : public wxDialog {
private:
- BitmapControl* m_pBitmapCtrl;
-
+ BitmapControl* m_pBitmapCtrl;
+
public:
- BitmapDialog (wxBitmap* pBitmap, char const* pszTitle);
- virtual ~BitmapDialog();
+ BitmapDialog (wxBitmap* pBitmap, char const* pszTitle);
+ virtual ~BitmapDialog();
};
BitmapDialog::BitmapDialog (wxBitmap* pBitmap, char const* pszTitle)
: wxDialog(theApp->getMainFrame(), -1, wxString(pszTitle), wxDefaultPosition, wxDefaultSize, wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE)
{
- wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL);
-
- pTopSizer->Add (new BitmapControl (pBitmap, this), 0, wxALIGN_CENTER | wxALL, 5);
-
- wxBoxSizer* pButtonSizer = new wxBoxSizer (wxHORIZONTAL);
- wxButton* pButtonOk = new wxButton (this, wxID_OK, "Ok");
- pButtonSizer->Add (pButtonOk, 0, wxEXPAND | wxALL, 10);
-
- pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER);
-
- SetAutoLayout (true);
- SetSizer (pTopSizer);
- pTopSizer->Fit (this);
- pTopSizer->SetSizeHints (this);
+ wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL);
+
+ pTopSizer->Add (new BitmapControl (pBitmap, this), 0, wxALIGN_CENTER | wxALL, 5);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer (wxHORIZONTAL);
+ wxButton* pButtonOk = new wxButton (this, wxID_OK, "Ok");
+ pButtonSizer->Add (pButtonOk, 0, wxEXPAND | wxALL, 10);
+
+ pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER);
+
+ SetAutoLayout (true);
+ SetSizer (pTopSizer);
+ pTopSizer->Fit (this);
+ pTopSizer->SetSizeHints (this);
}
BitmapDialog::~BitmapDialog()
}
}
+void
+MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) )
+{
+ DialogImportParameters dialogImport (this, m_iDefaultImportFormat);
+ if (dialogImport.ShowModal() != wxID_OK)
+ return;
+
+ wxString strFormatName (dialogImport.getFormatName ());
+ m_iDefaultImportFormat = ImageFile::convertImportFormatNameToID (strFormatName.c_str());
+
+ wxString strExt;
+ wxString strWildcard;
+ if (m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PPM) {
+ strExt = ".ppm";
+ strWildcard = "PPM Files (*.ppm)|*.pgm|PGM Files (*.pgm)|*.pgm";
+ }
+#ifdef HAVE_PNG
+ else if (m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PNG) {
+ strExt = ".png";
+ strWildcard = "PNG Files (*.png)|*.png";
+ }
+#endif
+ else {
+ return;
+ }
+
+ wxString strFilename = wxFileSelector (wxString("Import Filename"), wxString(""),
+ wxString(""), strExt, strWildcard, wxHIDE_READONLY | wxOPEN);
+ if (! strFilename.IsEmpty()) {
+ ImageFile* pIF = new ImageFile;
+ if (pIF->importImage (strFormatName.c_str(), strFilename.c_str())) {
+ ImageFileDocument* pIFDoc = theApp->newImageDoc();
+ pIFDoc->setImageFile(pIF);
+ pIFDoc->getView()->getFrame()->Show(true);
+ std::ostringstream os;
+ os << "Import file " << strFilename.c_str() << " (type " << strFormatName.c_str() << ")";
+ pIF->labelAdd (os.str().c_str());
+ if (theApp->getAskDeleteNewDocs())
+ pIFDoc->Modify (true);
+ pIFDoc->UpdateAllViews();
+ pIFDoc->GetFirstView()->OnUpdate (NULL, NULL);
+ pIFDoc->getView()->getFrame()->Show(true);
+ } else
+ delete pIF;
+ }
+}
#include "./splash.xpm"
void
if (lFreeMem > 0)
*theApp->getLog() << ", Free Memory: " << lFreeMem << " MB";
*theApp->getLog() << "\n";
-
+
wxBitmap bmp (splash);
- if (bmp.Ok()) {
- BitmapDialog dlg (&bmp, "About CTSim");
- dlg.ShowModal();
- } else {
- wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n";
+ if (bmp.Ok()) {
+ BitmapDialog dlg (&bmp, "About CTSim");
+ dlg.ShowModal();
+ } else {
+ wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n";
#ifdef CTSIMVERSION
- msg += "Version ";
- msg += CTSIMVERSION;
- msg += "\n\n";
+ msg += "Version ";
+ msg += CTSIMVERSION;
+ msg += "\n\n";
#elif defined(VERSION)
- msg << "Version: " << VERSION << "\n\n";
+ msg << "Version: " << VERSION << "\n\n";
#endif
- msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
-
- wxMessageBox(msg, "About CTSim", wxOK | wxICON_INFORMATION, this);
- }
+ msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
+
+ wxMessageBox(msg, "About CTSim", wxOK | wxICON_INFORMATION, this);
+ }
}
ProjectionFileDocument*
CTSimApp::newProjectionDoc()
{
- ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
- if (newDoc) {
- ProjectionFileView* pView = newDoc->getView();
- if (pView) {
- wxFrame* pFrame = pView->getFrame();
- if (pFrame) {
- pFrame->SetSize (0,0);
- pFrame->Show (false);
- }
- }
+ ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
+ if (newDoc) {
+ ProjectionFileView* pView = newDoc->getView();
+ if (pView) {
+ wxFrame* pFrame = pView->getFrame();
+ if (pFrame) {
+ pFrame->SetSize (0,0);
+ pFrame->Show (false);
+ }
+ }
newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();
- }
-
- return newDoc;
+ }
+
+ return newDoc;
}
ImageFileDocument*
CTSimApp::newImageDoc()
{
- ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (""));
- if (newDoc) {
- ImageFileView* pView = newDoc->getView();
- if (pView) {
- wxFrame* pFrame = pView->getFrame();
- if (pFrame) {
- pFrame->SetSize (0,0);
- pFrame->Show (false);
- }
- }
+ ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (""));
+ if (newDoc) {
+ ImageFileView* pView = newDoc->getView();
+ if (pView) {
+ wxFrame* pFrame = pView->getFrame();
+ if (pFrame) {
+ pFrame->SetSize (0,0);
+ pFrame->Show (false);
+ }
+ }
newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplImage);
newDoc->OnNewDocument();
- }
-
- return newDoc;
+ }
+
+ return newDoc;
}
PlotFileDocument*
CTSimApp::newPlotDoc()
{
- PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (""));
- if (newDoc) {
- PlotFileView* pView = newDoc->getView();
- if (pView) {
- wxFrame* pFrame = pView->getFrame();
- if (pFrame) {
- wxSize size;
- m_pFrame->GetClientSize (&size.x, &size.y);
- pFrame->SetSize (size.x / 2, size.y / 2);
- pFrame->Show (false);
- }
- }
+ PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (""));
+ if (newDoc) {
+ PlotFileView* pView = newDoc->getView();
+ if (pView) {
+ wxFrame* pFrame = pView->getFrame();
+ if (pFrame) {
+ wxSize size;
+ m_pFrame->GetClientSize (&size.x, &size.y);
+ pFrame->SetSize (size.x / 2, size.y / 2);
+ pFrame->Show (false);
+ }
+ }
newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplPlot);
newDoc->OnNewDocument();
- }
-
- return newDoc;
+ }
+
+ return newDoc;
}
TextFileDocument*
CTSimApp::newTextDoc()
{
- wxString strFilename (getUntitledFilename());
- strFilename += ".txt";
-
- TextFileDocument* newDoc = dynamic_cast<TextFileDocument*>(m_pDocTemplText->CreateDocument (""));
- if (newDoc) {
- TextFileView* pView = newDoc->getView();
- if (pView) {
- wxFrame* pFrame = pView->getFrame();
- if (pFrame) {
- wxSize size;
- m_pFrame->GetClientSize (&size.x, &size.y);;
- pFrame->SetSize (size.x / 2, size.y / 2);
- pFrame->Show (false);
- }
- }
+ wxString strFilename (getUntitledFilename());
+ strFilename += ".txt";
+
+ TextFileDocument* newDoc = dynamic_cast<TextFileDocument*>(m_pDocTemplText->CreateDocument (""));
+ if (newDoc) {
+ TextFileView* pView = newDoc->getView();
+ if (pView) {
+ wxFrame* pFrame = pView->getFrame();
+ if (pFrame) {
+ wxSize size;
+ m_pFrame->GetClientSize (&size.x, &size.y);;
+ pFrame->SetSize (size.x / 2, size.y / 2);
+ pFrame->Show (false);
+ }
+ }
newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplText);
newDoc->OnNewDocument();
- }
-
- return newDoc;
+ }
+
+ return newDoc;
}
PhantomFileDocument*
CTSimApp::newPhantomDoc()
{
- PhantomFileDocument* newDoc = dynamic_cast<PhantomFileDocument*>(m_pDocTemplPhantom->CreateDocument (""));
- if (newDoc) {
- PhantomFileView* pView = newDoc->getView();
- if (pView) {
- wxFrame* pFrame = pView->getFrame();
- if (pFrame)
- pFrame->SetSize (0,0);
- }
+ PhantomFileDocument* newDoc = dynamic_cast<PhantomFileDocument*>(m_pDocTemplPhantom->CreateDocument (""));
+ if (newDoc) {
+ PhantomFileView* pView = newDoc->getView();
+ if (pView) {
+ wxFrame* pFrame = pView->getFrame();
+ if (pFrame)
+ pFrame->SetSize (0,0);
+ }
newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
newDoc->OnNewDocument();
- }
-
- return newDoc;
+ }
+
+ return newDoc;
}
#if wxUSE_GLCANVAS
Graph3dFileDocument*
CTSimApp::newGraph3dDoc()
{
- Graph3dFileDocument* newDoc = dynamic_cast<Graph3dFileDocument*>(m_pDocTemplGraph3d->CreateDocument (""));
- if (newDoc) {
- Graph3dFileView* pView = newDoc->getView();
- if (pView) {
- wxFrame* pFrame = pView->getFrame();
- if (pFrame)
- pFrame->SetSize (0,0);
- }
+ Graph3dFileDocument* newDoc = dynamic_cast<Graph3dFileDocument*>(m_pDocTemplGraph3d->CreateDocument (""));
+ if (newDoc) {
+ Graph3dFileView* pView = newDoc->getView();
+ if (pView) {
+ wxFrame* pFrame = pView->getFrame();
+ if (pFrame)
+ pFrame->SetSize (0,0);
+ }
newDoc->SetDocumentName (m_pDocTemplGraph3d->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplGraph3d);
newDoc->OnNewDocument();
- }
-
- return newDoc;
+ }
+
+ return newDoc;
}
#endif