X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctgraphics%2Fdlgezplot.cpp;h=4dbc6fee8ecf0675f9254c9d4e6beef221009281;hp=ebfab04a961e679b97f58fdbe00360e89c16b9b5;hb=4a5567b8df652cc3168bb9d439bc23f973a2b5ea;hpb=1be55ea0c82499e7e007fc0c1c3184af97db3a71 diff --git a/libctgraphics/dlgezplot.cpp b/libctgraphics/dlgezplot.cpp index ebfab04..4dbc6fe 100644 --- a/libctgraphics/dlgezplot.cpp +++ b/libctgraphics/dlgezplot.cpp @@ -7,9 +7,9 @@ ** Date Started: Jan 2001 ** ** This is part of the CTSim program -** Copyright (C) 1983-2001 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dlgezplot.cpp,v 1.2 2001/01/13 05:01:15 kevin Exp $ +** $Id: dlgezplot.cpp,v 1.4 2001/01/27 21:02:20 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,8 +70,8 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(EZPlotControl, wxPanel) -EZPlotControl::EZPlotControl (wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, - const wxValidator& validator, const wxString& name) +EZPlotControl::EZPlotControl (wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, + long style, const wxValidator& validator, const wxString& name) : m_pEZPlot(0), m_pSGPDriver(0), m_pSGP(0), m_pDC(0) { Create(parent, id, pos, size, style, name); @@ -103,6 +103,7 @@ EZPlotControl::OnPaint (wxPaintEvent& event) m_pSGPDriver = new SGPDriver (&dc, m_iClientX, m_iClientY); m_pSGP = new SGP (*m_pSGPDriver); m_pSGP->setTextPointSize(10); +// m_pSGP->setViewport (0, 0, 1., 0.5); // for debugging testing only if (m_pEZPlot && m_pSGP) { m_pSGP->eraseWindow(); m_pEZPlot->plot (m_pSGP); @@ -110,7 +111,7 @@ EZPlotControl::OnPaint (wxPaintEvent& event) } -EZPlotDialog::EZPlotDialog (wxWindow *parent) +EZPlotDialog::EZPlotDialog (wxWindow *parent, bool bCancelButton) : wxDialog((parent ? parent : theApp->getMainFrame()), -1, wxString("EZPlot"), wxDefaultPosition, wxDefaultSize, wxDIALOG_MODAL), m_parentTop(0) { @@ -126,11 +127,12 @@ EZPlotDialog::EZPlotDialog (wxWindow *parent) pTopSizer->Add (m_pEZPlotCtrl = new EZPlotControl (this), 0, wxALIGN_CENTER | wxALL, 5); wxBoxSizer* pButtonSizer = new wxBoxSizer (wxHORIZONTAL); - wxButton* pButtonOk = new wxButton (this, wxID_OK, "Okay"); - wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL, "Cancel"); + wxButton* pButtonOk = new wxButton (this, wxID_OK, "Ok"); pButtonSizer->Add (pButtonOk, 0, wxEXPAND | wxALL, 10); - pButtonSizer->Add (pButtonCancel, 0, wxEXPAND | wxALL, 10); - + if (bCancelButton) { + wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL, "Cancel"); + pButtonSizer->Add (pButtonCancel, 0, wxEXPAND | wxALL, 10); + } pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER); SetAutoLayout (true);