X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Ftextprocessing.cpp;h=2a6159109870d8df225813a6692a01bf616b523b;hb=ee9b71949005734012f18251774807c38b989ae2;hp=d979d301b010e14a9f88ed8db8038e4997fc3bfa;hpb=2077fd3163afbf00561d4d4030a087ffded67a81;p=xestiaab%2F.git diff --git a/source/common/textprocessing.cpp b/source/common/textprocessing.cpp index d979d30..2a61591 100644 --- a/source/common/textprocessing.cpp +++ b/source/common/textprocessing.cpp @@ -26,6 +26,8 @@ void EscapeString(wxString *ReceivedString, bool StripQuotes) { + // Escape a string that contains escapable characters. + ReceivedString->Replace(wxT("\\"), wxT("\\\\"), TRUE); ReceivedString->Replace(wxT(","), wxT("\\,"), TRUE); ReceivedString->Replace(wxT(";"), wxT("\\;"), TRUE); @@ -43,6 +45,8 @@ void EscapeString(wxString *ReceivedString, bool StripQuotes) void GetEscapeString(wxTextCtrl *TextCtrl, wxString *ProcessString, bool StripQuotes) { + // Get an escaped string from a wxTextCtrl. + *ProcessString = TextCtrl->GetValue(); EscapeString(ProcessString, StripQuotes); @@ -51,6 +55,8 @@ void GetEscapeString(wxTextCtrl *TextCtrl, wxString *ProcessString, bool StripQu void GetEscapeString(wxComboBox *ComboCtrl, wxString *ProcessString, bool StripQuotes) { + // Get an escaped string from a wxComboBox. + *ProcessString = ComboCtrl->GetValue(); EscapeString(ProcessString, StripQuotes); @@ -59,6 +65,8 @@ void GetEscapeString(wxComboBox *ComboCtrl, wxString *ProcessString, bool StripQ void GetEscapeString(wxChoice *ChoiceCtrl, wxString *ProcessString, bool StripQuotes) { + // Get an escaped string from a wxChoice. + *ProcessString = ChoiceCtrl->GetString(ChoiceCtrl->GetSelection()); EscapeString(ProcessString, StripQuotes); @@ -67,6 +75,8 @@ void GetEscapeString(wxChoice *ChoiceCtrl, wxString *ProcessString, bool StripQu void CaptureString(wxString *ProcessString, bool StripQuotes) { + // Capture a string for processing. + ProcessString->Replace(wxT("\\n"), wxT("\n"), TRUE); ProcessString->Replace(wxT("\\;"), wxT(";"), TRUE); ProcessString->Replace(wxT("\\,"), wxT(","), TRUE); @@ -80,9 +90,24 @@ void CaptureString(wxString *ProcessString, bool StripQuotes) } +void ResetUnusedString(wxString *ProcessString) +{ + + // Reset an unused string. + + ProcessString->Replace(wxT("\\\\"), wxT("\\"), TRUE); + ProcessString->Replace(wxT("\\n"), wxT("\n"), TRUE); + ProcessString->Replace(wxT("\\;"), wxT(";"), TRUE); + ProcessString->Replace(wxT("\\,"), wxT(","), TRUE); + +} + void ConvertToHTML(wxString *ProcessString) { + // Convert string into text that can be used with a + // wxHTMLWindow. + ProcessString->Replace(wxT("&"), wxT("&"), TRUE); ProcessString->Replace(wxT("<"), wxT("<"), TRUE); ProcessString->Replace(wxT(">"), wxT(">"), TRUE); @@ -91,23 +116,41 @@ void ConvertToHTML(wxString *ProcessString) } void DeleteMapDataProcess(int IndexNum, std::map* MapData){ + + // Delete map data (for map). + MapData->erase(IndexNum); + } void DeleteMapDataProcess(int IndexNum, std::map* MapData){ + + // Delete map data (for map). + MapData->erase(IndexNum); + } void DeleteMapDataProcess(int IndexNum, std::map* MapData){ + + // Delete map data (for map). + MapData->erase(IndexNum); + } void DeleteMapDataProcess(int IndexNum, std::map* MapData){ + + // Delete map data (for map). + MapData->erase(IndexNum); + } bool MapDataExists(int *ItemIndex, std::map *MapPtr){ + // Check if map data exists (for map). + if (MapPtr->find(*ItemIndex) == MapPtr->end()){ return FALSE; @@ -122,6 +165,8 @@ bool MapDataExists(int *ItemIndex, std::map *MapPtr){ bool MapDataExists(int *ItemIndex, std::map *MapPtr){ + // Check if map data exists (for map). + if (MapPtr->find(*ItemIndex) == MapPtr->end()){ return FALSE; @@ -134,18 +179,42 @@ bool MapDataExists(int *ItemIndex, std::map *MapPtr){ } -/* -template -void DeleteMapData(ArgMap* ArgMapPtr, Args*... ArgsList){ - - //DeleteMapDataProcess(ArgMapPtr); - - DeleteMapData(ArgsList...); - -} -*/ -/* -void test(int* x) { +wxString OutputText(wxString *TextInput){ + + wxString OutputTextData; + wxString OutputLine; + int CharSeek = 0; + int LineSeek = 0; + int MaxLineSeek = 77; + + for (CharSeek = 0; CharSeek < TextInput->size(); CharSeek++){ + + LineSeek++; + + if (LineSeek == MaxLineSeek){ + + if (TextInput->substr(CharSeek, 1) != "\n"){ + OutputLine += TextInput->substr(CharSeek, 1); + } + OutputLine += "\n"; + OutputTextData += OutputLine; + OutputLine = " "; + LineSeek = 0; + MaxLineSeek = 76; + continue; + + } + + OutputLine += TextInput->substr(CharSeek, 1); + + } -} -*/ \ No newline at end of file + if (OutputLine != " " && OutputLine != " \n"){ + + OutputTextData += OutputLine; + + } + + return OutputTextData; + +} \ No newline at end of file