** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.110 2002/05/05 14:22:44 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
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.110 2002/05/05 14:22:44 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.115 2002/06/06 22:50:24 kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
ImageFileDocument* pIFDoc = theApp->newImageDoc();
ImageFile* pIF = dicomImport.getImageFile();
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);
+ pIFDoc->getView()->setInitialClientSize();
+ pIFDoc->Activate();
} else if (dicomImport.testProjections()) {
ProjectionFileDocument* pProjDoc = theApp->newProjectionDoc();
Projections* pProj = dicomImport.getProjections();
if (theApp->getAskDeleteNewDocs())
pProjDoc->Modify (true);
pProjDoc->UpdateAllViews();
- pProjDoc->GetFirstView()->OnUpdate (NULL, NULL);
- pProjDoc->getView()->getFrame()->Show(true);
+ pProjDoc->getView()->setInitialClientSize();
+ pProjDoc->Activate();
} else
::wxMessageBox ("Unrecognized DICOM file contents", "Import Error");
}
*theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
#endif
#if defined(DEBUG)
- *theApp->getLog() << ", CTSim Debug version";
+ *theApp->getLog() << ", CTSim Debug version" << "\n";
#else
- *theApp->getLog() << ", CTSim Release version";
+ *theApp->getLog() << ", CTSim Release version" << "\n";
+#endif
+#ifdef CTSIMVERSION
+ *theApp->getLog() << "Version ";
+ *theApp->getLog() << CTSIMVERSION;
+#elif defined(VERSION)
+ *theApp->getLog() << "Version: " << VERSION;
#endif
-
*theApp->getLog() << "\n";
wxBitmap bmp (splash);
}
}
+#if 0
+ProjectionFileDocument*
+CTSimApp::newProjectionDoc()
+{
+ ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>
+ (m_pDocTemplProjection->CreateDocument (""));
+ if (newDoc) {
+ newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
+ newDoc->SetDocumentTemplate (m_pDocTemplProjection);
+ newDoc->OnNewDocument();
+ }
+
+ return newDoc;
+}
+#endif
ProjectionFileDocument*
CTSimApp::newProjectionDoc()
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();
}
-
+
return newDoc;
}
newDoc->SetDocumentTemplate (m_pDocTemplImage);
newDoc->OnNewDocument();
}
-
+
return newDoc;
}
return newDoc;
}
-#if wxUSE_GLCANVAS
+#if wxUSE_GLCANVAS
Graph3dFileDocument*
CTSimApp::newGraph3dDoc()
{