DPL GUI: improved metrics plots

ktf · ktf · commit 6ee94749d244 · 2018-11-13T01:09:16.000+01:00
diff --git a/Framework/Core/include/Framework/DeviceMetricsInfo.h b/Framework/Core/include/Framework/DeviceMetricsInfo.h
@@ -45,6 +45,8 @@ struct DeviceMetricsInfo {
   std::vector<std::array<size_t, 1024>> timestamps;
   std::vector<float> max;
   std::vector<float> min;
+  std::vector<size_t> minDomain;
+  std::vector<size_t> maxDomain;
   std::vector<std::pair<std::string, size_t>> metricLabelsIdx;
   std::vector<MetricInfo> metrics;
 };
diff --git a/Framework/Core/src/DeviceMetricsInfo.cxx b/Framework/Core/src/DeviceMetricsInfo.cxx
@@ -108,6 +108,8 @@ bool DeviceMetricsHelper::processMetric(const std::smatch& match,
     info.timestamps.emplace_back(std::array<size_t, 1024>{});
     info.max.push_back(std::numeric_limits<float>::lowest());
     info.min.push_back(std::numeric_limits<float>::max());
+    info.maxDomain.push_back(std::numeric_limits<size_t>::lowest());
+    info.minDomain.push_back(std::numeric_limits<size_t>::max());
 
     // Add the index by name in the correct position
     // this will require moving the tail of the index,
@@ -131,6 +133,8 @@ bool DeviceMetricsHelper::processMetric(const std::smatch& match,
   MetricInfo &metricInfo = info.metrics[metricIndex];
 
   auto mod = info.timestamps[metricIndex].size();
+  info.minDomain[metricIndex] = std::min(info.minDomain[metricIndex], (size_t)timestamp);
+  info.maxDomain[metricIndex] = std::max(info.maxDomain[metricIndex], (size_t)timestamp);
 
   switch(metricInfo.type) {
     case MetricType::Int: {
diff --git a/Framework/Core/src/FrameworkGUIDebugger.cxx b/Framework/Core/src/FrameworkGUIDebugger.cxx
@@ -36,7 +36,8 @@ struct MultiplotData {
   int mod;
   size_t first;
   size_t size;
-  const void* points;
+  const void* Y;
+  const void* X;
   MetricType type;
 };
 } // namespace framework
@@ -163,6 +164,15 @@ void displayDeviceMetrics(const char* label, ImVec2 canvasSize, std::string cons
                           size_t rangeBegin, size_t rangeEnd, size_t bins, bool useHistos,
                           std::vector<DeviceSpec> const& specs, std::vector<DeviceMetricsInfo> const& metricsInfos)
 {
+  static std::vector<ImColor> palette = {
+    ImColor{ 218, 124, 48 },
+    ImColor{ 62, 150, 81 },
+    ImColor{ 204, 37, 41 },
+    ImColor{ 83, 81, 84 },
+    ImColor{ 107, 76, 154 },
+    ImColor{ 146, 36, 40 },
+    ImColor{ 148, 139, 61 }
+  };
   std::vector<void const*> metricsToDisplay;
   std::vector<const char*> deviceNames;
   std::vector<MultiplotData> userData;
@@ -172,6 +182,8 @@ void displayDeviceMetrics(const char* label, ImVec2 canvasSize, std::string cons
   assert(specs.size() == metricsInfos.size());
   float maxValue = std::numeric_limits<float>::lowest();
   float minValue = 0;
+  size_t maxDomain = std::numeric_limits<size_t>::lowest();
+  size_t minDomain = std::numeric_limits<size_t>::max();
 
   for (int mi = 0; mi < metricsInfos.size(); ++mi) {
     auto vi = DeviceMetricsHelper::metricIdxByName(selectedMetricName, metricsInfos[mi]);
@@ -180,24 +192,27 @@ void displayDeviceMetrics(const char* label, ImVec2 canvasSize, std::string cons
     }
     auto& metric = metricsInfos[mi].metrics[vi];
     deviceNames.push_back(specs[mi].name.c_str());
-    colors.emplace_back(220, 220, 220);
+    colors.push_back(palette[mi % palette.size()]);
     metricType = metric.type;
     MultiplotData data;
     data.mod = metricsInfos[mi].timestamps[vi].size();
     data.first = metric.pos - data.mod;
+    data.X = metricsInfos[mi].timestamps[vi].data();
     minValue = std::min(minValue, metricsInfos[mi].min[vi]);
     maxValue = std::max(maxValue, metricsInfos[mi].max[vi]);
+    minDomain = std::min(minDomain, metricsInfos[mi].minDomain[vi]);
+    maxDomain = std::max(maxDomain, metricsInfos[mi].maxDomain[vi]);
     switch (metric.type) {
       case MetricType::Int: {
         data.size = metricsInfos[mi].intMetrics[metric.storeIdx].size();
-        data.points = metricsInfos[mi].intMetrics[metric.storeIdx].data();
+        data.Y = metricsInfos[mi].intMetrics[metric.storeIdx].data();
         data.type = MetricType::Int;
         metricType = MetricType::Int;
         metricSize = metricsInfos[mi].intMetrics[metric.storeIdx].size();
       } break;
       case MetricType::Float: {
         data.size = metricsInfos[mi].floatMetrics[metric.storeIdx].size();
-        data.points = metricsInfos[mi].floatMetrics[metric.storeIdx].data();
+        data.Y = metricsInfos[mi].floatMetrics[metric.storeIdx].data();
         data.type = MetricType::Float;
         metricType = MetricType::Float;
         metricSize = metricsInfos[mi].floatMetrics[metric.storeIdx].size();
@@ -207,41 +222,58 @@ void displayDeviceMetrics(const char* label, ImVec2 canvasSize, std::string cons
     }
     userData.emplace_back(data);
   }
+
+  maxDomain = std::max(minDomain + 1024, maxDomain);
+
   for (size_t ui = 0; ui < userData.size(); ++ui) {
     metricsToDisplay.push_back(&(userData[ui]));
   }
-  auto getter = [](const void* hData, int idx) -> float {
+  auto getterY = [](const void* hData, int idx) -> float {
     auto histoData = reinterpret_cast<const MultiplotData*>(hData);
     size_t pos = (histoData->first + static_cast<size_t>(idx)) % histoData->mod;
+    // size_t pos = (static_cast<size_t>(idx)) % histoData->mod;
     assert(pos >= 0 && pos < 1024);
     if (histoData->type == MetricType::Int) {
-      return static_cast<const int*>(histoData->points)[pos];
+      return static_cast<const int*>(histoData->Y)[pos];
     }
-    return static_cast<const float*>(histoData->points)[pos];
+    return static_cast<const float*>(histoData->Y)[pos];
+  };
+  auto getterX = [](const void* hData, int idx) -> size_t {
+    auto histoData = reinterpret_cast<const MultiplotData*>(hData);
+    size_t pos = (histoData->first + static_cast<size_t>(idx)) % histoData->mod;
+    //size_t pos = (static_cast<size_t>(idx)) % histoData->mod;
+    assert(pos >= 0 && pos < 1024);
+    return static_cast<const size_t*>(histoData->X)[pos];
   };
   if (useHistos) {
     ImGui::PlotMultiHistograms(
       label,
       userData.size(),
       deviceNames.data(),
       colors.data(),
-      getter,
+      getterY,
+      getterX,
       metricsToDisplay.data(),
       metricSize,
       minValue,
       maxValue * 1.2f,
+      minDomain,
+      maxDomain,
       canvasSize);
   } else {
     ImGui::PlotMultiLines(
       label,
       userData.size(),
       deviceNames.data(),
       colors.data(),
-      getter,
+      getterY,
+      getterX,
       metricsToDisplay.data(),
       metricSize,
       minValue,
       maxValue * 1.2f,
+      minDomain,
+      maxDomain,
       canvasSize);
   }
 }
@@ -396,7 +428,7 @@ void displayDeviceHistograms(gui::WorkspaceGUIState& state,
     ImGui::EndGroup();
     if (!currentMetricName.empty()) {
       if (currentStyle == 0 || currentStyle == 1) {
-        displayDeviceMetrics("##Metrics", ImVec2(ImGui::GetIO().DisplaySize.x - 10, state.bottomPaneSize - ImGui::GetItemRectSize().y - 20), currentMetricName, minTime, maxTime, 1024, currentStyle, devices, metricsInfos);
+        displayDeviceMetrics("Metrics", ImVec2(ImGui::GetIO().DisplaySize.x - 10, state.bottomPaneSize - ImGui::GetItemRectSize().y - 20), currentMetricName, minTime, maxTime, 1024, currentStyle, devices, metricsInfos);
       } else {
         ImGui::BeginChild("##ScrollingRegion", ImVec2(ImGui::GetIO().DisplaySize.x + state.leftPaneSize + state.rightPaneSize - 10, -ImGui::GetItemsLineHeightWithSpacing()), false,
                           ImGuiWindowFlags_HorizontalScrollbar);
diff --git a/Framework/DebugGUI/include/DebugGUI/imgui_extras.h b/Framework/DebugGUI/include/DebugGUI/imgui_extras.h
@@ -5,8 +5,9 @@
 
 namespace ImGui
 {
+
 // Start PlotMultiLines(...) and PlotMultiHistograms(...)------------------------
-// by @JaapSuter and @maxint (please see: https://github.com/ocornut/imgui/issues/632)
+// heavily modivied version starting from code of @JaapSuter and @maxint (please see: https://github.com/ocornut/imgui/issues/632)
 static inline ImU32 InvertColorU32(ImU32 in)
 {
   ImVec4 in4 = ColorConvertU32ToFloat4(in);
@@ -21,23 +22,29 @@ void PlotMultiLines(
   int num_datas,
   const char** names,
   const ImColor* colors,
-  float (*getter)(const void* data, int idx),
+  float (*getterY)(const void* data, int idx),
+  size_t (*getterX)(const void* data, int idx),
   const void* const* datas,
   int values_count,
   float scale_min,
   float scale_max,
+  size_t domain_min,
+  size_t domain_max,
   ImVec2 graph_size);
 
 void PlotMultiHistograms(
   const char* label,
   int num_hists,
   const char** names,
   const ImColor* colors,
-  float (*getter)(const void* data, int idx),
+  float (*getterY)(const void* data, int idx),
+  size_t (*getterX)(const void* data, int idx),
   const void* const* datas,
   int values_count,
   float scale_min,
   float scale_max,
+  size_t domain_min,
+  size_t domain_max,
   ImVec2 graph_size);
 
 // End PlotMultiLines(...) and PlotMultiHistograms(...)--------------------------
diff --git a/Framework/DebugGUI/src/imgui_extras.cpp b/Framework/DebugGUI/src/imgui_extras.cpp
