projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2103: Committing for 3.5.4
[ctsim.git]
/
src
/
ctsim.cpp
diff --git
a/src/ctsim.cpp
b/src/ctsim.cpp
index 7f5193b520dfb931e643a4832a3895a21d24b9b9..931f2a21fdd2cb2469b62ade8d49febb2655d148 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.1
07 2002/05/03 09:57:41
kevin Exp $
+** $Id: ctsim.cpp,v 1.1
13 2002/06/03 03:58:07
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
@@
-70,7
+70,7
@@
#endif
#endif
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.1
07 2002/05/03 09:57:41
kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.1
13 2002/06/03 03:58:07
kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
struct option CTSimApp::ctsimOptions[] =
{
@@
-164,7
+164,7
@@
CTSimApp::OnInit()
#ifdef CTSIM_MDI
wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .75)),
#else
#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);
#endif
wxDEFAULT_FRAME_STYLE);
@@
-201,8
+201,10
@@
CTSimApp::OnInit()
if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
*m_pLog << "Cannot initialize the Windows Help system" << "\n";
#else
if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
*m_pLog << "Cannot initialize the Windows Help system" << "\n";
#else
- if (! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim") &&
- ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/share/ctsim/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"))
*m_pLog << "Cannot initialize the HTML Help system" << "\n";
else {
if (::wxDirExists ("/tmp"))
@@
-670,7
+672,7
@@
MainFrame::OnHelpButton (wxCommandEvent& event)
void
MainFrame::OnHelpSecondary (wxCommandEvent& event)
{
void
MainFrame::OnHelpSecondary (wxCommandEvent& event)
{
- m_htmlHelp.Display
Contents(
);
+ m_htmlHelp.Display
("Contents"
);
}
#endif
}
#endif
@@
-683,7
+685,7
@@
MainFrame::showHelp (int commandID)
#ifdef CTSIM_WINHELP
m_winHelp.DisplayContents ();
#else
#ifdef CTSIM_WINHELP
m_winHelp.DisplayContents ();
#else
- m_htmlHelp.Display
Contents (
);
+ m_htmlHelp.Display
("Contents"
);
#endif
break;
#endif
break;
@@
-980,15
+982,14
@@
MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) )
ImageFileDocument* pIFDoc = theApp->newImageDoc();
ImageFile* pIF = dicomImport.getImageFile();
pIFDoc->setImageFile (pIF);
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();
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();
} else if (dicomImport.testProjections()) {
ProjectionFileDocument* pProjDoc = theApp->newProjectionDoc();
Projections* pProj = dicomImport.getProjections();
@@
-1000,8
+1001,8
@@
MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) )
if (theApp->getAskDeleteNewDocs())
pProjDoc->Modify (true);
pProjDoc->UpdateAllViews();
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");
}
} else
::wxMessageBox ("Unrecognized DICOM file contents", "Import Error");
}
@@
-1025,11
+1026,16
@@
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
*theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
#endif
#if defined(DEBUG)
*theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
#endif
#if defined(DEBUG)
- *theApp->getLog() << ", CTSim Debug version";
+ *theApp->getLog() << ", CTSim Debug version"
<< "\n"
;
#else
#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
#endif
-
*theApp->getLog() << "\n";
wxBitmap bmp (splash);
*theApp->getLog() << "\n";
wxBitmap bmp (splash);
@@
-1056,12
+1062,15
@@
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
ProjectionFileDocument*
CTSimApp::newProjectionDoc()
{
ProjectionFileDocument*
CTSimApp::newProjectionDoc()
{
- ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
+ ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>
+ (m_pDocTemplProjection->CreateDocument (""));
if (newDoc) {
if (newDoc) {
- ProjectionFileView* pView = newDoc->getView();
newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();
newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();
+ if (newDoc->getView())
+ if (newDoc->getView()->getFrame())
+ newDoc->getView()->getFrame()->Show(false);
}
return newDoc;
}
return newDoc;
@@
-1075,6
+1084,9
@@
CTSimApp::newImageDoc()
newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplImage);
newDoc->OnNewDocument();
newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplImage);
newDoc->OnNewDocument();
+ if (newDoc->getView())
+ if (newDoc->getView()->getFrame())
+ newDoc->getView()->getFrame()->Show(false);
}
return newDoc;
}
return newDoc;
@@
-1088,6
+1100,9
@@
CTSimApp::newPlotDoc()
newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplPlot);
newDoc->OnNewDocument();
newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplPlot);
newDoc->OnNewDocument();
+ if (newDoc->getView())
+ if (newDoc->getView()->getFrame())
+ newDoc->getView()->getFrame()->Show(false);
}
return newDoc;
}
return newDoc;
@@
-1105,6
+1120,9
@@
CTSimApp::newTextDoc()
newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplText);
newDoc->OnNewDocument();
newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplText);
newDoc->OnNewDocument();
+ if (newDoc->getView())
+ if (newDoc->getView()->getFrame())
+ newDoc->getView()->getFrame()->Show(false);
}
return newDoc;
}
return newDoc;
@@
-1119,6
+1137,9
@@
CTSimApp::newPhantomDoc()
newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
newDoc->OnNewDocument();
newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
newDoc->OnNewDocument();
+ if (newDoc->getView())
+ if (newDoc->getView()->getFrame())
+ newDoc->getView()->getFrame()->Show(false);
}
return newDoc;
}
return newDoc;
@@
-1134,6
+1155,9
@@
CTSimApp::newGraph3dDoc()
newDoc->SetDocumentName (m_pDocTemplGraph3d->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplGraph3d);
newDoc->OnNewDocument();
newDoc->SetDocumentName (m_pDocTemplGraph3d->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplGraph3d);
newDoc->OnNewDocument();
+ if (newDoc->getView())
+ if (newDoc->getView()->getFrame())
+ newDoc->getView()->getFrame()->Show(false);
}
return newDoc;
}
return newDoc;