** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.106 2002/05/03 01:01:15 kevin Exp $
+** $Id: ctsim.cpp,v 1.114 2002/06/04 19:19:40 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.106 2002/05/03 01:01:15 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.114 2002/06/04 19:19:40 kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
#ifdef CTSIM_MDI
wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .75)),
#else
- wxSize(nearest<int>(xDisplay * .25), nearest<int>(yDisplay * .25)),
+ wxSize(nearest<int>(xDisplay * .6), nearest<int>(yDisplay * .4)),
#endif
wxDEFAULT_FRAME_STYLE);
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/share/ctsim"))
+ wxString docDir (DATADIR);
+ wxString docFile = docDir + "ctsim.htb";
+ if (! m_pFrame->getHtmlHelpController().AddBook(docFile) &&
+ ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim.htb"))
*m_pLog << "Cannot initialize the HTML Help system" << "\n";
else {
if (::wxDirExists ("/tmp"))
return;
}
pImageDoc->setImageFile (pImageFile);
- // pImageDoc->UpdateAllViews (NULL);
- // if (ImageFileView* imageView = pImageDoc->getView()) {
- // imageView->OnUpdate (imageView, NULL);
- // imageView->getFrame()->SetFocus();
- // imageView->getFrame()->Show(true);
- // }
if (theApp->getAskDeleteNewDocs())
pImageDoc->Modify (true);
}
return;
}
pProjDoc->setProjections (pProjections);
- pProjDoc->UpdateAllViews (NULL);
- if (ProjectionFileView* projView = pProjDoc->getView()) {
- projView->OnUpdate (projView, NULL);
- projView->getFrame()->SetFocus();
- projView->getFrame()->Show(true);
- }
-
if (theApp->getAskDeleteNewDocs())
pProjDoc->Modify (true);
}
void
MainFrame::OnHelpSecondary (wxCommandEvent& event)
{
- m_htmlHelp.DisplayContents();
+ m_htmlHelp.Display ("Contents");
}
#endif
#ifdef CTSIM_WINHELP
m_winHelp.DisplayContents ();
#else
- m_htmlHelp.DisplayContents ();
+ m_htmlHelp.Display ("Contents");
#endif
break;
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 (""));
+ ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>
+ (m_pDocTemplProjection->CreateDocument (""));
if (newDoc) {
- ProjectionFileView* pView = newDoc->getView();
- if (pView) {
- wxFrame* pFrame = pView->getFrame();
- if (pFrame) {
- // wxSize size;
- // m_pFrame->GetClientSize (&size.x, &size.y);
- // pFrame->SetClientSize (size.x / 2, size.y / 2);
- pFrame->Show (false);
- }
- }
newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();
return newDoc;
}
+#endif
+
+ProjectionFileDocument*
+CTSimApp::newProjectionDoc()
+{
+ ProjectionFileDocument* doc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_PROJECTION_FILENAME, wxDOC_SILENT));
+ doc->getView()->getFrame()->Show(false);
+
+ return doc;
+}
ImageFileDocument*
CTSimApp::newImageDoc()
{
- ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (""));
- if (newDoc) {
- newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
- newDoc->SetDocumentTemplate (m_pDocTemplImage);
- newDoc->OnNewDocument();
- }
-
- return newDoc;
+ return dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_IMAGE_FILENAME, wxDOC_SILENT));
}
PlotFileDocument*
CTSimApp::newPlotDoc()
{
- PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (""));
- if (newDoc) {
- newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
- newDoc->SetDocumentTemplate (m_pDocTemplPlot);
- newDoc->OnNewDocument();
- }
-
- return newDoc;
+ PlotFileDocument* doc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_PLOT_FILENAME, wxDOC_SILENT));
+ doc->getView()->getFrame()->Show(false);
+
+ return doc;
}