Merge branch 'master' of http://192.168.14.36:3000/adc_pilot/modularization

src/common/ivchart/ivchart.pro

@@ -7,6 +7,8 @@ DEFINES += IVCHART_LIBRARY
 
 CONFIG += c++11
 
+CONFIG += plugin
+
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -34,6 +36,7 @@ unix {
 }
 !isEmpty(target.path): INSTALLS += target
 
+
 INCLUDEPATH += $$PWD/../../include/msgtype
 
 unix: LIBS += -lprotobuf

src/tool/view_ivchart/Readme

@@ -0,0 +1 @@
+If AGX,  sudo apt-get install libqt5charts5-dev

src/tool/view_ivchart/dialogivctocsv.cpp

@@ -138,7 +138,7 @@ void Dialogivctocsv::on_pushButton_Convert_clicked()
     char strtem[1000];
     double fDiv = 1;
     if(ntimemode == 1)fDiv = 1000.0;
-    snprintf(strout,10000,"Time ; AbsTime ; RealTime");
+    snprintf(strout,10000,"Time ; AbsTime ; RelTime");
     unsigned int i;
     double * xvectorlastvalue = new double[xvectorivcdata.size()];
 

src/tool/view_ivchart/mainwindow.h

@@ -59,7 +59,7 @@ private:
     double AXIS_X_SEL[6] = {1,5,10,30,60,300};
     int mnDefAxisXIndex = 2;
 
-    std::string mstrTitle = "ADC IV Char View ";
+    std::string mstrTitle = "ADC IV Chart View ";
     int mnTitleMode = 0;
 
   private: