mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Remove time-consuming reparsing of the line in VisualTool::SetOverride

Browse source 
Originally committed to SVN as r4430.
This commit is contained in:
Thomas Goyne 2010-06-04 03:08:04 +00:00
parent 88f6bca9d7
commit 38d922c57a
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/src/ass_dialogue.h
View file

@ -177,6 +177,7 @@ public:
ASS_BlockType GetType() { return BLOCK_OVERRIDE; } ASS_BlockType GetType() { return BLOCK_OVERRIDE; }
wxString GetText(); wxString GetText();
void ParseTags(); // Parses tags void ParseTags(); // Parses tags
void AddTag(wxString const& tag);
/// Type of callback function passed to ProcessParameters /// Type of callback function passed to ProcessParameters
typedef void (*ProcessParametersCallback)(wxString,int,AssOverrideParameter*,void *); typedef void (*ProcessParametersCallback)(wxString,int,AssOverrideParameter*,void *);

5
aegisub/src/ass_override.cpp
View file

@ -131,6 +131,11 @@ void AssDialogueBlockOverride::ParseTags () {
curTag = _T("\\"); curTag = _T("\\");
} }
} }
void AssDialogueBlockOverride::AddTag(wxString const& tag) {
AssOverrideTag *newTag = new AssOverrideTag;
newTag->SetText(tag);
Tags.push_back(newTag);
}
/// @brief Get Text representation /// @brief Get Text representation
/// @return /// @return

11
aegisub/src/visual_tool.cpp
View file

@ -776,23 +776,22 @@ void VisualTool<FeatureType>::SetOverride(AssDialogue* line, wxString tag, wxStr
// Get current block as plain or override // Get current block as plain or override
AssDialogueBlockPlain *plain = dynamic_cast<AssDialogueBlockPlain*>(block); AssDialogueBlockPlain *plain = dynamic_cast<AssDialogueBlockPlain*>(block);
AssDialogueBlockOverride *ovr = dynamic_cast<AssDialogueBlockOverride*>(block); AssDialogueBlockOverride *ovr = dynamic_cast<AssDialogueBlockOverride*>(block);
assert(dynamic_cast<AssDialogueBlockDrawing*>(block) == NULL);
if (plain) { if (plain) {
line->Text = L"{" + insert + L"}" + line->Text; line->Text = L"{" + insert + L"}" + line->Text;
} }
else if (ovr) { else if (ovr) {
ovr->text += insert;
ovr->ParseTags();
// Remove old of same // Remove old of same
for (size_t i = 0; i < ovr->Tags.size() - 1; i++) { for (size_t i = 0; i < ovr->Tags.size(); i++) {
wxString name = ovr->Tags.at(i)->Name; wxString name = ovr->Tags[i]->Name;
if (tag == name || removeTag == name) { if (tag == name || removeTag == name) {
delete ovr->Tags.at(i); delete ovr->Tags[i];
ovr->Tags.erase(ovr->Tags.begin() + i); ovr->Tags.erase(ovr->Tags.begin() + i);
i--; i--;
} }
} }
ovr->AddTag(insert);
line->UpdateText(); line->UpdateText();
} }