Merge branch 'master' of http://192.168.1.178:3000/kradchen/GUI

CMakeLists.txt

@@ -11,7 +11,7 @@ file(GLOB_RECURSE  project_cxx ./src/*.cxx)
 file(GLOB_RECURSE  project_cc ./src/*.cc)
 
 if(UNIX)
-set(USE_SHIMLIB OFF)
+set(USE_SHIMLIB ON)
 else()
 set(USE_SHIMLIB OFF)
 endif()

src/ScanFormWidget.cpp

@@ -206,7 +206,7 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) {
 		painter.drawLine(800 - borderSpacing, borderSpacing + 1, 800 - borderSpacing, 800 - borderSpacing - 1);
 		pen.setColor(QColor(255, 255, 0));
 		painter.setPen(pen);
-		//        painter.drawText(335,40,"Previewing");
+		painter.drawText(335,40,QString("Previewing, current frame:%1").arg(++currentFrame));
 		painter.drawText(borderSpacing + 13, 400 + 13, "L");
 		painter.drawText(800 - borderSpacing - 30, 400 + 13, "R");
 		painter.drawText(400 - 13, borderSpacing + 30, "H");

src/ScanFormWidget.h

@@ -19,6 +19,7 @@ private:
     bool unset = true;
     bool previewing= false;
     std::function<void(bool)> previewfunc = nullptr;
+    int currentFrame = 0;
 private slots:
     void protocolChanged(int type);
 

src/json/cmdhelper.cpp

@@ -62,6 +62,7 @@ bool cmdHelper::getDiskUsed(double& used)
 	{
 		QString qstr = QString::fromStdString(str);
 		QStringList strList = qstr.split('\n');
+		if (strList.length()<3) return false;
 		strList[1].replace(QRegExp("[\\s]+"), " ");
 		QStringList strList2 = strList[1].split(" ");
 		int pos = strList2[2].lastIndexOf(QChar('G'));