X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxEditFieldsPanel.cpp;h=81d7ae0a2c5769fa22b7ffa8957d667cc9188af7;hb=e4c4c1a9a170f8eb89f8e8642a510c4499465280;hp=aa48137b812eac39b68b8c799e4c0a2e15fd4eec;hpb=d87a9f8f86d472c5ecaed70fa83f1e8a1024a450;p=creaImageIO.git

diff --git a/src2/creaImageIOWxEditFieldsPanel.cpp b/src2/creaImageIOWxEditFieldsPanel.cpp
index aa48137..81d7ae0 100644
--- a/src2/creaImageIOWxEditFieldsPanel.cpp
+++ b/src2/creaImageIOWxEditFieldsPanel.cpp
@@ -4,45 +4,45 @@
 //using namespace tree;
 namespace creaImageIO
 {
-	const int  ID_COMBO             = 140;
+   const int  ID_COMBO             = 140;
   // CTor
-	WxEditFieldsPanel::WxEditFieldsPanel(wxWindow *parent, wxDialog* dial, WxGimmickView* view, tree::Node* nod, 
-		const std::vector<std::string> name,
-		const std::vector<std::string> key)
+   WxEditFieldsPanel::WxEditFieldsPanel(wxWindow *parent, wxDialog* dial, WxGimmickView* view, tree::Node* nod, 
+      const std::vector<std::string> name,
+      const std::vector<std::string> key)
  :   wxPanel( parent, 
-		  -1, wxDefaultPosition, 
-		  wxDefaultSize,
-		  wxRESIZE_BORDER | 
-	      wxSYSTEM_MENU  |
-		  wxCLOSE_BOX |
-		  wxMAXIMIZE_BOX | 
-		  wxMINIMIZE_BOX | 
-		  wxCAPTION  
-	       ), 	
-		   dialog(dial),
-		   node (nod), 
-		   names(name), 
-		   keys(key),
-		   mView(view)
+        -1, wxDefaultPosition, 
+        wxDefaultSize,
+        wxRESIZE_BORDER | 
+        wxSYSTEM_MENU  |
+        wxCLOSE_BOX |
+        wxMAXIMIZE_BOX | 
+        wxMINIMIZE_BOX | 
+        wxCAPTION  
+          ), 
+        dialog(dial),
+        node (nod), 
+        names(name), 
+        keys(key),
+        mView(view)
   {
     GimmickDebugMessage(1,"WxCustomizeConfigPanel::WxCustomizeConfigPanel"
-			<<std::endl);
+                       <<std::endl);
 	wxStaticText * cp=new wxStaticText(this,-1,_T(" Attribute to change: "), wxPoint(5,10));
 	wxArrayString as;
 	std::vector<std::string>::const_iterator it;
 	for(it=names.begin();it!=names.end();++it)
 	{
-		as.Add(*it);
+           as.Add(crea::std2wx(*it));
 	}
-	attributes=new wxComboBox(this, ID_COMBO,names.front(),wxPoint(110, 10),wxDefaultSize,as);
+	attributes=new wxComboBox(this, ID_COMBO, crea::std2wx(names.front()), wxPoint(110, 10), wxDefaultSize,as);
 	std::string val=node->GetAttribute(keys[0]);
 	if(val.compare("")==0){val="?";}
 
-	wxStaticText * av=new wxStaticText(this,-1,_T(" Actual Value: "), wxPoint(5,40));
-	actualVal=new wxStaticText(this,-1,_T(val), wxPoint(110,40));
+	wxStaticText * av=new wxStaticText(this,-1,_T(" Current Value: "), wxPoint(5,40));
+	actualVal=new wxStaticText(this,-1,crea::std2wx(val), wxPoint(110,40));
 
 	wxStaticText * nv=new wxStaticText(this,-1,_T(" New Value: "), wxPoint(5,70));
-	newVal=new wxTextCtrl(this, wxID_ANY, _T(val), wxPoint(110,70), wxSize(220,20));
+	newVal=new wxTextCtrl(this, wxID_ANY, crea::std2wx(val), wxPoint(110,70), wxSize(220,20));
 
 	wxButton *save = new wxButton(this,wxID_ANY,_T("Save Changes"), wxPoint(5,100) );
 	Connect( save->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxEditFieldsPanel::OnEdit ); 
@@ -54,13 +54,18 @@ namespace creaImageIO
   WxEditFieldsPanel::~WxEditFieldsPanel()
   {
     GimmickDebugMessage(1,"WxEditFieldsPanel::~WxEditFieldsPanel"
-			<<std::endl);
+                 <<std::endl);
   }
 
   void WxEditFieldsPanel::OnEdit(wxCommandEvent& event)
   {
 	  std::string val=crea::wx2std(newVal->GetValue());
-	  mView->OnFieldsEdited(node,names[attributes->GetSelection()],keys[attributes->GetSelection()],val);
+	  int sel=attributes->GetSelection();
+	  if(sel==-1)
+	  {
+	     sel=0;
+	  }
+	  mView->OnFieldsEdited(node,names[sel],keys[sel],val);
 	  dialog->Destroy();
   }
 
@@ -80,6 +85,3 @@ END_EVENT_TABLE()
 
 } // EO namespace creaImageIO
 
-
-
-