r471: Fixed shutdown crash, added Revert

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 87aec7e458349597b9163cf9bfde661f10f280f9..38c939c66e47bd26adfb1acf0e065692eee12c77 100644 (file)
--- 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.57 2001/01/29 00:42:26 kevin Exp $
+**  $Id: ctsim.cpp,v 1.60 2001/01/30 05:05:41 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.57 2001/01/29 00:42:26 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.60 2001/01/30 05:05:41 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -167,6 +167,7 @@ CTSimApp::OnInit()
                m_docManager->FileHistoryLoad(*m_pConfig);
        
 #ifdef CTSIM_MDI
+#if 1
        m_pLogDoc = newTextDoc();
        if (m_pLogDoc) {
                m_pLog = m_pLogDoc->getTextCtrl();
@@ -175,10 +176,20 @@ CTSimApp::OnInit()
                m_pLogDoc->getView()->getFrame()->SetTitle("Log");
                int xSize, ySize;
                m_pFrame->GetClientSize(&xSize, &ySize);
-               int yLogSize = ySize / 3;
+               int yLogSize = ySize / 4;
                m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
                m_pLogDoc->getView()->getFrame()->Show (true);
        } else
+#else
+//    wxMDIChildFrame *pLogFrame = new wxMDIChildFrame (m_pFrame, -1, "Log", wxDefaultPosition, wxSize(0,0), wxTHICK_FRAME, "Log");
+    m_pLog = new wxTextCtrl(m_pFrame->GetClientWindow(), -1, "", wxPoint(0,0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
+               int xSize, ySize;
+               m_pFrame->GetClientSize(&xSize, &ySize);
+               int yLogSize = ySize / 5;
+               m_pLog->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+               m_pLog->Show (true);
+    m_pLog->Enable (true);
+#endif
 #else
                m_pLog = new wxTextCtrl (m_pFrame, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
 #endif
@@ -293,6 +304,8 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 : wxDocParentFrame(manager, frame, id, title, pos, size, type, "MainFrame")
 #endif
 {
+  m_bShuttingDown = false;
+
        //// Make a menubar
        wxMenu *file_menu = new wxMenu;
        
@@ -368,6 +381,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 
 MainFrame::~MainFrame()
 {
+  m_bShuttingDown = true; // Currently used so that Log Window will close
        if (theApp->getConfig())
                theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
        delete theApp->getDocManager();
@@ -378,17 +392,13 @@ void
 MainFrame::OnSize (wxSizeEvent& event)
 {
 #ifdef CTSIM_MDI
-       int xSize, ySize;
-       wxMDIParentFrame::GetClientSize(&xSize, &ySize);
-       
-       if (theApp->getLogDoc()) {
+    if (theApp->getLogDoc()) {
+       int xSize, ySize;       
                GetClientSize(&xSize, &ySize);
-               int yLogSize = ySize / 3;
-               theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
-               theApp->getLogDoc()->getView()->getFrame()->Show (true);
-       }
-       //GetClientWindow()->SetSize (0, 0, sizeClient.x, sizeClient.y);
-       //GetClientWindow()->Refresh();
+               int yLogSize = ySize / 4;
+                 theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+                 theApp->getLogDoc()->getView()->getFrame()->Show (true);
+    }
 #endif
        
 #if CTSIM_MDI
@@ -445,8 +455,7 @@ MainFrame::OnCreateFilter (wxCommandEvent& WXUNUSED(event))
                rIF.setArraySize (m_iDefaultFilterXSize, m_iDefaultFilterYSize);
                rIF.filterResponse (strDomain.c_str(), m_dDefaultFilterBandwidth, strFilter.c_str(), m_dDefaultFilterParam, m_dDefaultFilterInputScale, m_dDefaultFilterOutputScale);
                rIF.labelAdd (os.str().c_str());
-               if (theApp->getSetModifyNewDocs())
-                       pFilterDoc->Modify (true);
+    pFilterDoc->Modify (true);
                pFilterDoc->UpdateAllViews();
                pFilterDoc->GetFirstView()->OnUpdate (NULL, NULL);
                pFilterDoc->getView()->getFrame()->SetClientSize(m_iDefaultFilterXSize, m_iDefaultFilterYSize);
@@ -534,6 +543,7 @@ MainFrame::OnExit (wxCommandEvent& WXUNUSED(event) )
 void
 MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
 {
+#ifndef CTSIM_MDI
        int iPos = 0;
        wxList& rListDocs = theApp->getDocManager()->GetDocuments();
        wxNode* pNode = rListDocs.GetFirst();
@@ -555,7 +565,7 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
                static_cast<wxMenuItemBase*>(m_apWindowMenuItems[i])->SetName (wxString("[EMPTY]"));
                m_apWindowMenuData[i] = NULL;
        }
-       
+#endif 
 }
 
 #ifdef CTSIM_CUSTOM_MRU
@@ -776,7 +786,9 @@ CTSimApp::newProjectionDoc()
                                pFrame->Show (false);
                        }
                }
-               newDoc->OnNewDocument();
+    newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplProjection);
+    newDoc->OnNewDocument();
        }
        
        return newDoc;
@@ -795,7 +807,9 @@ CTSimApp::newImageDoc()
                                pFrame->Show (false);
                        }
                }
-               newDoc->OnNewDocument();
+    newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplImage);
+    newDoc->OnNewDocument();
        }
        
        return newDoc;
@@ -816,7 +830,9 @@ CTSimApp::newPlotDoc()
                                pFrame->Show (false);
                        }
                }
-               newDoc->OnNewDocument();
+    newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplPlot);
+    newDoc->OnNewDocument();
        }
        
        return newDoc;
@@ -841,7 +857,9 @@ CTSimApp::newTextDoc()
                                pFrame->Show (false);
                        }
                }
-               newDoc->OnNewDocument();
+    newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplText);
+    newDoc->OnNewDocument();
        }
        
        return newDoc;
@@ -859,7 +877,9 @@ CTSimApp::newPhantomDoc()
                        if (pFrame)
                                pFrame->SetSize (0,0);
                }
-               newDoc->OnNewDocument();
+    newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
+    newDoc->OnNewDocument();
        }
        
        return newDoc;