X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=2757c5ee61777a84408959fc52f178a436a9f9d9;hb=f3c7d22b4544bb1d5c4471bceded6dc5b9ed57fd;hp=873e17f43b4260b73feb2005468df85063a437b4;hpb=a3b780af2224183d29ab3bdbc997003bcac680b0;p=ctsim.git diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 873e17f..2757c5e 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctsim.cpp,v 1.114 2002/06/04 19:19:40 kevin Exp $ +** $Id: ctsim.cpp,v 1.115 2002/06/06 22:50:24 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 @@ -70,7 +70,7 @@ #endif #endif -static const char* rcsindent = "$Id: ctsim.cpp,v 1.114 2002/06/04 19:19:40 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.115 2002/06/06 22:50:24 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -1077,25 +1077,40 @@ CTSimApp::newProjectionDoc() ProjectionFileDocument* CTSimApp::newProjectionDoc() { - ProjectionFileDocument* doc = dynamic_cast(theApp->getDocManager()->CreateDocument (szNEW_PROJECTION_FILENAME, wxDOC_SILENT)); - doc->getView()->getFrame()->Show(false); + ProjectionFileDocument* newDoc = dynamic_cast(m_pDocTemplProjection->CreateDocument ("")); + if (newDoc) { + newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName()); + newDoc->SetDocumentTemplate (m_pDocTemplProjection); + newDoc->OnNewDocument(); + } - return doc; + return newDoc; } ImageFileDocument* CTSimApp::newImageDoc() { - return dynamic_cast(theApp->getDocManager()->CreateDocument (szNEW_IMAGE_FILENAME, wxDOC_SILENT)); + ImageFileDocument* newDoc = dynamic_cast(m_pDocTemplImage->CreateDocument ("")); + if (newDoc) { + newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName()); + newDoc->SetDocumentTemplate (m_pDocTemplImage); + newDoc->OnNewDocument(); + } + + return newDoc; } PlotFileDocument* CTSimApp::newPlotDoc() { - PlotFileDocument* doc = dynamic_cast(theApp->getDocManager()->CreateDocument (szNEW_PLOT_FILENAME, wxDOC_SILENT)); - doc->getView()->getFrame()->Show(false); - - return doc; + PlotFileDocument* newDoc = dynamic_cast(m_pDocTemplPlot->CreateDocument ("")); + if (newDoc) { + newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName()); + newDoc->SetDocumentTemplate (m_pDocTemplPlot); + newDoc->OnNewDocument(); + } + + return newDoc; } @@ -1129,8 +1144,8 @@ CTSimApp::newPhantomDoc() return newDoc; } -#if wxUSE_GLCANVAS +#if wxUSE_GLCANVAS Graph3dFileDocument* CTSimApp::newGraph3dDoc() {