Mercurial > mercurial > hgweb_searcher03.cgi
diff src/param.cpp @ 5:bc2e2b304095
Clean up code.
author | pyon@macmini |
---|---|
date | Sat, 14 Sep 2013 08:54:47 +0900 |
parents | fdba695b99f1 |
children |
line wrap: on
line diff
--- a/src/param.cpp Wed Sep 11 19:09:14 2013 +0900 +++ b/src/param.cpp Sat Sep 14 08:54:47 2013 +0900 @@ -1,5 +1,5 @@ // Filename : param.cpp -// Last Change: 11-Sep-2013. +// Last Change: 13-Sep-2013. // #include "param.h" @@ -157,33 +157,33 @@ m_notebook->AddPage( m_panelold, wxT("旧マークシート"), false ); // Tab 3 : マークシート判定パネル - wxGridSizer* gSizer = new wxGridSizer( 2, 3, 0, 0 ); + wxGridSizer* gSizer = new wxGridSizer( 4, 3, 0, 0 ); - m_textCtrlLMin = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + m_textCtrlLMin = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxTE_RIGHT ); gSizer->Add( m_textCtrlLMin, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 20 ); m_staticTextLen = new wxStaticText( m_paneljudge, wxID_ANY, wxT("< レングス(l) <"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer->Add( m_staticTextLen, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - m_textCtrlLMax = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + m_textCtrlLMax = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxTE_RIGHT ); gSizer->Add( m_textCtrlLMax, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 20 ); - m_textCtrlZMin = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + m_textCtrlZMin = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxTE_RIGHT ); gSizer->Add( m_textCtrlZMin, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 20 ); m_staticTextZ = new wxStaticText( m_paneljudge, wxID_ANY, wxT("< 黒色比率(z) <"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer->Add( m_staticTextZ, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); - m_textCtrlZmax = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); - gSizer->Add( m_textCtrlZmax, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 20 ); - - bSizerTop->Add( m_notebook, 1, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_textCtrlZMax = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxTE_RIGHT ); + gSizer->Add( m_textCtrlZMax, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 20 ); m_paneljudge->SetSizer( gSizer ); m_paneljudge->Layout(); gSizer->Fit( m_paneljudge ); m_notebook->AddPage( m_paneljudge, wxT("マークシート判定"), false ); + bSizerTop->Add( m_notebook, 1, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + // wxBoxSizer* bSizerBtn = new wxBoxSizer( wxHORIZONTAL ); @@ -215,6 +215,7 @@ void ParamDialog::OnSet( wxCommandEvent& WXUNUSED(event) ) { wxString buf; + buf = m_textCtrlM1x->GetValue(); buf.ToLong( &x, 10 ); buf = m_textCtrlM1y->GetValue(); buf.ToLong( &y, 10 ); buf = m_textCtrlM1w->GetValue(); buf.ToLong( &w, 10 ); @@ -257,6 +258,11 @@ m_mask3old.SetPosition( wxPoint( x, y ) ); m_mask3old.SetSize( wxSize( w, h ) ); + buf = m_textCtrlLMin->GetValue(); buf.ToLong( &m_lmin, 10 ); + buf = m_textCtrlLMax->GetValue(); buf.ToLong( &m_lmax, 10 ); + buf = m_textCtrlZMin->GetValue(); buf.ToDouble( &m_zmin ); + buf = m_textCtrlZMax->GetValue(); buf.ToDouble( &m_zmax ); + if ( IsModal() ) EndModal( wxID_OK ); else { @@ -292,5 +298,10 @@ m_textCtrlM3yOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetY() ) ); m_textCtrlM3wOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetWidth() ) ); m_textCtrlM3hOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetHeight() ) ); + + m_textCtrlLMin->SetValue( wxString::Format( wxT("%d"), m_lmin ) ); + m_textCtrlLMax->SetValue( wxString::Format( wxT("%d"), m_lmax ) ); + m_textCtrlZMin->SetValue( wxString::Format( wxT("%f"), m_zmin ) ); + m_textCtrlZMax->SetValue( wxString::Format( wxT("%f"), m_zmax ) ); }