moved to qwt 6.0.1

bkubicek · Nov 13, 2011 · aecf3b1 · aecf3b1
1 parent 6b02164
commit aecf3b1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/QTMarlin.pro b/QTMarlin.pro
@@ -2,25 +2,31 @@
 # Automatically generated by qmake (2.01a) Sat Nov 12 13:08:01 2011
 ######################################################################
 
-
+QWT_DIR=/home/bkubicek/software/qwt-6.0.1/
+QEXTSERIAL_DIR=/home/bkubicek/PVModulMesser/qextserialport
+QSERIALDEVICE_DIR=/home/bkubicek/software/qserialdevice-qserialdevice/
 TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
 INCLUDEPATH += .
-INCLUDEPATH += /home/bkubicek/PVModulMesser/qextserialport/src/ /home/bkubicek/PVModulMesser/qwt-5.2/src
-INCLUDEPATH += /home/bkubicek/software/qserialdevice-qserialdevice/src/qserialdeviceenumerator
-INCLUDEPATH += /home/bkubicek/software/qserialdevice-qserialdevice/src/qserialdevice
+INCLUDEPATH += $$QEXTSERIAL_DIR/src/ 
+INCLUDEPATH += $$QWT_DIR/src
+INCLUDEPATH += $$QSERIALDEVICE_DIR/src/qserialdeviceenumerator
+INCLUDEPATH += $$QSERIALDEVICE_DIR/src/qserialdevice
 
-QMAKE_LIBDIR += /home/bkubicek/PVModulMesser/qwt-5.2/lib/ /home/bkubicek/PVModulMesser/qextserialport/src/build/
+QMAKE_LIBDIR += $$QWT_DIR/lib/ /
+QMAKE_LIBDOR += $$QEXTSERIAL_DIR/src/build/
+QMAKE_LIBDIR += $$QSERIALDEVICE_DIR/src/build/release
 
 # Input
 HEADERS += mainwindow.h tab_pid.h tab_raw.h tab_eeprom.h
 SOURCES += main.cpp mainwindow.cpp tab_pid.cpp  tab_raw.cpp tab_eeprom.cpp
 #LIBS  += -lqextserialport -lqserialdevice -lqwt
 LIBS  += -lqserialdevice -lqwt
-QMAKE_LIBDIR +=/home/bkubicek/software/qserialdevice-qserialdevice/src/build/release
 
 
+#CONFIG+=static
+
 win32 {
     LIBS += -lsetupapi -luuid -ladvapi32
 }

diff --git a/tab_pid.cpp b/tab_pid.cpp
@@ -44,7 +44,7 @@ TabPID::TabPID(QWidget* parent): QWidget(parent)
   curve[heater] = new QwtPlotCurve("Heater");
   for(int i=0;i<4;i++)
   {
-    curve[i]->setData(x,y,2);
+    curve[i]->setSamples(x,y,2);
     curve[i]->setPen(QPen(QColor::fromHsv((255*i)/10,255,255),2));
 
   }
@@ -172,17 +172,17 @@ void TabPID::addData(float t1, float b, float t2, float h)
       d[1][i]=value_bed[i]-target_bed[i];
       d[2][i]=value_hotend2[i]-target_hotend2[i];
     }
-    curve[hotend1]->setData(time,d[0]);
-    curve[hotend2]->setData(time,d[2]);
-    curve[bed]->setData(time,d[1]);
+    curve[hotend1]->setSamples(time,d[0]);
+    curve[hotend2]->setSamples(time,d[2]);
+    curve[bed]->setSamples(time,d[1]);
   }
   else
   {
-    curve[hotend1]->setData(time,value_hotend1);
-    curve[hotend2]->setData(time,value_hotend2);
-    curve[bed]->setData(time,value_bed);
+    curve[hotend1]->setSamples(time,value_hotend1);
+    curve[hotend2]->setSamples(time,value_hotend2);
+    curve[bed]->setSamples(time,value_bed);
   }
-  curve[heater]->setData(time,value_heater);
+  curve[heater]->setSamples(time,value_heater);
   tempPlot->replot();
   heaterPlot->replot();
   calculatePeriodicity();