Merge branch 'ta_modernize' into 'develop'

TraceAnalyzer Modernize

See merge request ems/astdm/modeling.dram/dram.sys.5!142

extensions/apps/traceAnalyzer/businessObjects/phases/phasedependency.cpp

@@ -85,8 +85,8 @@ void PhaseDependency::mDraw(QPoint& end,
     QPolygonF arrowHead;
     arrowHead << line.p2() << arrowP1 << arrowP2;
 
-    QColor color = mDependency->getColor(drawingProperties);
-    painter->setBrush(QBrush(color, mDependency->getBrushStyle()));
+    painter->setBrush(QPalette().base());
+    painter->setPen(QPalette().text().color());
 
     painter->drawLine(line);
     painter->drawPolygon(arrowHead);
@@ -109,7 +109,7 @@ void PhaseDependency::mDraw(QPoint& end,
             }
         }
 
-        drawText(painter, mTimeDependency, textPosition, alignment);
+        drawText(painter, mTimeDependency, textPosition, alignment, QPalette().text().color());
     }
 }
 

extensions/apps/traceAnalyzer/scripts/memUtil.py

@@ -112,7 +112,7 @@ def maximum_data_rate(connection):
     # Backwards compatibility for traces where clkMHz was not yet replaced with tCK
     clk = None
     try:
-        clk = 1000000 / memspec.getIntValue("memtimingspec", "tCK")
+        clk = 1000000 / memspec.jsonMemSpec['memspec']['memtimingspec']['tCK']
     except:
         clk = memspec.getIntValue("memtimingspec", "clkMhz")
 

extensions/apps/traceAnalyzer/tracefiletab.cpp

@@ -29,7 +29,7 @@ void TraceFileTab::setUpPossiblePhases()
     {
         auto item = new QListWidgetItem(p, ui->depTabPossiblePhases);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
-        item->setCheckState(Qt::Unchecked);                      // AND initialize check state
+        item->setCheckState(Qt::Checked);                      // AND initialize check state
     }
 
     ui->calculateDependencies->setEnabled(

src/traceAnalyzer/businessObjects/pythoncaller.cpp

@@ -37,11 +37,14 @@
  *    Derek Christ
  */
 
-#include "pythoncaller.h"
-#include <exception>
-#include <iostream>
+// Has to come first.
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+ 
+#include "pythoncaller.h"
+
+#include <exception>
+#include <iostream>
 #include <string>
 
 std::string PythonCaller::generatePlots(std::string_view pathToTrace)

src/traceAnalyzer/businessObjects/pythoncaller.h

@@ -40,11 +40,6 @@
 #ifndef PYTHONCALLER_H
 #define PYTHONCALLER_H
 
-// Workaround for CMAKE and Python
-#ifdef slots
-#undef slots
-#endif
-
 #include "businessObjects/tracecalculatedmetrics.h"
 #include <string>
 

src/traceAnalyzer/main.cpp

@@ -36,6 +36,9 @@
  *    Derek Christ
  */
 
+// Has to come first.
+#include <pybind11/embed.h>
+
 #include "traceanalyzer.h"
 
 #include <QApplication>
@@ -46,7 +49,6 @@
 #include <csignal>
 #include <filesystem>
 #include <iostream>
-#include <pybind11/embed.h>
 
 int main(int argc, char* argv[])
 {

src/traceAnalyzer/presentation/tracePlotMouseLabel.h

@@ -63,6 +63,7 @@ public:
         clkPeriod(clkPeriod),
         timeDifferenceSpan(timeDifferenceSpan)
     {
+        setTrackerPen(traceplot->palette().text().color());
     }
 
     void setMode(MouseLabelMode mode);

src/traceAnalyzer/presentation/traceplot.cpp

@@ -382,6 +382,8 @@ void TracePlot::setUpGrid()
 {
     unsigned int clk = navigator->GeneralTraceInfo().clkPeriod;
     QwtPlotGrid* grid = new ClkGrid(clk, GridVisiblityClks * clk);
+    grid->setMajorPen(palette().text().color(), 1.0);
+    grid->setMinorPen(palette().text().color(), 1.0);
     grid->setZ(0);
     grid->attach(this);
 }