projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1836: make-dist.sh
[ctsim.git]
/
src
/
views.cpp
diff --git
a/src/views.cpp
b/src/views.cpp
index b7934f1901c9cc4320ae02e155561515a2e324a4..b33086e89b495f93d41d069c28a592a65ab8cdd6 100644
(file)
--- a/
src/views.cpp
+++ b/
src/views.cpp
@@
-1,7
+1,7
@@
/*****************************************************************************
** FILE IDENTIFICATION
**
/*****************************************************************************
** FILE IDENTIFICATION
**
-** Name: view.cpp
+** Name: view
s
.cpp
** Purpose: View & Canvas routines for CTSim program
** Programmer: Kevin Rosenberg
** Date Started: July 2000
** Purpose: View & Canvas routines for CTSim program
** Programmer: Kevin Rosenberg
** Date Started: July 2000
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.14
8 2002/04/30 03:37:12
kevin Exp $
+** $Id: views.cpp,v 1.14
9 2002/04/30 18:13:40
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
**
** 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
@@
-1027,17
+1027,17
@@
ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
m_bMaxSpecified = false;
m_dAutoScaleFactor = 1.;
m_bMaxSpecified = false;
m_dAutoScaleFactor = 1.;
- int width, height;
- m_pFrame->GetClientSize (&width, &height);
+
//
int width, height;
+
//
m_pFrame->GetClientSize (&width, &height);
m_pFrame->SetTitle("ImageFileView");
m_pCanvas = CreateCanvas (m_pFrame);
m_pFrame->SetTitle("ImageFileView");
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);
+
//
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->Show(true);
m_pFrame->SetFocus();
m_pFrame->Show(true);
- Activate(true);
+
//
Activate(true);
return true;
}
return true;
}
@@
-1106,7
+1106,7
@@
ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
int xSize = nx;
int ySize = ny;
ySize = clamp (ySize, 0, 800);
int xSize = nx;
int ySize = ny;
ySize = clamp (ySize, 0, 800);
- m_pFrame->SetClientSize (xSize, ySize);
+ // m_pFrame->SetClientSize (xSize, ySize); // KMR
m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20);
m_pCanvas->SetBackgroundColour(*wxWHITE);
}
m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20);
m_pCanvas->SetBackgroundColour(*wxWHITE);
}
@@
-2957,13
+2957,14
@@
ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar
pImageFile->labelAdd (rProj.getLabel());
pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());
pImageFile->labelAdd (rProj.getLabel());
pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());
- if (ImageFileView* rasterView = pReconDoc->getView()) {
- rasterView->getFrame()->Show(true);
- rasterView->getFrame()->SetFocus();
- rasterView->OnUpdate (rasterView, NULL);
- }
+
//
if (ImageFileView* rasterView = pReconDoc->getView()) {
+
//
rasterView->getFrame()->Show(true);
+
//
rasterView->getFrame()->SetFocus();
+
//
rasterView->OnUpdate (rasterView, NULL);
+
//
}
// causes loss of frame in wxGTK
// causes loss of frame in wxGTK
- //pReconDoc->UpdateAllViews (this);
+ pReconDoc->GetFirstView()->GetFrame()->Show(true);
+ pReconDoc->UpdateAllViews ();
// pReconDoc->Activate();
}
// pReconDoc->Activate();
}