Mercurial > mercurial > hgweb_searcher03.cgi

comparison src/param.cpp @ 5:bc2e2b304095

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up code.
author pyon@macmini
date Sat, 14 Sep 2013 08:54:47 +0900
parents fdba695b99f1
children
comparison
equal deleted inserted replaced
4:fdba695b99f1 5:bc2e2b304095
1 // Filename : param.cpp 1 // Filename : param.cpp
2 // Last Change: 11-Sep-2013. 2 // Last Change: 13-Sep-2013.
3 // 3 //
4 4
5 #include "param.h" 5 #include "param.h"
6 6
7 ParamDialog::ParamDialog( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) 7 ParamDialog::ParamDialog( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style )
155 m_panelold->Layout(); 155 m_panelold->Layout();
156 fgSizerOld->Fit( m_panelold ); 156 fgSizerOld->Fit( m_panelold );
157 m_notebook->AddPage( m_panelold, wxT("旧マークシート"), false ); 157 m_notebook->AddPage( m_panelold, wxT("旧マークシート"), false );
158 158
159 // Tab 3 : マークシート判定パネル 159 // Tab 3 : マークシート判定パネル
160 wxGridSizer* gSizer = new wxGridSizer( 2, 3, 0, 0 ); 160 wxGridSizer* gSizer = new wxGridSizer( 4, 3, 0, 0 );
161 161
162 m_textCtrlLMin = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); 162 m_textCtrlLMin = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxTE_RIGHT );
163 gSizer->Add( m_textCtrlLMin, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 20 ); 163 gSizer->Add( m_textCtrlLMin, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 20 );
164 164
165 m_staticTextLen = new wxStaticText( m_paneljudge, wxID_ANY, wxT("< レングス(l) <"), wxDefaultPosition, wxDefaultSize, 0 ); 165 m_staticTextLen = new wxStaticText( m_paneljudge, wxID_ANY, wxT("< レングス(l) <"), wxDefaultPosition, wxDefaultSize, 0 );
166 gSizer->Add( m_staticTextLen, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); 166 gSizer->Add( m_staticTextLen, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
167 167
168 m_textCtrlLMax = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); 168 m_textCtrlLMax = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxTE_RIGHT );
169 gSizer->Add( m_textCtrlLMax, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 20 ); 169 gSizer->Add( m_textCtrlLMax, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 20 );
170 170
171 m_textCtrlZMin = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); 171 m_textCtrlZMin = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxTE_RIGHT );
172 gSizer->Add( m_textCtrlZMin, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 20 ); 172 gSizer->Add( m_textCtrlZMin, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
173 173
174 m_staticTextZ = new wxStaticText( m_paneljudge, wxID_ANY, wxT("< 黒色比率(z) <"), wxDefaultPosition, wxDefaultSize, 0 ); 174 m_staticTextZ = new wxStaticText( m_paneljudge, wxID_ANY, wxT("< 黒色比率(z) <"), wxDefaultPosition, wxDefaultSize, 0 );
175 gSizer->Add( m_staticTextZ, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); 175 gSizer->Add( m_staticTextZ, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
176 176
177 m_textCtrlZmax = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); 177 m_textCtrlZMax = new wxTextCtrl( m_paneljudge, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxTE_RIGHT );
178 gSizer->Add( m_textCtrlZmax, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 20 ); 178 gSizer->Add( m_textCtrlZMax, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 20 );
179
180 bSizerTop->Add( m_notebook, 1, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
181 179
182 m_paneljudge->SetSizer( gSizer ); 180 m_paneljudge->SetSizer( gSizer );
183 m_paneljudge->Layout(); 181 m_paneljudge->Layout();
184 gSizer->Fit( m_paneljudge ); 182 gSizer->Fit( m_paneljudge );
185 m_notebook->AddPage( m_paneljudge, wxT("マークシート判定"), false ); 183 m_notebook->AddPage( m_paneljudge, wxT("マークシート判定"), false );
186 184
185 bSizerTop->Add( m_notebook, 1, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
186
187 // 187 //
188 wxBoxSizer* bSizerBtn = new wxBoxSizer( wxHORIZONTAL ); 188 wxBoxSizer* bSizerBtn = new wxBoxSizer( wxHORIZONTAL );
189 189
190 m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("キャンセル"), wxDefaultPosition, wxDefaultSize, 0 ); 190 m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("キャンセル"), wxDefaultPosition, wxDefaultSize, 0 );
191 m_buttonCancel->SetDefault(); 191 m_buttonCancel->SetDefault();
213 213
214 // Event Handlers & Functions 214 // Event Handlers & Functions
215 void ParamDialog::OnSet( wxCommandEvent& WXUNUSED(event) ) 215 void ParamDialog::OnSet( wxCommandEvent& WXUNUSED(event) )
216 { 216 {
217 wxString buf; 217 wxString buf;
218
218 buf = m_textCtrlM1x->GetValue(); buf.ToLong( &x, 10 ); 219 buf = m_textCtrlM1x->GetValue(); buf.ToLong( &x, 10 );
219 buf = m_textCtrlM1y->GetValue(); buf.ToLong( &y, 10 ); 220 buf = m_textCtrlM1y->GetValue(); buf.ToLong( &y, 10 );
220 buf = m_textCtrlM1w->GetValue(); buf.ToLong( &w, 10 ); 221 buf = m_textCtrlM1w->GetValue(); buf.ToLong( &w, 10 );
221 buf = m_textCtrlM1h->GetValue(); buf.ToLong( &h, 10 ); 222 buf = m_textCtrlM1h->GetValue(); buf.ToLong( &h, 10 );
222 m_mask1.SetPosition( wxPoint( x, y ) ); 223 m_mask1.SetPosition( wxPoint( x, y ) );
254 buf = m_textCtrlM3yOld->GetValue(); buf.ToLong( &y, 10 ); 255 buf = m_textCtrlM3yOld->GetValue(); buf.ToLong( &y, 10 );
255 buf = m_textCtrlM3wOld->GetValue(); buf.ToLong( &w, 10 ); 256 buf = m_textCtrlM3wOld->GetValue(); buf.ToLong( &w, 10 );
256 buf = m_textCtrlM3hOld->GetValue(); buf.ToLong( &h, 10 ); 257 buf = m_textCtrlM3hOld->GetValue(); buf.ToLong( &h, 10 );
257 m_mask3old.SetPosition( wxPoint( x, y ) ); 258 m_mask3old.SetPosition( wxPoint( x, y ) );
258 m_mask3old.SetSize( wxSize( w, h ) ); 259 m_mask3old.SetSize( wxSize( w, h ) );
260
261 buf = m_textCtrlLMin->GetValue(); buf.ToLong( &m_lmin, 10 );
262 buf = m_textCtrlLMax->GetValue(); buf.ToLong( &m_lmax, 10 );
263 buf = m_textCtrlZMin->GetValue(); buf.ToDouble( &m_zmin );
264 buf = m_textCtrlZMax->GetValue(); buf.ToDouble( &m_zmax );
259 265
260 if ( IsModal() ) 266 if ( IsModal() )
261 EndModal( wxID_OK ); 267 EndModal( wxID_OK );
262 else { 268 else {
263 SetReturnCode( wxID_OK ); 269 SetReturnCode( wxID_OK );
290 m_textCtrlM2hOld->SetValue( wxString::Format( wxT("%d"), m_mask2old.GetHeight() ) ); 296 m_textCtrlM2hOld->SetValue( wxString::Format( wxT("%d"), m_mask2old.GetHeight() ) );
291 m_textCtrlM3xOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetX() ) ); 297 m_textCtrlM3xOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetX() ) );
292 m_textCtrlM3yOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetY() ) ); 298 m_textCtrlM3yOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetY() ) );
293 m_textCtrlM3wOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetWidth() ) ); 299 m_textCtrlM3wOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetWidth() ) );
294 m_textCtrlM3hOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetHeight() ) ); 300 m_textCtrlM3hOld->SetValue( wxString::Format( wxT("%d"), m_mask3old.GetHeight() ) );
301
302 m_textCtrlLMin->SetValue( wxString::Format( wxT("%d"), m_lmin ) );
303 m_textCtrlLMax->SetValue( wxString::Format( wxT("%d"), m_lmax ) );
304 m_textCtrlZMin->SetValue( wxString::Format( wxT("%f"), m_zmin ) );
305 m_textCtrlZMax->SetValue( wxString::Format( wxT("%f"), m_zmax ) );
295 } 306 }
296 307