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

Fix merge bug 3

Browse Source
This commit is contained in:
Krad
2021-12-08 10:52:38 +08:00
parent 7d0d6600e6
commit fb6a46cc45
8 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SelectDialog.cpp
View File

@@ -30,6 +30,6 @@ QString SelectDialog::getSelectedValue() {
return box->getSelectedValue(); return box->getSelectedValue();
} }
void SelectDialog::setSelectedValue(QString & val) { void SelectDialog::setSelectedValue(const QString & val) {
box->setSelectedValue(val); box->setSelectedValue(val);
} }

2
src/SelectDialog.h
View File

@@ -14,7 +14,7 @@ public:
~SelectDialog() override; ~SelectDialog() override;
void setAvailableDates(QStringList dates); void setAvailableDates(QStringList dates);
QString getSelectedValue(); QString getSelectedValue();
void setSelectedValue(QString& val); void setSelectedValue(const QString& val);
protected: protected:
bool updateReferenceData() override; bool updateReferenceData() override;
SlidePickerBox* box = nullptr; SlidePickerBox* box = nullptr;

2
src/components/SlidePickerBox.cpp
View File

@@ -211,7 +211,7 @@ void SlidePickerBox::hideLabel(QLabel *label) {
label->move(lp); label->move(lp);
} }
void SlidePickerBox::setSelectedValue(QString& val) { void SlidePickerBox::setSelectedValue(const QString& val) {
qDebug()<<"set value:"<<val; qDebug()<<"set value:"<<val;
for (int i = 0; i < lbls.count() ; ++i) { for (int i = 0; i < lbls.count() ; ++i) {
if(lbls[i]->text() == val) { if(lbls[i]->text() == val) {

2
src/components/SlidePickerBox.h
View File

@@ -17,7 +17,7 @@ public:
{ {
this->items.append(item); this->items.append(item);
} }
void setSelectedValue(QString& val); void setSelectedValue(const QString& val);
protected: protected:
bool isDragging; bool isDragging;

14
src/json/jsonobject.cpp
View File

@@ -7,7 +7,7 @@
#include <QTranslator> #include <QTranslator>
#include <QDebug> #include <QDebug>
#include <QApplication> #include <QApplication>
#include "json/cJSON.h"
const char* strProductFileName = "./cfgs/usct-product.json"; const char* strProductFileName = "./cfgs/usct-product.json";
JsonObject::JsonObject() JsonObject::JsonObject()
@@ -24,7 +24,7 @@ void JsonObject::setJsonString(const char* catergory, const char* stringName, co
if (!loadcfg()) if (!loadcfg())
return; return;
cJSON* first = cJSON_FindItemInObject(json_root, catergory); cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, catergory);
if (!first) return; if (!first) return;
cJSON* Item = cJSON_CreateString(stringValue); cJSON* Item = cJSON_CreateString(stringValue);
@@ -38,7 +38,7 @@ char* JsonObject::getJsonString(const char* catergory, const char* stringName)
if (!loadcfg()) if (!loadcfg())
return ""; return "";
cJSON* first = cJSON_FindItemInObject(json_root, catergory); cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, catergory);
if (!first) return ""; if (!first) return "";
cJSON* second = cJSON_FindItemInObject(first, stringName); cJSON* second = cJSON_FindItemInObject(first, stringName);
@@ -53,7 +53,7 @@ QStringList JsonObject::protocals()
if (!loadcfg()) if (!loadcfg())
return QStringList(); return QStringList();
cJSON* first = cJSON_FindItemInObject(json_root, "protocol"); cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, "protocol");
if (!first) return QStringList(); if (!first) return QStringList();
cJSON* second = cJSON_FindItemInObject(first, "lists"); cJSON* second = cJSON_FindItemInObject(first, "lists");
@@ -90,7 +90,7 @@ QStringList JsonObject::worklistFilters()
if (!loadcfg()) if (!loadcfg())
return QStringList(); return QStringList();
cJSON* first = cJSON_FindItemInObject(json_root, "worklistfilter"); cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, "worklistfilter");
if (!first) return QStringList(); if (!first) return QStringList();
cJSON* second = cJSON_FindItemInObject(first, "lists"); cJSON* second = cJSON_FindItemInObject(first, "lists");
@@ -107,7 +107,7 @@ QStringList JsonObject::language()
if (!loadcfg()) if (!loadcfg())
return QStringList(); return QStringList();
cJSON* first = cJSON_FindItemInObject(json_root, "general"); cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, "general");
if (!first) return QStringList(); if (!first) return QStringList();
cJSON* second = cJSON_FindItemInObject(first, "language"); cJSON* second = cJSON_FindItemInObject(first, "language");
@@ -220,7 +220,7 @@ bool JsonObject::savecfg()
return -1; return -1;
} }
char* strJsonData = cJSON_Print(json_root); char* strJsonData = cJSON_Print((cJSON*)json_root);
std::stringstream ss; std::stringstream ss;
ss << strJsonData; ss << strJsonData;
outFile << ss.rdbuf(); outFile << ss.rdbuf();

3
src/json/jsonobject.h
View File

@@ -2,7 +2,6 @@
#define JSONOBJECT_H #define JSONOBJECT_H
//#include <QObject> //#include <QObject>
#include "json/cJSON.h"
class QString; class QString;
class QStringList; class QStringList;
class QTranslator; class QTranslator;
@@ -59,7 +58,7 @@ private:
JsonObject(); JsonObject();
~JsonObject(); ~JsonObject();
cJSON* json_root = nullptr; void* json_root = nullptr;
bool m_bLoaded = false; bool m_bLoaded = false;
int counter; int counter;

1
src/mainwindow.cpp
View File

@@ -236,6 +236,7 @@ MainWindow::MainWindow(QWidget* parent) :
msgDialog = nullptr; msgDialog = nullptr;
AppGlobalValues::setInProcessing(false); AppGlobalValues::setInProcessing(false);
}); });
DeviceManager::Default()->initDevice();
centerWidgetHide(); centerWidgetHide();
} }