From 2093dcb9760e9261299ebbab4f8ff203e4d9af77 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 3 Jun 2002 16:57:22 +0000 Subject: [PATCH] r2103: Committing for 3.5.4 --- ChangeLog | 1 + src/graph3dview.cpp | 40 +++++++++++++++++++++++----------------- src/graph3dview.h | 12 ++++++------ src/views.cpp | 4 ++-- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index b59e3e3..d80afd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Jun 1, 2002 Version 3.5.4 * Print version number in log window with About command * Fix problem with captions not showing on some windows. + * Disable status bar on 3d views May 29, 2002 Version 3.5.3 * Added support for g++ 3.04 compiler diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp index 1e9f0bb..a3343ab 100644 --- a/src/graph3dview.cpp +++ b/src/graph3dview.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: graph3dview.cpp,v 1.27 2002/06/03 03:58:07 kevin Exp $ +** $Id: graph3dview.cpp,v 1.28 2002/06/03 16:57: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 @@ -65,7 +65,7 @@ #include #endif -void +inline void Graph3dFileView::intensityToColor (double dIntensity, GLfloat* vecColor) { if (dIntensity < 0 || dIntensity > 1) { @@ -147,11 +147,12 @@ EVT_MENU(GRAPH3D_VIEW_SCALE_FULL, Graph3dFileView::OnScaleFull) END_EVENT_TABLE() Graph3dFileView::Graph3dFileView () - : m_pFileMenu(NULL), m_pViewMenu(NULL), m_pCanvas(NULL), m_pFrame(NULL), + : m_pFileMenu(NULL), m_pViewMenu(NULL), m_pStatusBar(NULL), m_pCanvas(NULL), + m_dXRotate(-180), m_dYRotate(-210), m_dZRotate(195), m_bDoubleBuffer(true), m_bSmooth(true), m_bWireframe(false), - m_bLighting(true), m_bColor(true), m_dXRotate(-180), - m_dYRotate(-210), m_dZRotate(195), m_bColorScaleMinSet(false), - m_bColorScaleMaxSet(false) + m_bLighting(true), m_bColor(true), m_bUseVertexArrays(false), + m_bColorScaleMinSet(false), m_bColorScaleMaxSet(false), + m_pFrame(NULL) {} @@ -167,8 +168,8 @@ Graph3dFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) m_pFrame = CreateChildFrame(doc, this); m_pCanvas = CreateCanvas (m_pFrame); - SetFrame (m_pFrame); m_pFrame->SetClientSize (m_pCanvas->GetBestSize()); + SetFrame (m_pFrame); m_pCanvas->SetClientSize (m_pCanvas->GetBestSize()); m_pFrame->SetTitle("Graph3dFileView"); @@ -192,10 +193,9 @@ Graph3dFileView::CreateCanvas (wxFrame* parent) { Graph3dFileCanvas* pCanvas; - pCanvas = new Graph3dFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), - 0); + pCanvas = new Graph3dFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), 0); - pCanvas->SetBackgroundColour(*wxBLACK); + pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); return pCanvas; @@ -359,7 +359,8 @@ Graph3dFileView::OnProperties (wxCommandEvent& event) { std::ostringstream os; *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; - wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); + wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), + "Imagefile Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); } @@ -368,7 +369,6 @@ Graph3dFileView::OnLighting (wxCommandEvent& event) { m_bLighting = ! m_bLighting; m_pViewMenu->Check (GRAPH3D_VIEW_LIGHTING, m_bLighting); - m_pCanvas->Refresh(); } @@ -403,13 +403,15 @@ Graph3dFileView::OnDraw (wxDC* dc) { if (m_pCanvas) { m_pCanvas->SetCurrent(); - Draw(); + m_pCanvas->SwapBuffers(); + } + + if (m_pStatusBar) { std::ostringstream os; - os << "Xangle=" << m_dXRotate << ", Yangle=" << m_dYRotate << ", Zangle=" - << m_dZRotate; + os << "Xangle=" << m_dXRotate << ", Yangle=" << m_dYRotate + << ", Zangle=" << m_dZRotate; m_pStatusBar->SetStatusText (os.str().c_str()); - m_pCanvas->SwapBuffers(); } } @@ -730,9 +732,13 @@ Graph3dFileView::CreateChildFrame (wxDocument *doc, wxView *view) #endif theApp->setIconForFrame (subframe); +// status bar text not showing tested with enlightenment. disabling for now... +#if 0 m_pStatusBar = new wxStatusBar (subframe, -1); subframe->SetStatusBar (m_pStatusBar); - + m_pStatusBar->Show(true); +#endif + m_pFileMenu = new wxMenu; m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); diff --git a/src/graph3dview.h b/src/graph3dview.h index bcd40ca..ec53d03 100644 --- a/src/graph3dview.h +++ b/src/graph3dview.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: graph3dview.h,v 1.10 2002/06/02 19:01:58 kevin Exp $ +** $Id: graph3dview.h,v 1.11 2002/06/03 16:57: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 @@ -49,15 +49,18 @@ private: wxMenu *m_pViewMenu; wxStatusBar* m_pStatusBar; + Graph3dFileCanvas* m_pCanvas; GLfloat m_dXRotate; GLfloat m_dYRotate; GLfloat m_dZRotate; - bool m_bUseVertexArrays; bool m_bDoubleBuffer; bool m_bSmooth; - bool m_bLighting; bool m_bWireframe; + bool m_bLighting; bool m_bColor; + bool m_bUseVertexArrays; + bool m_bColorScaleMinSet; + bool m_bColorScaleMaxSet; enum { DISPLAYLIST_COLOR = 1, DISPLAYLIST_NO_COLOR = 2, @@ -67,8 +70,6 @@ private: double m_dGraphMax; double m_dColorScaleMin; double m_dColorScaleMax; - bool m_bColorScaleMinSet; - bool m_bColorScaleMaxSet; void Draw(); void DrawSurface(); @@ -76,7 +77,6 @@ private: void InitMaterials(); void InitGL(); - Graph3dFileCanvas* m_pCanvas; Graph3dFileCanvas *CreateCanvas (wxFrame* parent); #if CTSIM_MDI diff --git a/src/views.cpp b/src/views.cpp index 19b0c56..bd54f07 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.159 2002/06/02 23:39:22 kevin Exp $ +** $Id: views.cpp,v 1.160 2002/06/03 16:57: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 @@ -1019,8 +1019,8 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) #if wxUSE_GLCANVAS accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast('3'), IFMENU_IMAGE_CONVERT3D); #endif + wxAcceleratorTable accelTable (iEntry, accelEntries); - subframe->SetAcceleratorTable (accelTable); return subframe; -- 2.34.1