X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fctsim.cpp;h=71b053906de0d2fa31026a1df20117b133e23bde;hb=27a474e0622ebb7229fd5705552021f63d8f932d;hp=c7db0f0501a1ba70c9091d1828646c91d1dfd50b;hpb=e4c1f7f8eb87558c3abf3bf1d20732361f425351;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index c7db0f0..71b0539 100644
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.5 2000/07/15 08:36:13 kevin Exp $
+**  $Id: ctsim.cpp,v 1.7 2000/07/20 11:17:31 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
@@ -41,10 +41,18 @@
 #endif
 
 #include "wx/docview.h"
-#include "ct.h"
 #include "ctsim.h"
 #include "docs.h"
 #include "views.h"
+#include "dialogs.h"
+#include "ctsupport.h"
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+#if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
+#include <getopt.h>
+#endif
+
 
 class CTSimApp* theApp = NULL;
 
@@ -96,7 +104,7 @@ CTSimApp::OnInit(void)
     //// Make a menubar
     wxMenu *file_menu = new wxMenu;
     
-    file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "&Create Phantom...");
+    file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
     file_menu->Append(wxID_OPEN, "&Open...");
     
     file_menu->AppendSeparator();
@@ -188,26 +196,13 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 void 
 MainFrame::OnCreatePhantom(wxCommandEvent& WXUNUSED(event))
 {
-    wxString choiceStringList [5];
-    choiceStringList[0] = Phantom::PHM_HERMAN_STR;
-    choiceStringList[1] = Phantom::PHM_BHERMAN_STR;
-    choiceStringList[2] = Phantom::PHM_ROWLAND_STR;;
-    choiceStringList[3] = Phantom::PHM_BROWLAND_STR;
-    choiceStringList[4] = Phantom::PHM_UNITPULSE_STR;
-    wxString choiceTitleList [5];
-    choiceTitleList[0] = "Herman Head";
-    choiceTitleList[1] = "Herman Head Bordered";
-    choiceTitleList[2] = "Rowland Head";
-    choiceTitleList[3] = "Rowland Head Bordered";
-    choiceTitleList[4] = "Unit Pulse";
-    wxSingleChoiceDialog dialog (this, "Select phantom", "Phantom Selection", 5, choiceTitleList, NULL, wxOK|wxCANCEL|wxCENTRE);
-
-    int dialogReturn = dialog.ShowModal();
+    DialogGetPhantom dialogPhantom (this, Phantom::PHM_HERMAN_STR);
+    int dialogReturn = dialogPhantom.ShowModal();
     if (dialogReturn == wxID_OK) {
-	int selection = dialog.GetSelection();
-	*theApp->getLog() << "Selected phantom " << selection << "\n";
-	wxString filename = choiceStringList[selection] + ".phm";
-	theApp->getDocManager()->CreateDocument(filename, wxDOC_SILENT);
+      wxString selection = dialogPhantom.getPhantom();
+      *theApp->getLog() << "Selected phantom " << selection.c_str() << "\n";
+      wxString filename = selection + ".phm";
+      theApp->getDocManager()->CreateDocument(filename, wxDOC_SILENT);
     }
     
 }