X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_CPTA.py;h=69c52d4180f2ae3fe17c8a307ef0f1602b76a056;hp=0c317c05ce4987a138f08c2c76f6f5b2b4d4e61b;hb=c623ad8042127fcb4bbd3c9ffb646f40371b7510;hpb=5ae1aea05849a69a97f559756e80b9794482f302

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 0c317c05ce..69c52d4180 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -291,19 +291,21 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
             "color": anomalies_res,
             "colorscale": color_scale,
             "showscale": True,
-
+            "line": {
+                "width": 2
+            },
             "colorbar": {
                 "y": 0.5,
                 "len": 0.8,
-                "title": "Results Clasification",
+                "title": "Circles Marking Data Classification",
                 "titleside": 'right',
                 "titlefont": {
                     "size": 14
                 },
                 "tickmode": 'array',
                 "tickvals": [0.125, 0.375, 0.625, 0.875],
-                "ticktext": ["Outlier", "Regress", "Normal", "Progress"],
-                "ticks": 'outside',
+                "ticktext": ["Outlier", "Regression", "Normal", "Progression"],
+                "ticks": "",
                 "ticklen": 0,
                 "tickangle": -90,
                 "thickness": 10
@@ -313,9 +315,8 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
     traces.append(trace_anomalies)
 
     if show_moving_median:
-        min_periods = moving_win_size / 2 + 1
         data_mean_y = pd.Series(data_y).rolling(
-            window=moving_win_size, min_periods=min_periods).median()
+            window=moving_win_size, min_periods=2).median()
         trace_median = plgo.Scatter(
             x=data_x,
             y=data_mean_y,
@@ -423,9 +424,6 @@ def _generate_all_charts(spec, input_data):
                 idx += 1
 
             # Generate the chart:
-            period_name = "Daily" if period == 1 else \
-                "Weekly" if period < 20 else "Monthly"
-            chart["layout"]["title"] = chart["title"].format(period=period_name)
             _generate_chart(traces,
                             chart["layout"],
                             file_name="{0}-{1}-{2}{3}".format(
@@ -444,10 +442,18 @@ def _generate_all_charts(spec, input_data):
     txt_table = None
     with open("{0}.csv".format(file_name), 'rb') as csv_file:
         csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
+        header = True
         for row in csv_content:
             if txt_table is None:
                 txt_table = prettytable.PrettyTable(row)
+                header = False
             else:
+                if not header:
+                    for idx, item in enumerate(row):
+                        try:
+                            row[idx] = str(round(float(item) / 1000000, 2))
+                        except ValueError:
+                            pass
                 txt_table.add_row(row)
         txt_table.align["Build Number:"] = "l"
     with open("{0}.txt".format(file_name), "w") as txt_file: