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

Compare commits

base: lmh188:fb387e6837dd2c191fdf49da806b7487ea354064
Branches Tags
lmh188:master
lmh188:dev
lmh188:twain
lmh188:conservative
lmh188:release
lmh188:v4.52.1
lmh188:v4.52
lmh188:qiming_v.4.51.23297
lmh188:v4.51
lmh188:v4.50
lmh188:hw-2022.0523
...
compare: lmh188:2eeaa33974c522f7fd10d01f94ffaf80836a55d7
Branches Tags
lmh188:dev
lmh188:master
lmh188:twain
lmh188:conservative
lmh188:release
lmh188:v4.52.1
lmh188:v4.52
lmh188:qiming_v.4.51.23297
lmh188:v4.51
lmh188:v4.50
lmh188:hw-2022.0523

2 Commits
fb387e6837 ... 2eeaa33974

Author SHA1 Message Date
luoliangyi 2eeaa33974 微调 2024-04-25 17:04:11 +08:00
luoliangyi cd3ca8c6f9 微调 2024-04-25 16:43:58 +08:00
2 changed files with 34 additions and 15 deletions
Show Stats Expand all files Collapse all files

27
app/scantool/form_deviceconfig.cpp
View File

@ -25,7 +25,7 @@ Form_DeviceConfig::Form_DeviceConfig(SANE_Handle devHandle, const std::vector<De
{
for (int n = 0; n < (int)deviceConfigsGroups[m].deviceConfigs.size(); ++n)
{
DeviceConfig &deviceConfig = deviceConfigsGroups[m].deviceConfigs[n];
DeviceConfigEx &deviceConfig = deviceConfigsGroups[m].deviceConfigs[n];
if (deviceConfig.name == deviceConfigs[i].name && deviceConfig.valueType == deviceConfigs[i].valueType)
{
deviceConfig.stringValue = deviceConfigs[i].stringValue;
@ -60,7 +60,7 @@ std::vector<DeviceConfig> Form_DeviceConfig::GetDeviceConfigs()
{
for (int j = 0; j < (int)m_baseDeviceConfigsGroups[i].deviceConfigs.size(); ++j)
{
const DeviceConfig &deviceConfig = m_baseDeviceConfigsGroups[i].deviceConfigs[j];
const DeviceConfigEx &deviceConfig = m_baseDeviceConfigsGroups[i].deviceConfigs[j];
QWidget *ctrl = nullptr;
for (int k = 0; k < (int)m_ctrlList.size(); ++k)
@ -76,7 +76,6 @@ std::vector<DeviceConfig> Form_DeviceConfig::GetDeviceConfigs()
{
DeviceConfig dc;
dc.name = deviceConfig.name;
dc.title = deviceConfig.title;
dc.valueType = deviceConfig.valueType;
if (1 == deviceConfig.rangeType)
@ -123,7 +122,7 @@ std::vector<DeviceConfig> Form_DeviceConfig::GetDeviceConfigs()
{
assert(3 == deviceConfig.valueType);
QSlider *slider = (QSlider *)ctrl;
if (deviceConfig.doubleValue * 100 != slider->value())
if (round(deviceConfig.doubleValue * 100) != slider->value())
{
dc.doubleValue = slider->value() / 100.0;
deviceConfigs.push_back(dc);
@ -216,7 +215,7 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
char value[256] = { 0 };
sane_control_option(devHandle, i, SANE_ACTION_GET_VALUE, value, NULL);
DeviceConfig devConfig;
DeviceConfigEx devConfig;
devConfig.name = name;
devConfig.title = title;
devConfig.valueType = 1;
@ -241,7 +240,7 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
SANE_Int value = 0;
sane_control_option(devHandle, i, SANE_ACTION_GET_VALUE, &value, NULL);
DeviceConfig devConfig;
DeviceConfigEx devConfig;
devConfig.name = name;
devConfig.title = title;
devConfig.valueType = 2;
@ -271,7 +270,7 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
SANE_Word value = 0;
sane_control_option(devHandle, i, SANE_ACTION_GET_VALUE, &value, NULL);
DeviceConfig devConfig;
DeviceConfigEx devConfig;
devConfig.name = name;
devConfig.title = title;
devConfig.valueType = 3;
@ -301,7 +300,7 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
SANE_Bool value = 0;
sane_control_option(devHandle, i, SANE_ACTION_GET_VALUE, &value, NULL);
DeviceConfig devConfig;
DeviceConfigEx devConfig;
devConfig.name = name;
devConfig.title = title;
devConfig.valueType = 4;
@ -340,7 +339,7 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
for (int j = 0; j < (int)m_baseDeviceConfigsGroups[i].deviceConfigs.size(); ++j)
{
const DeviceConfig &deviceConfig = m_baseDeviceConfigsGroups[i].deviceConfigs[j];
const DeviceConfigEx &deviceConfig = m_baseDeviceConfigsGroups[i].deviceConfigs[j];
// 创建Label
QLabel *label = new QLabel;
@ -389,8 +388,8 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
assert(3 == deviceConfig.valueType);
QSlider *slider = new QSlider;
slider->setOrientation(Qt::Horizontal);
slider->setRange(deviceConfig.doubleValueMin * 100, deviceConfig.doubleValueMax * 100);
//slider->setValue(deviceConfig.doubleValue * 100);
slider->setRange(round(deviceConfig.doubleValueMin * 100), round(deviceConfig.doubleValueMax * 100));
//slider->setValue(round(deviceConfig.doubleValue * 100));
ctrl = slider;
}
else if (0 == deviceConfig.rangeType)
@ -407,7 +406,7 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
#else
spinBox->setMinimumWidth(150);
#endif
spinBox->setRange(1, 1000);
spinBox->setRange(-1, 1000);
//spinBox->setValue(deviceConfig.intValue);
ctrl = spinBox;
}
@ -442,7 +441,7 @@ void Form_DeviceConfig::Update(std::vector<DeviceConfigsGroup> &deviceConfigsGro
{
for (int j = 0; j < (int)deviceConfigsGroups[i].deviceConfigs.size(); ++j)
{
const DeviceConfig &deviceConfig = deviceConfigsGroups[i].deviceConfigs[j];
const DeviceConfigEx &deviceConfig = deviceConfigsGroups[i].deviceConfigs[j];
QWidget *ctrl = nullptr;
for (int k = 0; k < (int)m_ctrlList.size(); ++k)
@ -484,7 +483,7 @@ void Form_DeviceConfig::Update(std::vector<DeviceConfigsGroup> &deviceConfigsGro
{
assert(3 == deviceConfig.valueType);
QSlider *slider = (QSlider *)ctrl;
slider->setValue(deviceConfig.doubleValue * 100);
slider->setValue(round(deviceConfig.doubleValue * 100));
}
else if (0 == deviceConfig.rangeType)
{

22
app/scantool/form_deviceconfig.h
View File

@ -9,6 +9,26 @@
struct DeviceConfig
{
DeviceConfig()
{
valueType = 0;
intValue = 0;
doubleValue = 0;
boolValue = false;
}
// 配置名
std::string name;
// 配置值
int valueType; // 0-无，1-字符串，2-整型，3-浮点，4-布尔
std::string stringValue;
int intValue;
double doubleValue;
bool boolValue;
};
struct DeviceConfigEx
{
DeviceConfigEx()
{
valueType = 0;
intValue = 0;
@ -47,7 +67,7 @@ struct DeviceConfig
struct DeviceConfigsGroup
{
std::string groupTitle;
std::vector<DeviceConfig> deviceConfigs;
std::vector<DeviceConfigEx> deviceConfigs;
};
class Form_DeviceConfig : public QWidget