Starting added task bar re/postfix in svgganttreport

Signed-off-by: Jean-Yves <jean-yves@phdd.(none)>
Signed-off-by: jyg <jean-yves@gindre.org>

diff --git a/TestSuite/SVG-Reports/testdir b/TestSuite/SVG-Reports/testdir
index af3cbbe..3568e3a 100755 (executable)
--- a/TestSuite/SVG-Reports/testdir
+++ b/TestSuite/SVG-Reports/testdir
@@ -19,6 +19,6 @@ cmp ganttreport_1.svg ganttreport_1_reference.svg || exit 1
 cmp ganttreport_2.svg ganttreport_2_reference.svg || exit 1
 cmp ganttreport_3.svg ganttreport_3_reference.svg || exit 1
 
-rm ganttreport_*.svg
-rm project_a_*.svg
+rm ganttreport_?.svg
+rm project_a_?.svg
 

diff --git a/taskjuggler/ProjectFile.cpp b/taskjuggler/ProjectFile.cpp
index 02b0a25..dbf1b39 100644 (file)
--- a/taskjuggler/ProjectFile.cpp
+++ b/taskjuggler/ProjectFile.cpp
@@ -5043,6 +5043,24 @@ ProjectFile::readSVGGanttTaskReport(const QString& reportType)
                 if (!readSorting(report, 0))
                     return false;
             }
+            else if (token == KW("taskbarprefix"))
+            {
+                if (nextToken(token) != STRING)
+                {
+                    errorMessage(i18n("String expected"));
+                    goto error;
+                }
+                report->setTaskBarPrefix(token);
+            }
+            else if (token == KW("taskbarpostfix"))
+            {
+                if (nextToken(token) != STRING)
+                {
+                    errorMessage(i18n("String expected"));
+                    goto error;
+                }
+                report->setTaskBarPostfix(token);
+            }
             else if (token == KW("scenarios"))
             {
                 report->clearScenarios();

diff --git a/taskjuggler/SVGGanttTaskReport.cpp b/taskjuggler/SVGGanttTaskReport.cpp
index a386131..618a5f8 100644 (file)
--- a/taskjuggler/SVGGanttTaskReport.cpp
+++ b/taskjuggler/SVGGanttTaskReport.cpp
@@ -297,7 +297,7 @@ SVGGanttTaskReport::generate()
             // Add comment, scenario name
             svg.appendChild(doc.createComment("Scenario : " + getProject()->getScenario(*it)->getName()));
 
-            x = setInLimits(DATE_TO_X(task->getStart(scenario)), mindatex, maxdatex);
+            x = setInLimits((unsigned int)DATE_TO_X(task->getStart(scenario)), mindatex, maxdatex);
             y = (unsigned int)(margey + (i + 1) * lh);
 
             bool hasError = false;
@@ -429,7 +429,7 @@ SVGGanttTaskReport::generate()
                 if (task->getStart(scenario) == 0 || task->getEnd(scenario) == 0 || task->getSvgGanttReportIndex(scenario) < 0)
                     continue;
 
-                x = setInLimits(DATE_TO_X(task->getStart(scenario)), mindatex, maxdatex);
+                x = setInLimits((unsigned int)DATE_TO_X(task->getStart(scenario)), mindatex, maxdatex);
                 y = (unsigned int)(margey + (i + 1) * lh);
                 w = DUR_TO_W(task->getEnd(scenario)- task->getStart(scenario));
                 if (x + w > maxdatex) w = maxdatex - x;
@@ -447,7 +447,7 @@ SVGGanttTaskReport::generate()
                     if (task2->getParent() && task2->getParent()->hasPrevious(task))
                         continue;
 
-                    x2 = setInLimits(DATE_TO_X(task2->getStart(*it)), mindatex, maxdatex);
+                    x2 = setInLimits((unsigned int)DATE_TO_X(task2->getStart(*it)), mindatex, maxdatex);
                     y2 = (unsigned int)(margey + (task2->getSvgGanttReportIndex(scenario) + 1) * lh);
 
                     h = ((int)y2 - (int)y) < 0 ? y - y2 : y2 - y;

diff --git a/taskjuggler/SVGGanttTaskReport.h b/taskjuggler/SVGGanttTaskReport.h
index 405725d..c4e98a7 100644 (file)
--- a/taskjuggler/SVGGanttTaskReport.h
+++ b/taskjuggler/SVGGanttTaskReport.h
@@ -36,10 +36,19 @@ public:
     void setHideLinks(int i) { hideLinks = i; }
     int getHideLinks() { return hideLinks; }
 
+    void setTaskBarPrefix(const QString& t) { taskBarPrefix = t; }
+    const QString getTaskBarPrefix() const { return taskBarPrefix; }
+
+    void setTaskBarPostfix(const QString& t) { taskBarPostfix = t; }
+    const QString getTaskBarPostfix() const { return taskBarPostfix; }
+
 private:
     QString caption;
 
     int hideLinks;
+
+    QString taskBarPrefix;
+    QString taskBarPostfix;
 };
 
 #endif