derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Felipe S. Prado
2016-10-24 19:11:18 +02:00
parent f501147401 a034405f6c
commit 20fc33ea29
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DRAMSys/analyzer/businessObjects/pythoncaller.cpp
View File

@@ -53,11 +53,7 @@ PythonCaller::PythonCaller() :
metricFunctionName("calculateMetrics"),
getMetricFunctionName("getMetrics"),
#ifdef MAC
pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../../../../DRAMSys/analyzer/scripts/"),
#else
pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../DRAMSys/analyzer/scripts/"),
#endif
plotsModuleName("plots"),
plotsFunctionName("generatePlots")
{
@@ -67,10 +63,10 @@ PythonCaller::PythonCaller() :
PyList_Insert(sysPath, 0, path);
Py_DECREF(path);
qDebug() << testModuleName.c_str() << testFunctionName.c_str();
qDebug() << metricModuleName.c_str() << metricFunctionName.c_str();
qDebug() << plotsModuleName.c_str() << plotsFunctionName.c_str();
qDebug() << "XXX: " << pathToScripts.c_str();
qDebug() << "Test:" << testModuleName.c_str() << testFunctionName.c_str();
qDebug() << "Metric:" << metricModuleName.c_str() << metricFunctionName.c_str();
qDebug() << "Plot:" << plotsModuleName.c_str() << plotsFunctionName.c_str();
qDebug() << "Script: " << pathToScripts.c_str();
pRunTestsFunction = loadFunctionFromModule(testModuleName, testFunctionName);
pCalculateMetricsFunction = loadFunctionFromModule(metricModuleName, metricFunctionName);

4
DRAMSys/analyzer/presentation/tracemetrictreewidget.cpp
View File

@@ -46,8 +46,6 @@ TraceMetricTreeWidget::TraceMetricTreeWidget(QWidget *parent) : QTreeWidget(pare
void TraceMetricTreeWidget::addTraceMetricResults(const TraceCalculatedMetrics& result)
{
setColumnCount(2);
QTreeWidgetItem* top = new QTreeWidgetItem({result.getTraceName()});
addTopLevelItem(top);
@@ -66,8 +64,6 @@ void TraceMetricTreeWidget::addTraceMetricResults(const TraceCalculatedMetrics&
void TraceMetricTreeWidget::addTracePlotResults(QString traceName, QString outputFiles)
{
setColumnCount(2);
QTreeWidgetItem* top = new QTreeWidgetItem({traceName});
addTopLevelItem(top);

3
DRAMSys/analyzer/traceAnalyzer.pro
View File

@@ -21,13 +21,14 @@ unix:!macx {
macx: {
CONFIG += c++11
QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -DMAC
QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++
QMAKE_LFLAGS += -F$$(LIBQWT_HOME)
LIBS += -F$$(LIBQWT_HOME) -framework qwt
INCLUDEPATH += $$(LIBQWT_HEADERS)
DEPENDPATH += $$replace(LIBQWT_HOME, lib, )
INCLUDEPATH += $$(PYTHON_HEADERS)
LIBS += -L$$(PYTHON_HOME) -lpython3.5
CONFIG-=app_bundle
}
# QWT library and header files