mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-20 21:27:52 -06:00
ENH: add preset of voron
As title. Thanks SoftFever. Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: I752413251b7699f8d1d26c44d71d912e1ef09c7b (cherry picked from commit 606a69173e10d0a45e1f1987c36e45c3c89a7f09)
This commit is contained in:
parent
29e19cb32e
commit
cd82f70002
54 changed files with 2077 additions and 21 deletions
|
@ -940,31 +940,31 @@ namespace client
|
|||
auto error_line = std::string(first, first_pos) + std::string(last, 0, last_pos);
|
||||
// Position of the it_error from the start of its line.
|
||||
auto error_pos = (it_error - it_begin) - first_pos;
|
||||
msg += Slic3r::format(_(L("Error at line %1%:\n")), std::to_string(line_nr));
|
||||
//if (! info.tag.empty() && info.tag.front() == '*') {
|
||||
// // The gat contains an explanatory string.
|
||||
// msg += ": ";
|
||||
// msg += info.tag.substr(1);
|
||||
//} else {
|
||||
// auto it = tag_to_error_message.find(info.tag);
|
||||
// if (it == tag_to_error_message.end()) {
|
||||
// // A generic error report based on the nonterminal or terminal symbol name.
|
||||
// msg += ". Expecting tag ";
|
||||
// msg += info.tag;
|
||||
// } else {
|
||||
// // Use the human readable error message.
|
||||
// msg += ". ";
|
||||
// msg += it->second;
|
||||
// }
|
||||
//}
|
||||
//msg += '\n';
|
||||
msg += "Parsing error at line " + std::to_string(line_nr);
|
||||
if (! info.tag.empty() && info.tag.front() == '*') {
|
||||
// The gat contains an explanatory string.
|
||||
msg += ": ";
|
||||
msg += info.tag.substr(1);
|
||||
} else {
|
||||
auto it = tag_to_error_message.find(info.tag);
|
||||
if (it == tag_to_error_message.end()) {
|
||||
// A generic error report based on the nonterminal or terminal symbol name.
|
||||
msg += ". Expecting tag ";
|
||||
msg += info.tag;
|
||||
} else {
|
||||
// Use the human readable error message.
|
||||
msg += ". ";
|
||||
msg += it->second;
|
||||
}
|
||||
}
|
||||
msg += '\n';
|
||||
// This hack removes all non-UTF8 characters from the source line, so that the upstream wxWidgets conversions
|
||||
// from UTF8 to UTF16 don't bail out.
|
||||
msg += boost::nowide::narrow(boost::nowide::widen(error_line));
|
||||
msg += '\n';
|
||||
//for (size_t i = 0; i < error_pos; ++ i)
|
||||
// msg += ' ';
|
||||
//msg += "^\n";
|
||||
for (size_t i = 0; i < error_pos; ++ i)
|
||||
msg += ' ';
|
||||
msg += "^\n";
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue