r465: no message

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index 833213afc039deaa790be9c32321554d84fd8b27..498754a3b624513515a8da201caf55067682b4d1 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,13 +6,13 @@
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5BC.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5F7.tmp" with contents
 [
 /nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.5.0\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
 "C:\ctsim\src\views.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5BC.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5BD.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5F7.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5F8.tmp" with contents
 [
 comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib xpmd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib" 
 .\Debug\ctsim.obj
@@ -28,7 +28,7 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w
 \wx2\lib\wxd.lib
 \wx2\lib\xpmd.lib
 ]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5BD.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5F8.tmp"
 <h3>Output Window</h3>
 Compiling...
 views.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index f18a0eebb0403a9f6bdb0ebab13e20635fab268a..d24d9797cc0a69dc7a70ee6a90927cf21ee7b9b1 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.55 2001/01/28 21:57:09 kevin Exp $
+**  $Id: ctsim.cpp,v 1.56 2001/01/28 22:45:54 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.55 2001/01/28 21:57:09 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.56 2001/01/28 22:45:54 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -819,6 +819,7 @@ CTSimApp::newPlotDoc()
         wxSize size;
         m_pFrame->GetClientSize (&size.x, &size.y);
         pFrame->SetSize (size.x / 2, size.y / 2);
+        pFrame->Show (false);
       }
     }
     newDoc->OnNewDocument();

diff --git a/src/views.cpp b/src/views.cpp
index 12eaf54ba97c87ce6f7169847d6311648b4dfabd..a72ace4a3432104c64fdcbeecc31f8e2c17ccedd 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.86 2001/01/28 21:57:09 kevin Exp $
+**  $Id: views.cpp,v 1.87 2001/01/28 22:45:54 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
@@ -156,6 +156,15 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event)
       DrawRubberBandCursor (dc, pt.x, yPt);
       m_xCursor = pt.x;
       m_yCursor = yPt;
+      wxMenu* pMenu = m_pView->getMenuAnalyze();
+      if (pMenu && ! pMenu->IsEnabled(IFMENU_PLOT_ROW)) {
+        pMenu->Enable (IFMENU_PLOT_ROW, true);
+        pMenu->Enable (IFMENU_PLOT_COL, true);
+        pMenu->Enable (IFMENU_COMPARE_ROW, true);
+        pMenu->Enable (IFMENU_COMPARE_COL, true);
+        pMenu->Enable (IFMENU_PLOT_FFT_ROW, true);
+        pMenu->Enable (IFMENU_PLOT_FFT_COL, true);
+      }
     } else
       *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n";
   }
@@ -359,7 +368,13 @@ ImageFileView::OnCompare (wxCommandEvent& event)
         
         differenceImage.setArraySize (rIF.nx(), rIF.ny());
         if (! rIF.subtractImages (rCompareIF, differenceImage)) {
-          pDifferenceDoc->getView()->getFrame()->Close(true);
+            pDifferenceDoc->getView()->getFrame()->Show(true);
+            GetDocumentManager()->ActivateView (pDifferenceDoc->getView(), true, false);
+            pDifferenceDoc->getView()->getFrame()->SetFocus();
+            wxCommandEvent event;
+            GetDocumentManager()->OnFileClose (event);
+            GetDocumentManager()->ActivateView (this, true, false);
+            getFrame()->SetFocus();
           return;
         }
         
@@ -860,17 +875,23 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   image_menu->AppendSeparator();
   image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size...");
   
