Skip to content

M
magicseteditor
Commit 5125e674 authored by twanvl's avatar twanvl
Browse files
Options

symbol fonts: 

 - fix: pointer was not incremented in recognizePrefix
 - removed merge_numbers, regexes are better
parent 7afbd716
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 47 deletions
src/data/symbol_font.cpp
View file @ 5125e674
...@@ -32,7 +32,6 @@ SymbolFont::SymbolFont() ...@@ -32,7 +32,6 @@ SymbolFont::SymbolFont()
, spacing(1,1) , spacing(1,1)
, scale_text(false) , scale_text(false)
, text_alignment(ALIGN_MIDDLE_CENTER) , text_alignment(ALIGN_MIDDLE_CENTER)
, merge_numbers(false)
, processed_insert_symbol_menu(nullptr) , processed_insert_symbol_menu(nullptr)
{} {}
...@@ -89,7 +88,7 @@ class SymbolInFont : public IntrusivePtrBase<SymbolInFont> { ...@@ -89,7 +88,7 @@ class SymbolInFont : public IntrusivePtrBase<SymbolInFont> {
String code; ///< Code for this symbol String code; ///< Code for this symbol
Scriptable<bool> enabled; ///< Is this symbol enabled? Scriptable<bool> enabled; ///< Is this symbol enabled?
bool regex; ///< Should this symbol be matched by a regex? bool regex; ///< Should this symbol be matched by a regex?
int draw_text; ///< The index of the captured regex expression to draw int draw_text; ///< The index of the captured regex expression to draw, or -1 to not draw text
wxRegEx code_regex; ///< Regex for matching the symbol code wxRegEx code_regex; ///< Regex for matching the symbol code
double text_margin_left; double text_margin_left;
double text_margin_right; double text_margin_right;
...@@ -194,36 +193,36 @@ IMPLEMENT_REFLECTION(SymbolInFont) { ...@@ -194,36 +193,36 @@ IMPLEMENT_REFLECTION(SymbolInFont) {
void SymbolFont::split(const String& text, SplitSymbols& out) const { void SymbolFont::split(const String& text, SplitSymbols& out) const {
// read a single symbol until we are done with the text // read a single symbol until we are done with the text
for (size_t pos = 0 ; pos < text.size() ; ) { for (size_t pos = 0 ; pos < text.size() ; ) {
// 1. check merged numbers // check symbol list
/*if (merge_numbers && pos + 1 < text.size()) {
size_t num_count = text.find_first_not_of(_("0123456789"), pos) - pos;
if (num_count >= 2) {
// draw single symbol for the whole number
out.push_back(DrawableSymbol(text.substr(pos, num_count), _(""), nullptr));
pos += num_count;
goto next_symbol;
}
}*/
// 2. check symbol list
FOR_EACH_CONST(sym, symbols) { FOR_EACH_CONST(sym, symbols) {
if (!sym->code.empty() && sym->enabled) { if (!sym->code.empty() && sym->enabled) {
size_t start, end; size_t start, len = 1;
if (sym->regex && sym->code_regex.IsValid() && sym->code_regex.Matches(text.Mid(pos), wxRE_NOTBOL | wxRE_NOTEOL) && if (sym->regex && sym->code_regex.IsValid() && sym->code_regex.Matches(text.substr(pos), wxRE_NOTBOL | wxRE_NOTEOL) &&
sym->code_regex.GetMatch(&start, &end) && start == 0) { //Matches the regex sym->code_regex.GetMatch(&start, &len) && start == 0 && len > 0) { //Matches the regex
size_t draw_end; if (sym->draw_text >= 0 && sym->draw_text < (int)sym->code_regex.GetMatchCount()) {
sym->code_regex.GetMatch(&start, &draw_end, sym->draw_text); size_t draw_end;
out.push_back(DrawableSymbol(text.Mid(pos, end), sym->draw_text >= 0 ? text.Mid(pos + start, draw_end - start) : _(""), sym.get())); sym->code_regex.GetMatch(&start, &draw_end, sym->draw_text);
pos += end; out.push_back(DrawableSymbol(
text.substr(pos, len),
text.substr(pos + start, draw_end - start),
*sym));
} else {
out.push_back(DrawableSymbol(
text.substr(pos, len),
_(""),
*sym));
}
pos += len;
goto next_symbol; goto next_symbol;
} else if (is_substr(text, pos, sym->code)) { } else if (is_substr(text, pos, sym->code)) {
out.push_back(DrawableSymbol(sym->code, sym->draw_text >= 0 ? sym->code : _(""), sym.get())); out.push_back(DrawableSymbol(sym->code, sym->draw_text >= 0 ? sym->code : _(""), *sym));
pos += sym->code.size(); pos += sym->code.size();
goto next_symbol; // continue two levels goto next_symbol; // continue two levels
} }
} }
} }
// 3. unknown code, draw single character as text // unknown code, draw single character as text
//out.push_back(DrawableSymbol(text.substr(pos, 1), _(""), 0)); //out.push_back(DrawableSymbol(text.substr(pos, 1), _(""), defaultSymbol()));
pos += 1; pos += 1;
next_symbol:; next_symbol:;
} }
...@@ -232,21 +231,13 @@ next_symbol:; ...@@ -232,21 +231,13 @@ next_symbol:;
size_t SymbolFont::recognizePrefix(const String& text, size_t start) const { size_t SymbolFont::recognizePrefix(const String& text, size_t start) const {
size_t pos; size_t pos;
for (pos = start ; pos < text.size() ; ) { for (pos = start ; pos < text.size() ; ) {
// 1. check merged numbers // check symbol list
if (merge_numbers && pos + 1 < text.size()) {
size_t num_count = text.find_first_not_of(_("0123456789"), pos) - pos;
if (num_count >= 2) {
pos += num_count;
goto next_symbol;
}
}
// 2. check symbol list
FOR_EACH_CONST(sym, symbols) { FOR_EACH_CONST(sym, symbols) {
if (!sym->code.empty() && sym->enabled) { if (!sym->code.empty() && sym->enabled) {
size_t start, end; size_t start, len = 1;
if (sym->regex && sym->code_regex.IsValid() && sym->code_regex.Matches(text.Mid(pos), wxRE_NOTBOL | wxRE_NOTEOL) && if (sym->regex && sym->code_regex.IsValid() && sym->code_regex.Matches(text.substr(pos), wxRE_NOTBOL | wxRE_NOTEOL) &&
sym->code_regex.GetMatch(&start, &end) && start == 0) { //Matches the regex sym->code_regex.GetMatch(&start, &len) && start == 0 && len > 0) { //Matches the regex
pos = end; pos += len;
goto next_symbol; goto next_symbol;
} else if (is_substr(text, pos, sym->code)) { } else if (is_substr(text, pos, sym->code)) {
pos += sym->code.size(); pos += sym->code.size();
...@@ -254,7 +245,7 @@ size_t SymbolFont::recognizePrefix(const String& text, size_t start) const { ...@@ -254,7 +245,7 @@ size_t SymbolFont::recognizePrefix(const String& text, size_t start) const {
} }
} }
} }
// 3. failed // failed
break; break;
next_symbol:; next_symbol:;
} }
...@@ -277,16 +268,15 @@ void SymbolFont::draw(RotatedDC& dc, Context& ctx, const RealRect& rect, double ...@@ -277,16 +268,15 @@ void SymbolFont::draw(RotatedDC& dc, Context& ctx, const RealRect& rect, double
draw(dc, rect, font_size, align, symbols); draw(dc, rect, font_size, align, symbols);
} }
void SymbolFont::draw (RotatedDC& dc, RealRect rect, double font_size, const Alignment& align, const SplitSymbols& text) { void SymbolFont::draw(RotatedDC& dc, RealRect rect, double font_size, const Alignment& align, const SplitSymbols& text) {
FOR_EACH_CONST(sym, text) { FOR_EACH_CONST(sym, text) {
RealSize size = dc.trInvS(symbolSize(dc.trS(font_size), sym)); RealSize size = dc.trInvS(symbolSize(dc.trS(font_size), sym));
RealRect sym_rect = split_left(rect, size); RealRect sym_rect = split_left(rect, size);
if (sym.symbol) drawSymbol(dc, sym_rect, font_size, align, *sym.symbol, sym.draw_text);
drawSymbol(dc, sym_rect, font_size, align, *sym.symbol, sym.draw_text);
} }
} }
void SymbolFont::drawSymbol (RotatedDC& dc, RealRect sym_rect, double font_size, const Alignment& align, SymbolInFont& sym, const String& text) { void SymbolFont::drawSymbol(RotatedDC& dc, RealRect sym_rect, double font_size, const Alignment& align, SymbolInFont& sym, const String& text) {
// 1. draw symbol // 1. draw symbol
// find bitmap // find bitmap
Bitmap bmp = sym.getBitmap(*this, dc.trS(font_size)); Bitmap bmp = sym.getBitmap(*this, dc.trS(font_size));
...@@ -294,7 +284,7 @@ void SymbolFont::drawSymbol (RotatedDC& dc, RealRect sym_rect, double font_size, ...@@ -294,7 +284,7 @@ void SymbolFont::drawSymbol (RotatedDC& dc, RealRect sym_rect, double font_size,
dc.DrawBitmap(bmp, align_in_rect(align, dc.trInvS(RealSize(bmp.GetWidth(), bmp.GetHeight())), sym_rect)); dc.DrawBitmap(bmp, align_in_rect(align, dc.trInvS(RealSize(bmp.GetWidth(), bmp.GetHeight())), sym_rect));
// 2. draw text // 2. draw text
if (text.IsEmpty()) return; if (text.empty()) return;
// subtract margins from size // subtract margins from size
sym_rect.x += font_size * sym.text_margin_left; sym_rect.x += font_size * sym.text_margin_left;
sym_rect.y += font_size * sym.text_margin_top; sym_rect.y += font_size * sym.text_margin_top;
......
src/data/symbol_font.hpp
View file @ 5125e674
...@@ -39,13 +39,13 @@ class SymbolFont : public Packaged { ...@@ -39,13 +39,13 @@ class SymbolFont : public Packaged {
/// A symbol to be drawn /// A symbol to be drawn
class DrawableSymbol { class DrawableSymbol {
public: public:
inline DrawableSymbol(const String& text, const String& draw_text, SymbolInFont* symbol) inline DrawableSymbol(const String& text, const String& draw_text, SymbolInFont& symbol)
: text(text), draw_text(draw_text), symbol(symbol) : text(text), draw_text(draw_text), symbol(&symbol)
{} {}
String text; ///< Original text String text; ///< Original text
String draw_text;///< Text to draw (extracted from the regex to avoid performance costs) String draw_text;///< Text to draw (extracted from the regex to avoid performance costs)
SymbolInFont* symbol; ///< Symbol to draw, if nullptr, use the default symbol and draw the text SymbolInFont* symbol; ///< Symbol to draw
}; };
typedef vector<DrawableSymbol> SplitSymbols; typedef vector<DrawableSymbol> SplitSymbols;
...@@ -87,7 +87,6 @@ class SymbolFont : public Packaged { ...@@ -87,7 +87,6 @@ class SymbolFont : public Packaged {
// writing text // writing text
bool scale_text; ///< Should text be scaled down to fit in a symbol? bool scale_text; ///< Should text be scaled down to fit in a symbol?
Alignment text_alignment; Alignment text_alignment;
bool merge_numbers; ///< Merge numbers? e.g. "11" is a single symbol ('1' must not exist as a symbol)
InsertSymbolMenuP insert_symbol_menu; InsertSymbolMenuP insert_symbol_menu;
wxMenu* processed_insert_symbol_menu; wxMenu* processed_insert_symbol_menu;
...@@ -105,7 +104,7 @@ class SymbolFont : public Packaged { ...@@ -105,7 +104,7 @@ class SymbolFont : public Packaged {
/// Size of a single symbol /// Size of a single symbol
RealSize symbolSize (double font_size, const DrawableSymbol& sym); RealSize symbolSize (double font_size, const DrawableSymbol& sym);
public: public:
/// Size of the default symbol /// The default size of symbols
RealSize defaultSymbolSize(double font_size); RealSize defaultSymbolSize(double font_size);
DECLARE_REFLECTION(); DECLARE_REFLECTION();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment