sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xueyan hu
2022-01-25 17:04:14 +08:00
parent 0bb2ec20bc e62b1fbe66
commit bcc6ce1a13
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

2
src/ScanFormWidget.cpp
View File

@@ -206,7 +206,7 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) {
painter.drawLine(800 - borderSpacing, borderSpacing + 1, 800 - borderSpacing, 800 - borderSpacing - 1); painter.drawLine(800 - borderSpacing, borderSpacing + 1, 800 - borderSpacing, 800 - borderSpacing - 1);
pen.setColor(QColor(255, 255, 0)); pen.setColor(QColor(255, 255, 0));
painter.setPen(pen); 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(borderSpacing + 13, 400 + 13, "L");
painter.drawText(800 - borderSpacing - 30, 400 + 13, "R"); painter.drawText(800 - borderSpacing - 30, 400 + 13, "R");
painter.drawText(400 - 13, borderSpacing + 30, "H"); painter.drawText(400 - 13, borderSpacing + 30, "H");

1
src/ScanFormWidget.h
View File

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

1
src/json/cmdhelper.cpp
View File

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