-  wxMenu *analyze_menu = new wxMenu;
-  analyze_menu->Append (IFMENU_PLOT_ROW, "Plot &Row");
-  analyze_menu->Append (IFMENU_PLOT_COL, "Plot &Column");
-  analyze_menu->Append (IFMENU_PLOT_HISTOGRAM, "Plot &Histogram");
-  analyze_menu->AppendSeparator();
-  analyze_menu->Append (IFMENU_PLOT_FFT_ROW, "Plot FFT Row");
-  analyze_menu->Append (IFMENU_PLOT_FFT_COL, "Plot FFT Column");
-  analyze_menu->AppendSeparator();
-  analyze_menu->Append (IFMENU_COMPARE_IMAGES, "Compare &Images...");
-  analyze_menu->Append (IFMENU_COMPARE_ROW, "Compare &Row");
-  analyze_menu->Append (IFMENU_COMPARE_COL, "Compare &Column");
+  m_pMenuAnalyze = new wxMenu;
+  m_pMenuAnalyze->Append (IFMENU_PLOT_ROW, "Plot &Row");
+  m_pMenuAnalyze->Append (IFMENU_PLOT_COL, "Plot &Column");
+  m_pMenuAnalyze->Append (IFMENU_PLOT_HISTOGRAM, "Plot &Histogram");
+  m_pMenuAnalyze->AppendSeparator();
+  m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_ROW, "Plot FFT Row");
+  m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_COL, "Plot FFT Column");
+  m_pMenuAnalyze->AppendSeparator();
+  m_pMenuAnalyze->Append (IFMENU_COMPARE_IMAGES, "Compare &Images...");
+  m_pMenuAnalyze->Append (IFMENU_COMPARE_ROW, "Compare &Row");
+  m_pMenuAnalyze->Append (IFMENU_COMPARE_COL, "Compare &Column");
+  m_pMenuAnalyze->Enable (IFMENU_PLOT_ROW, false);
+  m_pMenuAnalyze->Enable (IFMENU_PLOT_COL, false);
+  m_pMenuAnalyze->Enable (IFMENU_COMPARE_ROW, false);
+  m_pMenuAnalyze->Enable (IFMENU_COMPARE_COL, false);
+  m_pMenuAnalyze->Enable (IFMENU_PLOT_FFT_ROW, false);
+  m_pMenuAnalyze->Enable (IFMENU_PLOT_FFT_COL, false);
   
   wxMenu *help_menu = new wxMenu;
   help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
@@ -883,7 +904,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   menu_bar->Append(view_menu, "&View");
   menu_bar->Append(image_menu, "&Image");
   menu_bar->Append(filter_menu, "Fi&lter");
-  menu_bar->Append(analyze_menu, "&Analyze");
+  menu_bar->Append(m_pMenuAnalyze, "&Analyze");
   menu_bar->Append(help_menu, "&Help");
   
   subframe->SetMenuBar(menu_bar);
@@ -1004,6 +1025,7 @@ ImageFileView::OnClose (bool deleteWindow)
     m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
   }
+  m_pFrame->Show(false);
   wxString s(theApp->GetAppName());
   if (m_pFrame)
     m_pFrame->SetTitle(s);
@@ -1012,7 +1034,6 @@ ImageFileView::OnClose (bool deleteWindow)
   Activate(false);
   
   if (deleteWindow) {
-    m_pFrame->Show(false);
     m_pFrame->Destroy();
     m_pFrame = NULL;
   }
@@ -1177,6 +1198,8 @@ ImageFileView::OnPlotRow (wxCommandEvent& event)
     if (theApp->getSetModifyNewDocs())
       pPlotDoc->Modify(true);
     pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1261,6 +1284,8 @@ ImageFileView::OnPlotCol (wxCommandEvent& event)
     if (theApp->getSetModifyNewDocs())
       pPlotDoc->Modify(true);
     pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1354,6 +1379,8 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
     if (theApp->getSetModifyNewDocs())
       pPlotDoc->Modify(true);
     pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1453,6 +1480,8 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
     if (theApp->getSetModifyNewDocs())
       pPlotDoc->Modify(true);
     pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 #endif
