lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://cd.holdtecs.net:8099/sane/code_production

This commit is contained in:
luoliangyi 2022-12-15 15:13:38 +08:00
parent 557df34598 fae6326c7e
commit 6dae1765c4
14 changed files with 323 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/HGProductionTool/HGProductionTool.pro
View File

@ -25,6 +25,7 @@ win32 {
contains(QT_ARCH, i386) {
LIBS += -L../../../sdk/lib/win/x86/Release -lHGBase -lHGImgFmt -lHGImgProc
LIBS += -L../../../sdk/lib/win/x86/OEM/huagao -lsane
LIBS += -L../../code/base/Debug/ -ltest
CONFIG(release, debug|release) {
LIBS += -L../../db/Release -lHGPdtToolDb
DESTDIR = ../../../release/win/x86/Release
@ -36,7 +37,6 @@ win32 {
contains(QT_ARCH, x86_64){
LIBS += -L../../../sdk/lib/win/x64/Release -lHGBase -lHGImgFmt -lHGImgProc
LIBS += -L../../../sdk/lib/win/x64/OEM/huagao -lsane
CONFIG(release, debug|release) {
LIBS += -L../../db/x64/Release -lHGPdtToolDb
DESTDIR = ../../../release/win/x64/Release
@ -62,8 +62,10 @@ SOURCES += \
dialog_uploadcfgfile.cpp \
form_maininterface.cpp \
form_texttips.cpp \
hgscanner.cpp \
main.cpp \
mainwindow.cpp
mainwindow.cpp \
ui_helper.cpp
HEADERS += \
HGImgView.h \
@ -76,7 +78,9 @@ HEADERS += \
dialog_uploadcfgfile.h \
form_maininterface.h \
form_texttips.h \
mainwindow.h
hgscanner.h \
mainwindow.h \
ui_helper.h
FORMS += \
dialog_accountmanage.ui \

BIN
app/HGProductionTool/ProductionTool_zh_CN.qm
View File

Binary file not shown.

2
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -257,7 +257,7 @@
<message>
<location filename="dialog_uploadcfgfile.ui" line="32"/>
<source>select file</source>
<translation>选择目录</translation>
<translation type="unfinished">选择文件</translation>
</message>
<message>
<location filename="dialog_uploadcfgfile.ui" line="43"/>

9
app/HGProductionTool/analysisjson.cpp
View File

@ -4,6 +4,7 @@
#include <QJsonArray>
#include <QDir>
#include <QFileInfo>
#include <QDebug>
AnalysisJson::AnalysisJson(QString path)
{
@ -23,7 +24,13 @@ std::vector<AnalysisJson::json_node> AnalysisJson::GetNode()
if(!m_json.isObject())
return nodes;
auto obj = m_json.object();
for(auto key : obj.keys())
auto keys = obj.keys().toVector();
std::sort(keys.begin(),keys.end(),[](QString x,QString y){
return x.toInt()<y.toInt();
});
for(auto key : keys)
{
if(key != "global")
nodes.push_back(json_node{obj[key].toObject()["title"].toString(),

1
app/HGProductionTool/dialog_uploadcfgfile.cpp
View File

@ -12,6 +12,7 @@ Dialog_uploadCfgFile::Dialog_uploadCfgFile(HGPdtToolDbUserMgr pdtToolDbuserMgr,
ui(new Ui::Dialog_uploadCfgFile)
{
ui->setupUi(this);
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
}
Dialog_uploadCfgFile::~Dialog_uploadCfgFile()

38
app/HGProductionTool/hgscanner.cpp Normal file
View File

@ -0,0 +1,38 @@
#include "hgscanner.h"
hgscanner::hgscanner(SANE_Handle h):devHandle_(h)
{
}
hgscanner::~hgscanner()
{
}
parameter* hgscanner::get_user_input(data_from from, value_type type, const wchar_t* title, const wchar_t* desc)
{
return nullptr;
}
void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, size_t flag)
{
}
int hgscanner::register_sane_callback(sane_callback cb, void* param)
{
return 0;
}
int hgscanner::unregister_sane_callback(sane_callback cb)
{
return 0;
}
int hgscanner::io_control(unsigned long code, void* data, unsigned* len)
{
sane_io_control(devHandle_, code, data, len);
return 0;
}

20
app/HGProductionTool/hgscanner.h Normal file
View File

@ -0,0 +1,20 @@
#pragma once
#include "sane/sane_ex.h"
#include "ui_helper.h"
#include "test_base.h"
class hgscanner :public ui_helper
{
public:
hgscanner(SANE_Handle h);
~hgscanner();
virtual parameter* get_user_input(data_from from, value_type type, const wchar_t* title, const wchar_t* desc = NULL);
virtual void test_callback(const wchar_t* name/*test name*/, test_event ev, void* data, size_t flag);
virtual int register_sane_callback(sane_callback cb, void* param);
virtual int unregister_sane_callback(sane_callback cb);
virtual int io_control(unsigned long code, void* data, unsigned* len);
private:
SANE_Handle devHandle_;
};

70
app/HGProductionTool/mainwindow.cpp
View File

@ -7,6 +7,7 @@
#include "dialog_changepwd.h"
#include "dialog_accountmanage.h"
#include "dialog_uploadcfgfile.h"
#include "hgscanner.h"
MainWindow::MainWindow(HGPdtToolDbUserMgr userMgr, QWidget *parent)
: QMainWindow(parent)
@ -16,11 +17,18 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr userMgr, QWidget *parent)
, m_top_splitter(nullptr)
, m_bot_splitter(nullptr)
, m_splitterCount(1)
, m_handle(nullptr)
, m_isLogOut(false)
{
ui->setupUi(this);
setWindowIcon(QIcon(":image/image_rsc/logo/logo.ico"));
connect(this, SIGNAL(sane_dev_arrive(QString)), this, SLOT(on_sane_dev_arrive(QString)), Qt::QueuedConnection);
connect(this, SIGNAL(sane_dev_remove(QString)), this, SLOT(on_sane_dev_remove(QString)), Qt::QueuedConnection);
SANE_Int v = 0;
sane_init_ex(&v, sane_ex_callback, this);
HGUInt userType = 0;
HGPdtToolDb_GetUserType(m_pdtToolDbuserMgr, &userType);
if (userType == HGPDTTOOLDB_USERTYPE_NORMAL)
@ -56,6 +64,64 @@ bool MainWindow::isExitApp()
return !m_isLogOut;
}
int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigned int *len, void *param)
{
(void)hdev;
(void)len;
MainWindow *p = (MainWindow *)param;
switch (code)
{
case SANE_EVENT_DEVICE_ARRIVED:
{
SANE_Device_Ex* sane_dev = (SANE_Device_Ex*)data;
emit p->sane_dev_arrive(sane_dev->name);
}
break;
case SANE_EVENT_DEVICE_LEFT:
{
SANE_Device* sane_dev = (SANE_Device*)data;
emit p->sane_dev_remove(sane_dev->name);
}
break;
}
return 0;
}
std::vector<std::string> MainWindow::getDevices()
{
std::vector<std::string> name;
const SANE_Device** devs_list;
SANE_Status status = SANE_STATUS_GOOD;
if ((status = sane_get_devices(&devs_list, SANE_TRUE)) != SANE_STATUS_GOOD)
{
name.push_back("");
return name;
}
name.clear();
while (*devs_list != NULL)
{
name.push_back((*devs_list)->name);
devs_list++;
}
return name;
}
void MainWindow::on_sane_dev_arrive(QString devName)
{
SANE_Status ret = sane_open(devName.toStdString().c_str(), &m_handle);
ui_helper* helper;
hgscanner* hg = new hgscanner(m_handle);
helper = dynamic_cast<hgscanner*>(hg);
func_test_go(L"test-31", L"null", helper);
}
void MainWindow::on_sane_dev_remove(QString devName)
{
}
void MainWindow::on_act_newDevice_triggered()
{
m_splitterCount++;
@ -156,6 +222,6 @@ QString MainWindow::getLogInfo(HGResult ret)
void MainWindow::on_act_upload_triggered()
{
Dialog_uploadCfgFile dlg(m_pdtToolDbuserMgr, this);
dlg.exec();
// Dialog_uploadCfgFile dlg(m_pdtToolDbuserMgr, this);
//dlg.exec();
}

20
app/HGProductionTool/mainwindow.h
View File

@ -6,12 +6,12 @@
#include <QtWidgets>
#include <QSplitter>
#include "HGPdtToolDb.h"
#include "sane/sane_ex.h"
QT_BEGIN_NAMESPACE
namespace Ui { class MainWindow; }
QT_END_NAMESPACE
class MainWindow : public QMainWindow
class MainWindow : public QMainWindow
{
Q_OBJECT
@ -20,9 +20,22 @@ public:
~MainWindow();
static QString getLogInfo(HGResult ret);
bool isExitApp();
private:
static int sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param);
std::vector<std::string> getDevices();
signals:
void sane_dev_arrive(QString devName);
void sane_dev_remove(QString devName);
private slots:
void on_sane_dev_arrive(QString devName);
void on_sane_dev_remove(QString devName);
private slots:
void on_act_newDevice_triggered();
@ -41,6 +54,7 @@ private slots:
private:
QSplitter *m_top_splitter;
QSplitter *m_bot_splitter;
SANE_Handle m_handle;
int m_splitterCount;
bool m_isLogOut;

39
app/HGProductionTool/ui_helper.cpp Normal file
View File

@ -0,0 +1,39 @@
#include "ui_helper.h"
size_t parameter::get_size(void)
{
return size_t();
}
void* parameter::get_data(void)
{
return nullptr;
}
int ui_helper::register_sane_callback(sane_callback cb, void* param)
{
return 0;
}
int ui_helper::unregister_sane_callback(sane_callback cb)
{
return 0;
}
int ui_helper::io_control(unsigned long code, void* data, unsigned* len)
{
return 0;
}
ui_helper::ui_helper()
{
}
parameter* ui_helper::get_user_input(data_from from, value_type type, const wchar_t* title, const wchar_t* desc)
{
return nullptr;
}
void ui_helper::test_callback(const wchar_t* name/*test name*/, test_event ev, void* data, size_t flag)
{
}

95
app/HGProductionTool/ui_helper.h Normal file
View File

@ -0,0 +1,95 @@
#include <Windows.h>
#include "sane/sane_ex.h"
#include <string>
#include <memory>
#include <vector>
#pragma once
class ref
{
volatile long ref_;
public:
ref() : ref_(1)
{}
protected:
virtual ~ref()
{}
public:
long add_ref(void)
{
return _InterlockedIncrement(&ref_);
}
long release(void)
{
long r = _InterlockedDecrement(&ref_);
if (r == 0)
delete this;
return r;
}
};
class parameter : public ref
{
public:
parameter()
{}
protected:
virtual ~parameter()
{}
public:
virtual size_t get_size(void) =0;
virtual void* get_data(void) = 0; // return data pointer, bool*, int*, double*, (wchar_t*)
};
class ui_helper : public ref
{
public:
ui_helper();
public:
virtual ~ui_helper()
{}
public:
enum data_from
{
DATA_FROM_KNOWN = 0, // pre-defined data name, i.e. resulotion, paper, bright, ...
DATA_FROM_USER, // need a window for user inputing
};
enum value_type
{
VAL_TYPE_BOOL = 0,
VAL_TYPE_INT,
VAL_TYPE_FLOAT,
VAL_TYPE_STRING,
VAL_TYPE_CUSTOM, // custom data, such as gamma table ...
};
// get testing parameter ...
virtual parameter* get_user_input(data_from from, value_type type
, const wchar_t* title // window title when from == DATA_FROM_USER, or parameter name when from == DATA_FROM_KNOWN
, const wchar_t* desc = NULL // description of the parameter if from was DATA_FROM_USER, unused in DATA_FROM_KNOWN
) =0;
enum test_event
{
TEST_EVENT_TIPS = 0, // messages in testing process, data is (wchar_t*), flag is unused
TEST_EVENT_xxx, // should be complemented ...
TEST_EVENT_RESULT, // test result, data is (wchar_t*)description, flag is (bool)result, true - test pass
};
virtual void test_callback(const wchar_t* name/*test name*/, test_event ev, void* data, size_t flag)=0 ;
// register/unregister sane callback, the sane_callback in UI module should dispatch the events to these registered callback
virtual int register_sane_callback(sane_callback cb, void* param) =0;
virtual int unregister_sane_callback(sane_callback cb) =0;
// All IO operations are blocking
virtual int io_control(unsigned long code, void* data, unsigned* len) =0;
};

11
code/base/test.vcxproj
View File

@ -71,7 +71,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>..\..\..\sdk\include;$(IncludePath)</IncludePath>
<IncludePath>..\..\..\sdk\include;..\..\app\HGProductionTool\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\sdk\include;..\..\app\HGProductionTool\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\sdk\include;..\..\app\HGProductionTool\;</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\sdk\include;..\..\app\HGProductionTool\;</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

68
code/base/test_base.cpp
View File

@ -12,7 +12,6 @@ static struct Test_Map
const wchar_t* title; //"Íáб¼ì²â"
const int ver;
io_code num;
}Test_Map_NO[] =
{
{HGPDTTOOLDB_NAME_DIAL_SWITCH ,HGPDTTOOLDB_TITLE_DIAL_SWITCH ,0,IO_CTRL_CODE_BASE},
@ -46,11 +45,12 @@ Test_Map_Bool[]
{HGPDTTOOLDB_NAME_REBOOT_DEVICE ,HGPDTTOOLDB_TITLE_REBOOT_DEVICE ,0,IO_CTRL_CODE_BASE},
{HGPDTTOOLDB_NAME_MECH_PAPER_FEEDING_INCLINATION,HGPDTTOOLDB_TITLE_MECH_PAPER_FEEDING_INCLINATION ,0,IO_CTRL_CODE_BASE},
{HGPDTTOOLDB_NAME_CLEAR_ROLLER_COUNT ,HGPDTTOOLDB_TITLE_CLEAR_ROLLER_COUNT,0,IO_CTRL_CODE_SET_CLEAR_ROLLER_COUNT},
{HGPDTTOOLDB_NAME_SINGLE_PAGE_TEST_1 ,HGPDTTOOLDB_TITLE_SINGLE_PAGE_TEST_1,0,IO_CTRL_CODE_TEST_SINGLE},
},
Test_Map_String[]
{
{HGPDTTOOLDB_NAME_CLEAR_ROLLER_COUNT ,HGPDTTOOLDB_TITLE_CLEAR_ROLLER_COUNT,0,IO_CTRL_CODE_SET_CLEAR_ROLLER_COUNT},
{L"123" ,HGPDTTOOLDB_TITLE_CLEAR_ROLLER_COUNT,0,IO_CTRL_CODE_SET_CLEAR_ROLLER_COUNT},
},
Test_Map_Int[]
{
@ -58,7 +58,7 @@ Test_Map_Int[]
{HGPDTTOOLDB_NAME_CONFIGURE_SPEED_MODE ,HGPDTTOOLDB_TITLE_CONFIGURE_SPEED_MODE ,0,IO_CTRL_CODE_BASE},
{HGPDTTOOLDB_NAME_DORMANCY ,HGPDTTOOLDB_TITLE_DORMANCY ,0,IO_CTRL_CODE_SET_POWER_LEVEL},
{HGPDTTOOLDB_NAME_SKEW_GEAR ,HGPDTTOOLDB_TITLE_SKEW_GEAR,0,IO_CTRL_CODE_SET_SKEW_CHECK_VAL},
{HGPDTTOOLDB_NAME_SINGLE_PAGE_TEST_1 ,HGPDTTOOLDB_TITLE_SINGLE_PAGE_TEST_1,0,IO_CTRL_CODE_TEST_SINGLE},
{HGPDTTOOLDB_NAME_SINGLE_PAGE_TEST_2 ,HGPDTTOOLDB_TITLE_SINGLE_PAGE_TEST_2,0,IO_CTRL_CODE_TEST_SINGLE},
{HGPDTTOOLDB_NAME_SINGLE_PAGE_TEST_3 ,HGPDTTOOLDB_TITLE_SINGLE_PAGE_TEST_3,0,IO_CTRL_CODE_TEST_SINGLE},
{HGPDTTOOLDB_NAME_PRESSUER_TEST ,HGPDTTOOLDB_TITLE_PRESSUER_TEST ,0,IO_CTRL_CODE_BASE},
@ -66,7 +66,7 @@ Test_Map_Int[]
//test
static std::string jsontext1("{\"1\":{\"name\":\"test-8\",\"ver\":1}}");
int sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param)
int sane_ex_callback1(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param)
{
switch (code)
{
@ -153,22 +153,23 @@ int get_json_config_file()
fclose(fp);
std::cout << buf << std::endl;
}
int func_test_init(void* init)
DECL_API(int) func_test_init(void* init)
{
return 0;
}
int func_test_get_list(wchar_t* buf, size_t* len)
DECL_API(int) func_test_get_list(wchar_t* buf, size_t* len)
{
return str_to_wchar(jsontext1, buf, len);
}
int func_test_go(const wchar_t* name, const wchar_t* oper, ui_helper* helper)
DECL_API(int) func_test_go(const wchar_t* name, const wchar_t* oper, ui_helper* helper)
{
if (!name || !oper || !helper)
{
return -1;
}
helper->add_ref();
helper->register_sane_callback(sane_ex_callback, NULL);
//helper->add_ref();
helper->register_sane_callback(sane_ex_callback1, NULL);
bool flag = false;
wchar_t* des = NULL;
@ -185,16 +186,15 @@ int func_test_go(const wchar_t* name, const wchar_t* oper, ui_helper* helper)
{
SANE_Bool map_bool = true;
unsigned int len = sizeof(SANE_Bool);
ret = helper->io_control(Test_Map_Bool[i].num,&map_bool, &len);
ret = helper->io_control(Test_Map_Bool[i].num,(void *)&map_bool, &len);
if (ret == SCANNER_ERR_OK)
{
ev = ui_helper::TEST_EVENT_RESULT;
helper->test_callback(Test_Map_Bool[i].name, ev, des, true);
map_bool = false;
ret = helper->io_control(Test_Map_Bool[i].num, &map_bool, &len);
return SCANNER_ERR_OK;
}
return SCANNER_ERR_OK;
}
else if(wcscmp(name, Test_Map_String[i].name) == 0)
{
@ -209,11 +209,12 @@ int func_test_go(const wchar_t* name, const wchar_t* oper, ui_helper* helper)
return SCANNER_ERR_OK;
}
}
helper->release();
helper->unregister_sane_callback(sane_ex_callback);
ret = helper->io_control(IO_CTRL_CODE_RESTORE_SETTINGS, NULL, NULL);
//helper->release();
//helper->unregister_sane_callback(sane_ex_callback);
return SCANNER_ERR_OK;
}
int func_test_uninit(void* uninit)
DECL_API(int) func_test_uninit(void* uninit)
{
return 0;
}
@ -221,41 +222,4 @@ int func_test_uninit(void* uninit)
int main11()
{
/*get_json_config_file();
int ret = 0;
wchar_t* str_wchar = NULL;
size_t len = 0;
ret = func_test_get_list(str_wchar, &len);
if (ret == ERROR_INSUFFICIENT_BUFFER)
{
str_wchar = new wchar_t[len];
ret = func_test_get_list(str_wchar, &len);
}
ret = func_test_go(L"test-5",L"start",NULL);*/
//std::wcout << str_wchar << std::endl;
return 0;
}
parameter* ui_helper::get_user_input(data_from from, value_type type, const wchar_t* title, const wchar_t* desc = NULL)
{
}
int ui_helper::register_sane_callback(sane_callback cb, void* param)
{
return 0;
}
int ui_helper::unregister_sane_callback(sane_callback cb)
{
return 0;
}
int ui_helper::io_control(unsigned long code, void* data, unsigned* len)
{
return 0;
}
void ui_helper::test_callback(const wchar_t* name/*test name*/, test_event ev, void* data, size_t flag)
{
}

93
code/base/test_base.h
View File

@ -1,7 +1,8 @@
#pragma once
#include "string"
#include "sane/sane_ex.h"
#include "ui_helper.h"
#include <Windows.h>
//////////////////////////////////////TITLE//////////////////////////////////////
/* 拨码开关校验 */
#define HGPDTTOOLDB_TITLE_DIAL_SWITCH L"拨码开关校验"
@ -146,95 +147,7 @@
/* 清除滚轴计数 */
#define HGPDTTOOLDB_NAME_CLEAR_ROLLER_COUNT L"test-35"
class ref
{
volatile long ref_;
public:
ref() : ref_(1)
{}
protected:
virtual ~ref()
{}
public:
long add_ref(void)
{
return _InterlockedIncrement(&ref_);
}
long release(void)
{
long r = _InterlockedDecrement(&ref_);
if (r == 0)
delete this;
return r;
}
};
class parameter : public ref
{
public:
parameter()
{}
protected:
virtual ~parameter()
{}
public:
virtual size_t get_size(void) = 0;
virtual void* get_data(void) = 0; // return data pointer, bool*, int*, double*, (wchar_t*)
};
class ui_helper : public ref
{
public:
ui_helper()
{}
protected:
virtual ~ui_helper()
{}
public:
enum data_from
{
DATA_FROM_KNOWN = 0, // pre-defined data name, i.e. resulotion, paper, bright, ...
DATA_FROM_USER, // need a window for user inputing
};
enum value_type
{
VAL_TYPE_BOOL = 0,
VAL_TYPE_INT,
VAL_TYPE_FLOAT,
VAL_TYPE_STRING,
VAL_TYPE_CUSTOM, // custom data, such as gamma table ...
};
// get testing parameter ...
virtual parameter* get_user_input(data_from from, value_type type
, const wchar_t* title // window title when from == DATA_FROM_USER, or parameter name when from == DATA_FROM_KNOWN
, const wchar_t* desc = NULL // description of the parameter if from was DATA_FROM_USER, unused in DATA_FROM_KNOWN
) = 0;
enum test_event
{
TEST_EVENT_TIPS = 0, // messages in testing process, data is (wchar_t*), flag is unused
TEST_EVENT_xxx, // should be complemented ...
TEST_EVENT_RESULT, // test result, data is (wchar_t*)description, flag is (bool)result, true - test pass
};
virtual void test_callback(const wchar_t* name/*test name*/, test_event ev, void* data, size_t flag) = 0;
// register/unregister sane callback, the sane_callback in UI module should dispatch the events to these registered callback
virtual int register_sane_callback(sane_callback cb, void* param) = 0;
virtual int unregister_sane_callback(sane_callback cb) = 0;
// All IO operations are blocking
virtual int io_control(unsigned long code, void* data, unsigned* len) = 0;
};
#define TEST_DLL
#ifdef TEST_DLL
#define DECL_API(ret) __declspec(dllexport) ret __stdcall
#else