Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: CPS customizable #198

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+59 −16
Draft

WIP: CPS customizable #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 40 additions & 10 deletions src/grid_column.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,8 @@ class GridColumnCPS final : public GridColumn {
const agi::OptionValue *cps_warn = OPT_GET("Subtitle/Character Counter/CPS Warning Threshold");
const agi::OptionValue *cps_error = OPT_GET("Subtitle/Character Counter/CPS Error Threshold");
const agi::OptionValue *bg_color = OPT_GET("Colour/Subtitle Grid/CPS Error");
const agi::OptionValue *disp_fmt = OPT_GET("Subtitle/Character Counter/Display Format");
const agi::OptionValue *col_align = OPT_GET("Subtitle/Character Counter/Column Alignment");

public:
COLUMN_HEADER(_("CPS"))
Expand All @@ -300,7 +302,7 @@ class GridColumnCPS final : public GridColumn {
return wxS("");
}

int CPS(const AssDialogue *d) const {
double CPS(const AssDialogue *d) const {
int duration = d->End - d->Start;
auto const& text = d->Text.get();

Expand All @@ -313,32 +315,60 @@ class GridColumnCPS final : public GridColumn {
if (ignore_punctuation->GetBool())
ignore |= agi::IGNORE_PUNCTUATION;

return agi::CharacterCount(text, ignore) * 1000 / duration;
return agi::CharacterCount(text, ignore) * 1000. / duration;
}

int Width(const agi::Context *c, WidthHelper &helper) const override {
return helper(wxS("999"));
return helper(wxS("99.9"));
}

void Paint(wxDC &dc, int x, int y, const AssDialogue *d, const agi::Context *) const override {
int cps = CPS(d);
if (cps < 0 || cps > 100) return;
double cps = CPS(d);
if (cps < 0) return;

double round_cps;
wxString str;
if (disp_fmt->GetInt() == 0 || (disp_fmt->GetInt() == 2 && cps >= 10)) {
round_cps = std::lround(cps);
if (round_cps >= 100) return;
str = std::to_wstring(int(round_cps));
} else {
round_cps = std::round(cps*10) / 10.0;
if (round_cps >= 100) return;
if (round_cps >= 10)
str = std::to_wstring(round_cps).substr(0, 4);
else
str = std::to_wstring(round_cps).substr(0, 3);
}

wxSize ext;
int w0 = dc.GetTextExtent(wxString(L"0")).GetWidth();
if (col_align->GetInt() == 0 || (disp_fmt->GetInt() != 2 && round_cps >= 10))
ext = dc.GetTextExtent(str);
else {
wxString str0;
if (cps >= 10)
str0 = str + wxString(L".0");
else
str0 = wxString(L"0") + str;
ext = dc.GetTextExtent(str0);
}

wxString str = std::to_wstring(cps);
wxSize ext = dc.GetTextExtent(str);
auto tc = dc.GetTextForeground();

int cps_min = cps_warn->GetInt();
int cps_max = std::max<int>(cps_min, cps_error->GetInt());
double cps_min = cps_warn->GetDouble();
double cps_max = std::max<float>(cps_min, cps_error->GetDouble());
if (cps > cps_min) {
double alpha = std::min((double)(cps - cps_min + 1) / (cps_max - cps_min + 1), 1.0);
double alpha = std::min((cps - cps_min + 1) / (cps_max - cps_min + 1), 1.0);
dc.SetBrush(wxBrush(blend(to_wx(bg_color->GetColor()), dc.GetBrush().GetColour(), 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;
if (col_align->GetInt() == 1 && round_cps < 10)
x += w0;
dc.DrawText(str, x, y + 2);
dc.SetTextForeground(tc);
}
Expand Down
1 change: 1 addition & 0 deletions src/grid_column.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "flyweight_hash.h"

#include <cmath>
#include <memory>
#include <string>
#include <vector>
Expand Down
6 changes: 4 additions & 2 deletions src/libresrc/default_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,10 @@
"Character Counter" : {
"Ignore Whitespace" : true,
"Ignore Punctuation" : true,
"CPS Warning Threshold" : 15,
"CPS Error Threshold" : 30
"CPS Warning Threshold" : 15.0,
"CPS Error Threshold" : 30.0,
"Display Format" : 0,
"Column Alignment": 0
},
"Character Limit" : 40,
"Default Resolution" : {
Expand Down
6 changes: 4 additions & 2 deletions src/libresrc/osx/default_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,10 @@
"Character Counter" : {
"Ignore Whitespace" : true,
"Ignore Punctuation" : true,
"CPS Warning Threshold" : 15,
"CPS Error Threshold" : 30
"CPS Warning Threshold" : 15.0,
"CPS Error Threshold" : 30.0,
"Display Format" : 0,
"Column Alignment": 0
},
"Character Limit" : 40,
"Default Resolution" : {
Expand Down
12 changes: 10 additions & 2 deletions src/preferences.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,19 @@ void Interface(wxTreebook *book, Preferences *parent) {

auto character_count = p->PageSizer(_("Character Counter"));
p->OptionAdd(character_count, _("Maximum characters per line"), "Subtitle/Character Limit", 0, 1000);
p->OptionAdd(character_count, _("Characters Per Second Warning Threshold"), "Subtitle/Character Counter/CPS Warning Threshold", 0, 1000);
p->OptionAdd(character_count, _("Characters Per Second Error Threshold"), "Subtitle/Character Counter/CPS Error Threshold", 0, 1000);
p->OptionAdd(character_count, _("Characters Per Second Warning Threshold"), "Subtitle/Character Counter/CPS Warning Threshold", 0.1, 1000., 0.1);
p->OptionAdd(character_count, _("Characters Per Second Error Threshold"), "Subtitle/Character Counter/CPS Error Threshold", 0.1, 1000., 0.1);
p->OptionAdd(character_count, _("Ignore whitespace"), "Subtitle/Character Counter/Ignore Whitespace");
p->OptionAdd(character_count, _("Ignore punctuation"), "Subtitle/Character Counter/Ignore Punctuation");

const wxString ccpsf_arr[3] = {_("Nearest integer"), _("Nearest 0.1"), _("2 sig figs")};
wxArrayString cpsf_res(3, ccpsf_arr);
p->OptionChoice(character_count, _("CPS display format"), cpsf_res, "Subtitle/Character Counter/Display Format");

const wxString calign_arr[2] = {_("Center"), _("Center with virtual 0")};
wxArrayString calign_res(2, calign_arr);
p->OptionChoice(character_count, _("CPS column alignment"), calign_res, "Subtitle/Character Counter/Column Alignment");

auto grid = p->PageSizer(_("Grid"));
p->OptionAdd(grid, _("Focus grid on click"), "Subtitle/Grid/Focus Allow");
p->OptionAdd(grid, _("Highlight visible subtitles"), "Subtitle/Grid/Highlight Subtitles in Frame");
Expand Down