X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=19b0c5632dc0126bc0dbfc9d3e77bcf0413929de;hb=6563a3fc6cf0d419eb1a44794eed4df02b0c5420;hp=1ce18dbda6210b05b51697e6c446da78820cfdb9;hpb=dc5eb7b285e647a99535740a99d73d468a856ba3;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index 1ce18db..19b0c56 100644 --- 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.151 2002/05/03 00:40:30 kevin Exp $ +** $Id: views.cpp,v 1.159 2002/06/02 23:39:22 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 @@ -58,6 +58,8 @@ #include #endif +// Used to reduce calls to progress bar update function +const short int ITER_PER_UPDATE = 10; // ImageFileCanvas @@ -73,9 +75,7 @@ ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoin } ImageFileCanvas::~ImageFileCanvas() -{ - m_pView = NULL; -} +{} void ImageFileCanvas::OnDraw(wxDC& dc) @@ -190,11 +190,26 @@ ImageFileCanvas::OnChar (wxKeyEvent& event) wxSize ImageFileCanvas::GetBestSize() const { - if (! m_pView) - return wxSize(0,0); + const int iMinX = 50; + const int iMinY = 20; + wxSize bestSize (iMinX,iMinY); + + if (m_pView) { + const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); + bestSize.Set (rIF.nx(), rIF.ny()); + } + + if (bestSize.x > 800) + bestSize.x = 800; + if (bestSize.y > 800) + bestSize.y = 800; - const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); - return wxSize (rIF.nx(), rIF.ny()); + if (bestSize.y < iMinY) + bestSize.y = iMinY; + if (bestSize.x < iMinX) + bestSize.x = iMinX; + + return bestSize; } @@ -852,13 +867,8 @@ ImageFileView::OnImaginary (wxCommandEvent& event) ImageFileCanvas* ImageFileView::CreateCanvas (wxFrame* parent) { - ImageFileCanvas* pCanvas; - int width, height; - parent->GetClientSize(&width, &height); - - pCanvas = new ImageFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); - - pCanvas->SetScrollbars(20, 20, 50, 50); + ImageFileCanvas* pCanvas = new ImageFileCanvas (this, parent, wxPoint(-1,-1), + wxSize(-1,-1), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -873,12 +883,12 @@ wxDocChildFrame* ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); - + m_pFileMenu = new wxMenu; m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); @@ -1020,23 +1030,19 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { - m_pFrame = CreateChildFrame(doc, this); - m_bMinSpecified = false; m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; - // int width, height; - // m_pFrame->GetClientSize (&width, &height); - m_pFrame->SetTitle("ImageFileView"); + m_pFrame = CreateChildFrame(doc, this); + SetFrame (m_pFrame); m_pCanvas = CreateCanvas (m_pFrame); - - // int x, y; // X requires a forced resize - // m_pFrame->GetSize(&x, &y); - // m_pFrame->SetSize(-1, -1, x, y); - m_pFrame->SetFocus(); + m_pFrame->SetClientSize (m_pCanvas->GetBestSize()); + m_pCanvas->SetClientSize (m_pCanvas->GetBestSize()); + m_pFrame->SetTitle("ImageFileView"); + m_pFrame->Show(true); - // Activate(true); + Activate(true); return true; } @@ -1046,11 +1052,6 @@ ImageFileView::setInitialClientSize () { if (m_pFrame && m_pCanvas) { wxSize bestSize = m_pCanvas->GetBestSize(); - - if (bestSize.x > 800) - bestSize.x = 800; - if (bestSize.y > 800) - bestSize.y = 800; m_pFrame->SetClientSize (bestSize); m_pFrame->Show (true); @@ -1125,7 +1126,6 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool ImageFileView::OnClose (bool deleteWindow) { - //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; @@ -1322,13 +1322,12 @@ ImageFileView::OnConvert3d (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); Graph3dFileDocument* pGraph3d = theApp->newGraph3dDoc(); + pGraph3d->getView()->getFrame()->Show (false); pGraph3d->setBadFileOpen(); pGraph3d->createFromImageFile (rIF); - pGraph3d->getView()->OnUpdate (this, NULL); pGraph3d->UpdateAllViews(); - pGraph3d->getView()->getFrame()->SetClientSize (400, 400); pGraph3d->getView()->getFrame()->Show (true); - GetDocumentManager()->ActivateView (pGraph3d->getView(), true, false); + pGraph3d->getView()->Activate(true); ::wxYield(); pGraph3d->getView()->getCanvas()->SetFocus(); } @@ -1956,9 +1955,8 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) // PhantomCanvas PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style) -: wxScrolledWindow(frame, -1, pos, size, style) + : wxScrolledWindow(frame, -1, pos, size, style), m_pView(v) { - m_pView = v; } PhantomCanvas::~PhantomCanvas () @@ -1985,8 +1983,9 @@ PhantomCanvas::GetBestSize() const #ifdef CTSIM_MDI ySize = xSize = (xSize / 4); #else - ySize = xSize; + xSize = ySize = static_cast(ySize * .7); #endif + return wxSize (xSize, ySize); } @@ -2155,10 +2154,11 @@ PhantomFileView::OnProjections (wxCommandEvent& event) for (int i = 0; i < pProj->nView(); i++) { //theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace); theScanner.collectProjections (*pProj, rPhantom, i, 1, theScanner.offsetView(), true, m_iDefaultTrace); - if (! dlgProgress.Update (i+1)) { - delete pProj; - return; - } + if ((i + 1) % ITER_PER_UPDATE == 0) + if (! dlgProgress.Update (i+1)) { + delete pProj; + return; + } } } } @@ -2173,18 +2173,6 @@ PhantomFileView::OnProjections (wxCommandEvent& event) return; } pProjectionDoc->setProjections (pProj); - ProjectionFileView* projView = pProjectionDoc->getView(); - if (projView) { - projView->OnUpdate (projView, NULL); - if (projView->getCanvas()) - projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView); - if (wxFrame* pFrame = projView->getFrame()) { - pFrame->Show(true); - pFrame->SetFocus(); - pFrame->Raise(); - } - GetDocumentManager()->ActivateView (projView, true, false); - } if (theApp->getAskDeleteNewDocs()) pProjectionDoc-> Modify(true); pProjectionDoc->UpdateAllViews (this); @@ -2234,15 +2222,21 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) { ImageFile* pImageFile = new ImageFile (m_iDefaultRasterNX, m_iDefaultRasterNY); - wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), - pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT ); + wxProgressDialog dlgProgress (wxString("Rasterize"), + wxString("Rasterization Progress"), + pImageFile->nx() + 1, + getFrameForChild(), + wxPD_CAN_ABORT ); Timer timer; for (unsigned int i = 0; i < pImageFile->nx(); i++) { - rPhantom.convertToImagefile (*pImageFile, m_dDefaultRasterViewRatio, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true); - if (! dlgProgress.Update (i+1)) { - delete pImageFile; - return; - } + rPhantom.convertToImagefile (*pImageFile, m_dDefaultRasterViewRatio, + m_iDefaultRasterNSamples, Trace::TRACE_NONE, + i, 1, true); + if ((i + 1) % ITER_PER_UPDATE == 0) + if (! dlgProgress.Update (i+1)) { + delete pImageFile; + return; + } } ImageFileDocument* pRasterDoc = theApp->newImageDoc(); @@ -2256,7 +2250,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) *theApp->getLog() << os.str().c_str() << "\n"; pImageFile->labelAdd (os.str().c_str(), timer.timerEnd()); - pRasterDoc->UpdateAllViews(); + pRasterDoc->UpdateAllViews(this); pRasterDoc->getView()->setInitialClientSize(); pRasterDoc->Activate(); } @@ -2266,9 +2260,8 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) PhantomCanvas* PhantomFileView::CreateCanvas (wxFrame *parent) { - PhantomCanvas* pCanvas; - - pCanvas = new PhantomCanvas (this, parent, wxPoint(0, 0), wxSize(0,0), 0); + PhantomCanvas* pCanvas = new PhantomCanvas (this, parent, wxPoint(-1,-1), + wxSize(-1,-1), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -2283,9 +2276,9 @@ wxDocChildFrame* PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); @@ -2370,7 +2363,6 @@ PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool PhantomFileView::OnClose (bool deleteWindow) { - //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; @@ -2430,16 +2422,26 @@ ProjectionFileCanvas::OnDraw(wxDC& dc) wxSize ProjectionFileCanvas::GetBestSize () const { - wxSize best (0, 0); - if (! m_pView) - return best; + const int iMinX = 50; + const int iMinY = 20; + wxSize bestSize (iMinX,iMinY); if (m_pView) { Projections& rProj = m_pView->GetDocument()->getProjections(); - best.Set (rProj.nDet(), rProj.nView()); + bestSize.Set (rProj.nDet(), rProj.nView()); } - return best; + if (bestSize.x > 800) + bestSize.x = 800; + if (bestSize.y > 800) + bestSize.y = 800; + + if (bestSize.x < iMinX) + bestSize.x = iMinX; + if (bestSize.y < iMinY) + bestSize.y = iMinY; + + return bestSize; } @@ -2542,6 +2544,7 @@ ProjectionFileView::OnConvertRectangular (wxCommandEvent& event) pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pRectDoc->Modify (true); + pRectDoc->UpdateAllViews(); pRectDoc->getView()->setInitialClientSize(); pRectDoc->Activate(); } @@ -2623,7 +2626,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pPolarDoc->Modify (true); - pPolarDoc->UpdateAllViews (); + pPolarDoc->UpdateAllViews (this); pPolarDoc->getView()->setInitialClientSize(); pPolarDoc->Activate(); } @@ -2935,10 +2938,11 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar for (int iView = 0; iView < rProj.nView(); iView++) { pReconstructor->reconstructView (iView, 1); - if (! dlgProgress.Update (iView + 1)) { - delete pReconstructor; - return; // don't make new window, thread will do this - } + if ((iView + 1) % ITER_PER_UPDATE == 0) + if (! dlgProgress.Update (iView + 1)) { + delete pReconstructor; + return; // don't make new window, thread will do this + } } pReconstructor->postProcessing(); delete pReconstructor; @@ -2975,7 +2979,7 @@ ProjectionFileView::CreateCanvas (wxFrame *parent) int width, height; parent->GetClientSize(&width, &height); - pCanvas = new ProjectionFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new ProjectionFileCanvas (this, parent, wxPoint(-1,-1), wxSize(width, height), 0); pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); @@ -2992,9 +2996,9 @@ wxDocChildFrame* ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #ifdef CTSIM_MDI - wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); @@ -3082,12 +3086,11 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_pFrame = CreateChildFrame(doc, this); SetFrame(m_pFrame); - - int width, height; - m_pFrame->GetClientSize (&width, &height); - m_pFrame->SetTitle ("ProjectionFileView"); m_pCanvas = CreateCanvas (m_pFrame); - + m_pFrame->SetClientSize (m_pCanvas->GetBestSize()); + m_pCanvas->SetClientSize (m_pCanvas->GetBestSize()); + m_pFrame->SetTitle ("ProjectionFileView"); + m_pFrame->Show(true); Activate(true); @@ -3105,16 +3108,13 @@ ProjectionFileView::OnDraw (wxDC* dc) void ProjectionFileView::setInitialClientSize () { - wxSize bestSize = m_pCanvas->GetBestSize(); - - if (bestSize.x > 800) - bestSize.x = 800; - if (bestSize.y > 800) - bestSize.y = 800; + if (m_pFrame && m_pCanvas) { + wxSize bestSize = m_pCanvas->GetBestSize(); - m_pFrame->SetClientSize (bestSize); - m_pFrame->Show (true); - m_pFrame->SetFocus(); + m_pFrame->SetClientSize (bestSize); + m_pFrame->Show (true); + m_pFrame->SetFocus(); + } } void @@ -3158,16 +3158,13 @@ ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) wxImage image (nDet, nView, imageData, true); m_bitmap = image.ConvertToBitmap(); delete imageData; - //int xSize = nDet; - //int ySize = nView; - //xSize = clamp (xSize, 0, 800); - //ySize = clamp (ySize, 0, 800); - //m_pFrame->SetClientSize (xSize, ySize); - m_pCanvas->SetScrollbars (20, 20, nDet/20, nView/20); } - if (m_pCanvas) - m_pCanvas->Refresh(); + m_pCanvas->SetScrollbars(20, 20, nDet/20, nView/20); + m_pCanvas->SetBackgroundColour(*wxWHITE); + + if (m_pCanvas) + m_pCanvas->Refresh(); } bool @@ -3347,7 +3344,7 @@ PlotFileView::CreateCanvas (wxFrame* parent) int width, height; parent->GetClientSize(&width, &height); - pCanvas = new PlotFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new PlotFileCanvas (this, parent, wxPoint(-1,-1), wxSize(width, height), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -3363,9 +3360,9 @@ wxDocChildFrame* PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #ifdef CTSIM_MDI - wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(10, 10), wxSize(500, 300), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(-1,-1), wxSize(500, 300), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(10, 10), wxSize(500, 300), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(-1,-1), wxSize(500, 300), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); @@ -3566,7 +3563,7 @@ bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) int width, height; m_pFrame->GetClientSize(&width, &height); m_pFrame->SetTitle("TextFile"); - m_pCanvas = new TextFileCanvas (this, m_pFrame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY); + m_pCanvas = new TextFileCanvas (this, m_pFrame, wxPoint(-1,-1), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY); m_pFrame->SetTitle("Log"); m_pFrame->Show (true); @@ -3614,7 +3611,7 @@ wxDocChildFrame* TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(0,0), wxDEFAULT_FRAME_STYLE, "Log"); + wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE, "Log"); #else wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE, "Log"); #endif @@ -3673,7 +3670,7 @@ TextFileCanvas::~TextFileCanvas () } wxSize -PlotFileCanvas::GetBestSize() const +TextFileCanvas::GetBestSize() const { int xSize, ySize; theApp->getMainFrame()->GetClientSize (&xSize, &ySize);