From 76f7c62a930e60f9a569ede29b9546a179875d2c Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Tue, 22 Sep 2009 14:30:57 +0000 Subject: [PATCH] Fix _T(... --- src2/creaImageIOWxDescriptorPanel.cpp | 84 +++++++++++++-------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src2/creaImageIOWxDescriptorPanel.cpp b/src2/creaImageIOWxDescriptorPanel.cpp index 4b826e9..266eabe 100644 --- a/src2/creaImageIOWxDescriptorPanel.cpp +++ b/src2/creaImageIOWxDescriptorPanel.cpp @@ -3,7 +3,6 @@ #include #include - namespace creaImageIO { // CTor @@ -17,7 +16,7 @@ namespace creaImageIO <GetId(), wxEVT_COMMAND_TEXT_UPDATED , (wxObjectEventFunction) &WxDescriptorPanel::OnDicomAttribute ); wxStaticText * EL=new wxStaticText(this,-1,_T(" DICOM Element: "), wxPoint(140,110)); @@ -84,7 +83,7 @@ namespace creaImageIO wxButton *Cancel = new wxButton(this, wxID_CANCEL,_T("CANCEL"), wxPoint(250,480) ); // Connect( Cancel->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxCloseEvent) &wxWindow::Close ); - Layout(); + Layout(); CreateDescriptor(0); } @@ -106,12 +105,13 @@ namespace creaImageIO std::string name_att; if (AttributeCombo->GetSelection() == 0) { - name_att = "D" + GRCtrl->GetValue() + "_" + ELCtrl->GetValue(); + name_att = "D" + crea::wx2std(GRCtrl->GetValue()) + "_" + crea::wx2std(ELCtrl->GetValue()); } else - { wxString wd = AttributeCombo->GetValue(); - std::string st = crea::wx2std(wd); - name_att = OwnAttribute(st); + { + wxString wd = AttributeCombo->GetValue(); + std::string st = crea::wx2std(wd); + name_att = OwnAttribute(st); } onAddAttribute(crea::wx2std(AttributeCombo->GetValue()), name_att); } @@ -130,7 +130,7 @@ namespace creaImageIO } else { - if( !att.empty() ) + if( !att.empty() ) { // Find Name of level if(level.empty()) @@ -145,20 +145,20 @@ namespace creaImageIO else { ResultCtrl->SetInsertionPoint(InsertPt); - for (int i = 1; i<=lv;i++) + for (int i = 1; i<=lv;i++) { - ResultCtrl->WriteText(" "); + ResultCtrl->WriteText(_T(" ")); } - ResultCtrl->WriteText("| - "); - ResultCtrl->WriteText(att); + ResultCtrl->WriteText(_T("| - ")); + ResultCtrl->WriteText(crea::std2wx(att)); wxTextAttr ResultAttr(ResultCtrl->GetDefaultStyle()); ResultAttr.SetTextColour(*wxWHITE); ResultCtrl->SetDefaultStyle(ResultAttr); std::string text = " "; - ResultCtrl->WriteText(" " + name_att); + ResultCtrl->WriteText(crea::std2wx(" " + name_att)); ResultAttr.SetTextColour(*wxBLACK); ResultCtrl->SetDefaultStyle(ResultAttr); - ResultCtrl->WriteText("\n"); + ResultCtrl->WriteText(_T("\n")); } InsertPt = ResultCtrl->GetInsertionPoint(); } @@ -185,7 +185,7 @@ namespace creaImageIO ////////////////////////////////////////////////// void WxDescriptorPanel::onAddLevel(const std::string &level) { - if(addLevel(crea::wx2std(level))) + if(addLevel(level)) { wxMessageBox(_T("Level already used"),crea::std2wx(("WARNING")),wxOK,this); return; @@ -195,24 +195,24 @@ namespace creaImageIO ResultCtrl->SetInsertionPoint(InsertPt); for (int i = 1; iWriteText(" "); + ResultCtrl->WriteText(_T(" ")); } if(lv>1) - { ResultCtrl->WriteText("| \n"); + { ResultCtrl->WriteText(_T("| \n")); for (int i = 1; iWriteText(" "); + ResultCtrl->WriteText(_T(" ")); } - ResultCtrl->WriteText("|_"); + ResultCtrl->WriteText(_T("|_")); } wxTextAttr ResultAttr(ResultCtrl->GetDefaultStyle()); ResultAttr.SetTextColour(*wxRED); ResultCtrl->SetDefaultStyle(ResultAttr); - ResultCtrl->WriteText(level); + ResultCtrl->WriteText(crea::std2wx(level)); ResultAttr.SetTextColour(*wxBLACK); ResultCtrl->SetDefaultStyle(ResultAttr); - ResultCtrl->WriteText("\n"); + ResultCtrl->WriteText(_T("\n")); InsertPt = ResultCtrl->GetInsertionPoint(); } @@ -302,7 +302,7 @@ namespace creaImageIO } else { - level_pos_start += 2; + level_pos_start += 2; } std::string::size_type level_pos_end = tx.find_first_of("\n",level_pos_start); @@ -333,7 +333,7 @@ namespace creaImageIO else { wxString text = ResultCtrl->GetLineText(line); - if ( text.Find("|_") == -1) + if ( text.Find(_T("|_")) == -1) { std::string level = findLevel(); // find GR and EL values to remove @@ -345,7 +345,7 @@ namespace creaImageIO else { RemoveLevel(crea::wx2std(text.AfterFirst('_'))); - lv = text.Find("|")/3; + lv = text.Find(_T("|"))/3; pos_start= ResultCtrl->XYToPosition(0,line-1); ResultCtrl->SetInsertionPointEnd(); pos_end = ResultCtrl->GetInsertionPoint(); @@ -354,10 +354,10 @@ namespace creaImageIO } } - ////////////////////////////////////////////////////// - // create a descriptor structure // - // @param name : level's name to add // - // @return : boolean result // + ////////////////////////////////////////////// + // create a descriptor structure // + // @param name : level's name to add // + // @return : boolean result // ////////////////////////////////////////////////// void WxDescriptorPanel::CreateDescriptor(int type) { @@ -525,9 +525,9 @@ namespace creaImageIO } ////////////////////////////////////////////////// - // create a new descriptor // - // @param event : WxEvent // - // @return : - // + // create a new descriptor // + // @param event : WxEvent // + // @return : - // ////////////////////////////////////////////////// void WxDescriptorPanel::OnNew(wxCommandEvent &Event) { @@ -538,9 +538,9 @@ namespace creaImageIO } ////////////////////////////////////////////////// - // Load a descriptor file // - // @param event : WxEvent // - // @return : - // + // Load a descriptor file // + // @param event : WxEvent // + // @return : - // ////////////////////////////////////////////////// void WxDescriptorPanel::OnLoad(wxCommandEvent &Event) { @@ -568,7 +568,7 @@ namespace creaImageIO ////////////////////////////////////////////////// // Save a descriptor // // @param event : WxEvent // - // @return : - // + // @return : - // ////////////////////////////////////////////////// void WxDescriptorPanel::OnOK(wxCommandEvent &Event) { @@ -578,8 +578,8 @@ namespace creaImageIO ///////////////////////////////////////////////////// // Save a descriptor and apply it (create a new DB// - // @param event : WxEvent // - // @return : - // + // @param event : WxEvent // + // @return : - // ///////////////////////////////////////////////////// void WxDescriptorPanel::OnApply(wxCommandEvent &Event) { @@ -615,9 +615,9 @@ namespace creaImageIO } /////////////////////////////////////////////////////// - // Cancel action // + // Cancel action // // @param event : WxEvent // - // @return : - // + // @return : - // /////////////////////////////////////////////////////// void WxDescriptorPanel::OnCancel(wxCommandEvent& event) @@ -626,8 +626,8 @@ namespace creaImageIO /////////////////////////////////////////////////////// // create a descriptor file // - // @param - : // - // @return : - // + // @param - : // + // @return : - // /////////////////////////////////////////////////////// void WxDescriptorPanel::createDescriptorFile() { -- 2.45.0