Timing Post-Processor can now be restricted to selection.

Originally committed to SVN as r743.

aegisub/base_grid.h

@@ -101,7 +101,7 @@ public:
 
 	void SelectRow(int row, bool addToSelected = false, bool select=true);
 	void ClearSelection();
-	bool IsInSelection(int row, int col) const;
+	bool IsInSelection(int row, int col=0) const;
 	bool IsDisplayed(AssDialogue *line);
 	int GetNumberSelection();
 	int GetFirstSelRow();

aegisub/changelog.txt

@@ -83,6 +83,7 @@ Please visit http://aegisub.net to download latest version
 - Added support for reading v4.00++ (ASS2) files. (AMZ)
 - Changes to text will no longer be discarded when you commit timing in the audio display and vice-versa. (AMZ)
 - Fixed glitches related to the Duration time edit box. (AMZ)
+- Timing Post-Processor can now be restricted to selection. (AMZ)
 
 
 = 1.10 beta - 2006.08.07 ===========================

aegisub/dialog_timing_processor.cpp

@@ -63,6 +63,12 @@ DialogTimingProcessor::DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *_gr
 	thresEndAfter = Options.AsText(_T("Timing processor key end after thres"));
 	adjsThresTime = Options.AsText(_T("Timing processor adjascent thres"));
 
+	// Options box
+	wxSizer *optionsSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Options"));
+	onlySelection = new wxCheckBox(this,-1,_("Affect selection only"));
+	onlySelection->SetValue(Options.AsBool(_T("Timing processor Only Selection")));
+	optionsSizer->Add(onlySelection,1,wxALL,0);
+
 	// Lead-in/out box
 	wxSizer *LeadSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Lead-in/Lead-out"));
 	hasLeadIn = new wxCheckBox(this,CHECK_ENABLE_LEADIN,_("Add lead in:"));
@@ -143,6 +149,7 @@ DialogTimingProcessor::DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *_gr
 
 	// Right Sizer
 	wxSizer *RightSizer = new wxBoxSizer(wxVERTICAL);
+	RightSizer->Add(optionsSizer,0,wxBOTTOM|wxEXPAND,5);
 	RightSizer->Add(LeadSizer,0,wxBOTTOM|wxEXPAND,5);
 	RightSizer->Add(AdjascentSizer,0,wxBOTTOM|wxEXPAND,5);
 	RightSizer->Add(KeyframesSizer,0,wxBOTTOM|wxEXPAND,5);
@@ -195,6 +202,7 @@ void DialogTimingProcessor::UpdateControls() {
 	leadIn->Enable(hasLeadIn->IsChecked());
 	leadOut->Enable(hasLeadOut->IsChecked());
 	adjascentThres->Enable(adjsEnable->IsChecked());
+	adjascentBias->Enable(adjsEnable->IsChecked());
 
 	// Keyframes are only available if timecodes are loaded
 	bool keysAvailable = grid->video->KeyFramesLoaded();
@@ -285,6 +293,7 @@ void DialogTimingProcessor::OnApply(wxCommandEvent &event) {
 	Options.SetBool(_T("Timing processor Enable lead-out"),hasLeadOut->IsChecked());
 	if (keysEnable->IsEnabled()) Options.SetBool(_T("Timing processor Enable keyframe"),keysEnable->IsChecked());
 	Options.SetBool(_T("Timing processor Enable adjascent"),adjsEnable->IsChecked());
+	Options.SetBool(_T("Timing processor Only Selection"),onlySelection->IsChecked());
 	Options.Save();
 
 	// Check if rows are valid
@@ -345,19 +354,22 @@ void DialogTimingProcessor::SortDialogues() {
 	// Copy from original to temporary list
 	std::list<AssDialogue*> temp;
 	AssDialogue *tempDiag;
-	for (std::list<AssEntry*>::iterator cur=grid->ass->Line.begin();cur!=grid->ass->Line.end();cur++) {
+	int count = grid->GetRows();
-		tempDiag = AssEntry::GetAsDialogue(*cur);
+	for (int i=0;i<count;i++) {
-		// Only add valid lines
+		tempDiag = grid->GetDialogue(i);
 		if (tempDiag && StyleOK(tempDiag->Style) && !tempDiag->Comment) {
+			if (!onlySelection->IsChecked() || grid->IsInSelection(i)) {
 				tempDiag->StartMS = tempDiag->Start.GetMS();
 				temp.push_back(tempDiag);
 			}
 		}
+	}
 
 	// Sort temporary list
 	temp.sort(LessByPointedToValue<AssDialogue>());
 
 	// Copy temporary list to final vector
+	Sorted.clear();
 	for (std::list<AssDialogue*>::iterator cur=temp.begin();cur!=temp.end();cur++) {
 		Sorted.push_back(*cur);
 	}

aegisub/dialog_timing_processor.h

@@ -56,6 +56,8 @@ private:
 	SubtitlesGrid *grid;
 	wxStaticBoxSizer *KeyframesSizer;
 
+	wxCheckBox *onlySelection;
+
 	wxTextCtrl *leadIn;
 	wxTextCtrl *leadOut;
 	wxCheckBox *hasLeadIn;

aegisub/options.cpp

@@ -289,6 +289,7 @@ void OptionsManager::LoadDefaults() {
 	SetBool(_T("Timing processor Enable lead-out"),true);
 	SetBool(_T("Timing processor Enable keyframe"),true);
 	SetBool(_T("Timing processor Enable adjascent"),true);
+	SetBool(_T("Timing processor Only Selection"),false);
 	SetFloat(_T("Timing processor adjascent bias"),1.0);
 
 	SetText(_T("Select Text"),_T(""));