--- a/src/param.cpp	Sun Oct 16 16:21:33 2011 +0900
+++ b/src/param.cpp	Tue Oct 18 07:53:48 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : param.cpp
-// Last Change: 15-Oct-2011.
+// Last Change: 18-Oct-2011.
 //
 
 #include "main.h"
@@ -11,35 +11,34 @@
     this->SetBackgroundColour( wxColour(wxT("WHEAT")) );
 
 	wxBoxSizer* bSizer = new wxBoxSizer( wxVERTICAL );
-	
 	wxGridSizer* gSizer = new wxGridSizer( 2, 3, 0, 0 );
 	
-	m_textCtrlLenMIn = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_textCtrlLenMIn, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALIGN_RIGHT|wxALIGN_TOP, 20 );
+	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_staticTextLen = new wxStaticText( this, wxID_ANY, wxT("< レングス <"), wxDefaultPosition, wxDefaultSize, 0 );
+	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_textCtrlLenMax = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_textCtrlLenMax, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlLMax = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer->Add( m_textCtrlLMax, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 20 );
 	
-	m_textCtrlBMin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_textCtrlBMin, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlZMin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer->Add( m_textCtrlZMin, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 	
-	m_staticTextBlack = new wxStaticText( this, wxID_ANY, wxT("< 黒色比率 <"), wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_staticTextBlack, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	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_textCtrlBmax = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_textCtrlBmax, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlZmax = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer->Add( m_textCtrlZmax, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 20 );
 	
 	m_staticTextlDummy = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_staticTextlDummy, 0, wxALL, 5 );
+	gSizer->Add( m_staticTextlDummy, 0, wxALL, 5 ); // dummy
 	
 	m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("キャンセル"), wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_buttonCancel, 0, wxALL, 5 );
+	gSizer->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 10 );
 	
-	m_buttonSave = new wxButton( this, ID_BUTTONSAVE, wxT("設定保存"), wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer->Add( m_buttonSave, 0, wxALIGN_BOTTOM|wxALIGN_TOP, 10 );
+	m_buttonSave = new wxButton( this, wxID_OK, wxT("設定保存"), wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer->Add( m_buttonSave, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 10 );
 	
 	bSizer->Add( gSizer, 0, 0, 20 );
 	
@@ -58,15 +57,20 @@
 }
 // Event Table
 BEGIN_EVENT_TABLE( ParamDialog, wxDialog )
-    EVT_BUTTON( ID_BUTTONSAVE,  ParamDialog::SaveParam )
 END_EVENT_TABLE()
 
 /* 現在の設定を読込み */
 void ParamDialog::GetParam(void)
 {
-}
-/* 設定を保存 */
-void ParamDialog::SaveParam(wxCommandEvent& WXUNUSED(event))
-{
+    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) );
 }