diff src/param.cpp @ 6:9c85d71cad7c

implement drag&drop.
author pyon@macmini
date Tue, 18 Oct 2011 22:43:46 +0900
parents 52697c869ce8
children
line wrap: on
line diff
--- a/src/param.cpp	Tue Oct 18 07:53:48 2011 +0900
+++ b/src/param.cpp	Tue Oct 18 22:43:46 2011 +0900
@@ -13,22 +13,22 @@
 	wxBoxSizer* bSizer = new wxBoxSizer( wxVERTICAL );
 	wxGridSizer* gSizer = new wxGridSizer( 2, 3, 0, 0 );
 	
-	m_textCtrlLMin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_textCtrlLMin, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLeft, 20 );
+	m_textCtrlLMin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT );
+	gSizer->Add( m_textCtrlLMin, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 20 );
 	
 	m_staticTextLen = new wxStaticText( this, wxID_ANY, wxT("< レングス(l) <"), wxDefaultPosition, wxDefaultSize, 0 );
 	gSizer->Add( m_staticTextLen, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
-	m_textCtrlLMax = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_textCtrlLMax = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT );
 	gSizer->Add( m_textCtrlLMax, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 20 );
 	
-	m_textCtrlZMin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_textCtrlZMin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT );
 	gSizer->Add( m_textCtrlZMin, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 	
 	m_staticTextZ = new wxStaticText( this, wxID_ANY, wxT("< 黒色比率(z) <"), wxDefaultPosition, wxDefaultSize, 0 );
 	gSizer->Add( m_staticTextZ, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_textCtrlZmax = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_textCtrlZmax = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT );
 	gSizer->Add( m_textCtrlZmax, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 20 );
 	
 	m_staticTextlDummy = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
@@ -48,7 +48,7 @@
 	
 	this->Centre( wxBOTH );
 
-    GetParam();
+    ReadParam();
 }
 
 // destructor
@@ -60,17 +60,20 @@
 END_EVENT_TABLE()
 
 /* 現在の設定を読込み */
-void ParamDialog::GetParam(void)
+void ParamDialog::ReadParam(void)
 {
-    float zmin = 0.095713;
-    float zmax = 0.108600;
-
-    float lmin = 2072393;
-    float lmax = 2346082;
-
     m_textCtrlLMin->SetValue( wxGetApp().lmin );
     m_textCtrlLMax->SetValue( wxGetApp().lmax );
-    //m_textCtrlZMin->SetValue( wxString::Format(wxT("%l"),wxGetApp().zmin) );
-    //m_textCtrlZmax->SetValue( wxString::Format(wxT("%l"),wxGetApp().zmax) );
+    m_textCtrlZMin->SetValue( wxGetApp().zmin );
+    m_textCtrlZmax->SetValue( wxGetApp().zmax );
 }
 
+/* 新しいパラメータ値の受渡し */
+void ParamDialog::NewParam( wxString& lmin, wxString& lmax, wxString& zmin, wxString& zmax )
+{
+    lmin = m_textCtrlLMin->GetValue();
+    lmax = m_textCtrlLMax->GetValue();
+    zmin = m_textCtrlZMin->GetValue();
+    zmax = m_textCtrlZmax->GetValue();
+}
+