liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make brace placement consistent

Browse Source
This commit is contained in:
Scott Gilbertson
2024-02-18 12:28:00 -05:00
parent 703a81ae0c
commit 547ac41ad4
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/batchqueue.cc
View File

@@ -1020,8 +1020,7 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
path += seqstr.str (); path += seqstr.str ();
} else if (options.savePathTemplate[ix] == 't') { } else if (options.savePathTemplate[ix] == 't') {
// Insert formatted date/time value. Character after 't' defines time source // Insert formatted date/time value. Character after 't' defines time source
if (++ix < options.savePathTemplate.size()) if (++ix < options.savePathTemplate.size()) {
{
Glib::DateTime dateTime; Glib::DateTime dateTime;
bool dateTimeIsValid = true; bool dateTimeIsValid = true;
switch(options.savePathTemplate[ix++]) switch(options.savePathTemplate[ix++])
@@ -1050,8 +1049,7 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
dateTimeIsValid = false; dateTimeIsValid = false;
break; break;
} }
if (dateTimeIsValid) if (dateTimeIsValid) {
{
appendFormattedTime(path, ix, options.savePathTemplate, dateTime); appendFormattedTime(path, ix, options.savePathTemplate, dateTime);
} }
} }

12
rtgui/batchqueuepanel.cc
View File

@@ -389,12 +389,10 @@ void BatchQueuePanel::populateTemplateHelpBuffer(Glib::RefPtr<Gtk::TextBuffer> b
// Since this code only ever runs once (the first time the help text is presented), no attempt is // Since this code only ever runs once (the first time the help text is presented), no attempt is
// made to be efficient. Use a brute-force method to discover the number of elements in exampleFilePath. // made to be efficient. Use a brute-force method to discover the number of elements in exampleFilePath.
int pathElementCount = 0; int pathElementCount = 0;
for (int n=9; n>=0; n--) for (int n=9; n>=0; n--) {
{
options.savePathTemplate = Glib::ustring::format("%d",n); options.savePathTemplate = Glib::ustring::format("%d",n);
auto result = BatchQueue::calcAutoFileNameBase(exampleFilePath); auto result = BatchQueue::calcAutoFileNameBase(exampleFilePath);
if (!result.empty()) if (!result.empty()) {
{
// The 'd' specifier returns an empty string if N exceeds the number of path elements, so // The 'd' specifier returns an empty string if N exceeds the number of path elements, so
// the largest N that does not return an empty string is the number of elements in exampleFilePath. // the largest N that does not return an empty string is the number of elements in exampleFilePath.
pathElementCount = n; pathElementCount = n;
@@ -405,8 +403,7 @@ void BatchQueuePanel::populateTemplateHelpBuffer(Glib::RefPtr<Gtk::TextBuffer> b
// number of elements in the path. // number of elements in the path.
auto insertPathExamples = [&buffer, &pos, pathElementCount, exampleFilePath](char letter, int offset1, int mult1, int offset2, int mult2) auto insertPathExamples = [&buffer, &pos, pathElementCount, exampleFilePath](char letter, int offset1, int mult1, int offset2, int mult2)
{ {
for (int n=0; n<pathElementCount; n++) for (int n=0; n<pathElementCount; n++) {
{
auto path1 = Glib::ustring::format("%",letter,offset1+n*mult1); auto path1 = Glib::ustring::format("%",letter,offset1+n*mult1);
auto path2 = Glib::ustring::format("%",letter,offset2+n*mult2); auto path2 = Glib::ustring::format("%",letter,offset2+n*mult2);
options.savePathTemplate = path1; options.savePathTemplate = path1;
@@ -414,8 +411,7 @@ void BatchQueuePanel::populateTemplateHelpBuffer(Glib::RefPtr<Gtk::TextBuffer> b
options.savePathTemplate = path2; options.savePathTemplate = path2;
auto result2 = BatchQueue::calcAutoFileNameBase(exampleFilePath); auto result2 = BatchQueue::calcAutoFileNameBase(exampleFilePath);
pos = buffer->insert_markup(pos, Glib::ustring::format("\n<tt> <b>", path1, "</b> = <b>", path2, "</b> = <i>", result1, "</i></tt>")); pos = buffer->insert_markup(pos, Glib::ustring::format("\n<tt> <b>", path1, "</b> = <b>", path2, "</b> = <i>", result1, "</i></tt>"));
if (result1 != result2) if (result1 != result2) {
{
// If this error appears, it indicates a coding error in either BatchQueue::calcAutoFileNameBase // If this error appears, it indicates a coding error in either BatchQueue::calcAutoFileNameBase
// or BatchQueuePanel::populateTemplateHelpBuffer. // or BatchQueuePanel::populateTemplateHelpBuffer.
pos = buffer->insert_markup(pos, Glib::ustring::format(" ", M("QUEUE_LOCATION_TEMPLATE_HELP_RESULT_MISMATCH"), " ", result2)); pos = buffer->insert_markup(pos, Glib::ustring::format(" ", M("QUEUE_LOCATION_TEMPLATE_HELP_RESULT_MISMATCH"), " ", result2));