X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=2dbdec7cd51b8f90a0f6fc6c5338de0f4a46fd03;hb=c0f892798de8f89715266150f7d8e413f2cf29fe;hp=08dc513b7661690632407920f87e895040b7a176;hpb=9149f18ce0f0f2910ab79e4ce75ff08e1de48790;p=ctsim.git diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 08dc513..2dbdec7 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.109 2002/05/05 09:51:23 kevin Exp $ +** $Id: ctsim.cpp,v 1.111 2002/05/08 08:55:45 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.109 2002/05/05 09:51:23 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.111 2002/05/08 08:55:45 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -164,7 +164,7 @@ CTSimApp::OnInit() #ifdef CTSIM_MDI wxSize(nearest(xDisplay * .75), nearest(yDisplay * .75)), #else - wxSize(nearest(xDisplay * .25), nearest(yDisplay * .25)), + wxSize(nearest(xDisplay * .6), nearest(yDisplay * .4)), #endif wxDEFAULT_FRAME_STYLE); @@ -982,15 +982,14 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) ) 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(); @@ -1002,8 +1001,8 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) ) 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"); }