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

Change the background color of the CPS column when the value is excessively high

Browse source
This commit is contained in:
Thomas Goyne 2014-04-21 10:47:20 -07:00
parent a1a289c4c0
commit 543034b96b
2 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/base_grid.cpp
View file

@ -348,11 +348,11 @@ void BaseGrid::OnPaint(wxPaintEvent &) {
color = row_colors.Comment; color = row_colors.Comment;
else if (OPT_GET("Subtitle/Grid/Highlight Subtitles in Frame")->GetBool() && IsDisplayed(curDiag)) else if (OPT_GET("Subtitle/Grid/Highlight Subtitles in Frame")->GetBool() && IsDisplayed(curDiag))
color = row_colors.Visible; color = row_colors.Visible;
dc.SetBrush(color);
// Draw row background color // Draw row background color
if (color != row_colors.Default) { if (color != row_colors.Default) {
dc.SetPen(*wxTRANSPARENT_PEN); dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(color);
dc.DrawRectangle(grid_x, (i + 1) * lineHeight + 1, w, lineHeight); dc.DrawRectangle(grid_x, (i + 1) * lineHeight + 1, w, lineHeight);
} }
@ -368,7 +368,7 @@ void BaseGrid::OnPaint(wxPaintEvent &) {
int y = (i + 1) * lineHeight; int y = (i + 1) * lineHeight;
for (size_t j : agi::util::range(columns.size())) { for (size_t j : agi::util::range(columns.size())) {
if (paint_columns[j]) if (paint_columns[j])
columns[j]->Paint(dc, x + 4, y + 2, curDiag, context); columns[j]->Paint(dc, x, y, curDiag, context);
x += columns[j]->Width(); x += columns[j]->Width();
} }

41
src/grid_column.cpp
View file

@ -59,7 +59,7 @@ void GridColumn::Paint(wxDC &dc, int x, int y, const AssDialogue *d, const agi::
wxString str = Value(d, c); wxString str = Value(d, c);
if (Centered()) if (Centered())
x += (width - 6 - dc.GetTextExtent(str).GetWidth()) / 2; x += (width - 6 - dc.GetTextExtent(str).GetWidth()) / 2;
dc.DrawText(str, x, y); dc.DrawText(str, x + 4, y + 2);
} }
namespace { namespace {
@ -240,6 +240,13 @@ struct GridColumnMarginVert final : GridColumnMargin<2> {
COLUMN_DESCRIPTION(_("Vertical Margin")) COLUMN_DESCRIPTION(_("Vertical Margin"))
}; };
wxColor blend(wxColor fg, wxColor bg, double alpha) {
return wxColor(
wxColor::AlphaBlend(fg.Red(), bg.Red(), alpha),
wxColor::AlphaBlend(fg.Green(), bg.Green(), alpha),
wxColor::AlphaBlend(fg.Blue(), bg.Blue(), alpha));
}
class GridColumnCPS final : public GridColumn { class GridColumnCPS final : public GridColumn {
const agi::OptionValue *ignore_whitespace = OPT_GET("Subtitle/Character Counter/Ignore Whitespace"); const agi::OptionValue *ignore_whitespace = OPT_GET("Subtitle/Character Counter/Ignore Whitespace");
const agi::OptionValue *ignore_punctuation = OPT_GET("Subtitle/Character Counter/Ignore Punctuation"); const agi::OptionValue *ignore_punctuation = OPT_GET("Subtitle/Character Counter/Ignore Punctuation");
@ -251,11 +258,15 @@ public:
bool RefreshOnTextChange() const override { return true; } bool RefreshOnTextChange() const override { return true; }
wxString Value(const AssDialogue *d, const agi::Context *) const override { wxString Value(const AssDialogue *d, const agi::Context *) const override {
return wxS("");
}
int CPS(const AssDialogue *d) const {
int duration = d->End - d->Start; int duration = d->End - d->Start;
auto const& text = d->Text.get(); auto const& text = d->Text.get();
if (duration <= 0 || text.size() > static_cast<size_t>(duration)) if (duration <= 0 || text.size() > static_cast<size_t>(duration))
return wxS(""); return -1;
int ignore = agi::IGNORE_NONE; int ignore = agi::IGNORE_NONE;
if (ignore_whitespace->GetBool()) if (ignore_whitespace->GetBool())
@ -263,12 +274,36 @@ public:
if (ignore_punctuation->GetBool()) if (ignore_punctuation->GetBool())
ignore |= agi::IGNORE_PUNCTUATION; ignore |= agi::IGNORE_PUNCTUATION;
return std::to_wstring(agi::CharacterCount(text, ignore) * 1000 / duration); return agi::CharacterCount(text, ignore) * 1000 / duration;
} }
int Width(const agi::Context *c, WidthHelper &helper) const override { int Width(const agi::Context *c, WidthHelper &helper) const override {
return helper(wxS("999")); return helper(wxS("999"));
} }
void Paint(wxDC &dc, int x, int y, const AssDialogue *d, const agi::Context *) const {
int cps = CPS(d);
if (cps < 0) return;
wxString str = std::to_wstring(cps);
wxSize ext = dc.GetTextExtent(str);
auto tc = dc.GetTextForeground();
int cps_min = 15;
int cps_max = 30;
if (cps > cps_min) {
double alpha = std::min((double)(cps - cps_min + 1) / (cps_max - cps_min + 1), 1.0);
auto bg = dc.GetBrush().GetColour();
dc.SetBrush(wxBrush(blend(wxColor(255, 0, 0), bg, alpha)));
dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle(x, y + 1, width, ext.GetHeight() + 3);
dc.SetTextForeground(blend(*wxBLACK, tc, alpha));
}
x += (width + 2 - ext.GetWidth()) / 2;
dc.DrawText(str, x, y + 2);
dc.SetTextForeground(tc);
}
}; };
class GridColumnText final : public GridColumn { class GridColumnText final : public GridColumn {