** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.42 2001/01/26 05:37:24 kevin Exp $
+** $Id: ctsim.cpp,v 1.46 2001/01/27 01:51:47 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.42 2001/01/26 05:37:24 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.46 2001/01/27 01:51:47 kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
#endif
// Create the main frame window
- m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
+ int xDisplay, yDisplay;
+ ::wxDisplaySize (&xDisplay, &yDisplay);
+ m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0), wxSize(xDisplay * .75, yDisplay * .755), wxDEFAULT_FRAME_STYLE);
setIconForFrame (m_pFrame);
m_pFrame->Centre(wxBOTH);
pLogDoc->SetFilename("Log.txt");
pLogDoc->getView()->getFrame()->SetTitle("Log");
int xSize, ySize;
- m_pFrame->GetSize(&xSize, &ySize);
- int yLogSize = ySize / 4;
- pLogDoc->getView()->getFrame()->SetSize (0, 0, xSize, yLogSize);
+ m_pFrame->GetClientSize(&xSize, &ySize);
+ int yLogSize = ySize / 3;
+ pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
} else
#else
m_pLog = new wxTextCtrl (m_pFrame, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
int
CTSimApp::OnExit()
{
- if (theApp->getConfig())
- theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
- delete theApp->getDocManager();
- m_docManager = NULL;
-
#ifdef HAVE_DMALLOC
dmalloc_shutdown();
#endif
SetMenuBar(menu_bar);
#ifndef CTSIM_MDI
- for (int i = 0; i < MAX_WINDOW_MENUITEMS; i++) {
+ int i;
+ for (i = 0; i < MAX_WINDOW_MENUITEMS; i++) {
m_apWindowMenuItems[i] = new wxMenuItem (m_pWindowMenu, MAINMENU_WINDOW_BASE+i, wxString("[EMPTY]"));
m_pWindowMenu->Append (m_apWindowMenuItems[i]);
m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
MainFrame::~MainFrame()
{
+ if (theApp->getConfig())
+ theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
+ delete theApp->getDocManager();
}
void
*theApp->getLog() << "Selected phantom " << selection.c_str() << "\n";
wxString filename = selection + ".phm";
m_iDefaultPhantomID = Phantom::convertNameToPhantomID (selection.c_str());
- theApp->getDocManager()->CreateDocument(filename, wxDOC_SILENT);
+ theApp->getDocManager()->CreateDocument (filename, wxDOC_SILENT);
}
}
ProjectionFileView* pView = newDoc->getView();
if (pView) {
wxFrame* pFrame = pView->getFrame();
- if (pFrame)
+ if (pFrame) {
pFrame->SetSize(0,0);
+ pFrame->Show (false);
+ }
}
- newDoc->SetDocumentName(strFilename);
- newDoc->SetFilename(strFilename);
- newDoc->SetDocumentTemplate(m_pDocTemplProjection);
- newDoc->SetTitle(strFilename);
newDoc->OnNewDocument();
+// newDoc->SetFilename(strFilename, true);
}
return newDoc;
ImageFileView* pView = newDoc->getView();
if (pView) {
wxFrame* pFrame = pView->getFrame();
- if (pFrame)
+ if (pFrame) {
pFrame->SetSize(0,0);
+ pFrame->Show (false);
+ }
}
- newDoc->SetDocumentName(strFilename);
- newDoc->SetFilename(strFilename);
- newDoc->SetDocumentTemplate(m_pDocTemplImage);
- newDoc->SetTitle(strFilename);
newDoc->OnNewDocument();
+// newDoc->SetFilename(strFilename, true);
}
return newDoc;
if (pFrame)
pFrame->SetSize(0,0);
}
- newDoc->SetDocumentName(strFilename);
- newDoc->SetFilename(strFilename);
- newDoc->SetDocumentTemplate(m_pDocTemplPlot);
- newDoc->SetTitle(strFilename);
newDoc->OnNewDocument();
+// newDoc->SetFilename(strFilename, true);
}
return newDoc;
if (pFrame)
pFrame->SetSize(0,0);
}
- newDoc->SetDocumentName(strFilename);
- newDoc->SetFilename(strFilename);
- newDoc->SetDocumentTemplate(m_pDocTemplText);
- newDoc->SetTitle(strFilename);
newDoc->OnNewDocument();
+// newDoc->SetFilename(strFilename, true);
}
return newDoc;
if (pFrame)
pFrame->SetSize(0,0);
}
- newDoc->SetDocumentName(strFilename);
- newDoc->SetFilename(strFilename);
- newDoc->SetDocumentTemplate(m_pDocTemplPhantom);
- newDoc->SetTitle(strFilename);
newDoc->OnNewDocument();
+// newDoc->SetFilename(strFilename, true);
}
return newDoc;