@@ -1542,6 +1571,8 @@ ImageFileView::OnCompareCol (wxCommandEvent& event)
       if (theApp->getSetModifyNewDocs())
         pPlotDoc->Modify(true);
       pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -1632,6 +1663,8 @@ ImageFileView::OnCompareRow (wxCommandEvent& event)
       if (theApp->getSetModifyNewDocs())
         pPlotDoc->Modify(true);
       pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -1697,6 +1730,8 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event)
       if (theApp->getSetModifyNewDocs())
         pPlotDoc->Modify(true);
       pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -2062,6 +2097,7 @@ PhantomFileView::OnClose (bool deleteWindow)
     m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
   }
+    m_pFrame->Show(false);
   wxString s(wxTheApp->GetAppName());
   if (m_pFrame)
     m_pFrame->SetTitle(s);
@@ -2070,7 +2106,6 @@ PhantomFileView::OnClose (bool deleteWindow)
   Activate(false);
   
   if (deleteWindow) {
-    m_pFrame->Show(false);
     m_pFrame->Destroy();
     m_pFrame = NULL;
   }
@@ -2407,8 +2442,9 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image...\tCtrl-I");
   
   wxMenu *reconstruct_menu = new wxMenu;
-  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R");
-  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E");
+  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R", "Reconstruct image using filtered backprojection");
+  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier");
+  reconstruct_menu->Enable (PJMENU_RECONSTRUCT_FOURIER, false);
   
   wxMenu *help_menu = new wxMenu;
   help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
@@ -2541,6 +2577,7 @@ ProjectionFileView::OnClose (bool deleteWindow)
     m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
   }
+  m_pFrame->Show(false);
   wxString s(wxTheApp->GetAppName());
   if (m_pFrame)
     m_pFrame->SetTitle(s);
@@ -2549,7 +2586,6 @@ ProjectionFileView::OnClose (bool deleteWindow)
   Activate(false);
   
   if (deleteWindow) {
-    m_pFrame->Show(false);
     m_pFrame->Destroy();
     m_pFrame = NULL;
   }
@@ -2869,6 +2905,7 @@ PlotFileView::OnClose (bool deleteWindow)
     m_pCanvas->setView (NULL);
     m_pCanvas = NULL;
   }
+    m_pFrame->Show(false);
   wxString s(wxTheApp->GetAppName());
   if (m_pFrame)
     m_pFrame->SetTitle(s);
@@ -2878,7 +2915,6 @@ PlotFileView::OnClose (bool deleteWindow)
   m_pFrame->SetView(NULL);
   SetFrame(NULL);
   if (deleteWindow) {
-    m_pFrame->Show(false);
     m_pFrame->Destroy();
     m_pFrame = NULL;
   }
@@ -2940,12 +2976,12 @@ TextFileView::OnClose (bool deleteWindow)
     return false;
   
   m_pCanvas->Show(false);
+  m_pFrame->Show(false);
   Activate(false);
   
   SetFrame(NULL);
   m_pFrame->SetView(NULL);
   if (deleteWindow) {
-    m_pFrame->Show(false);
     m_pFrame->Destroy();
     m_pFrame = NULL;
     

diff --git a/src/views.h b/src/views.h
index 5f8214998616e7a048076ca8f8047aef272ed0c1..c36ad23f3eb58d71a90d762fef2a7d178a66f258 100644 (file)
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.37 2001/01/28 19:10:18 kevin Exp $
+**  $Id: views.h,v 1.38 2001/01/28 22:45:54 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
@@ -44,6 +44,7 @@ private:
     
   wxMemoryDC m_memoryDC;
   wxBitmap m_bitmap;
+  wxMenu* m_pMenuAnalyze;
   
   ImageFileCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
@@ -135,7 +136,9 @@ public:
 #else
   wxDocChildFrame* getFrame() { return m_pFrame; }
 #endif
-  
+
+  wxMenu* getMenuAnalyze() { return m_pMenuAnalyze; }
+
   ImageFileDocument* GetDocument() 
   { return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
   
@@ -146,6 +149,7 @@ class ImageFileCanvas: public wxScrolledWindow
 {
 private:
   ImageFileView* m_pView;
+
   int m_xCursor;
   int m_yCursor;