This commit is contained in:
parent
fb387e6837
commit
cd3ca8c6f9
|
@ -123,7 +123,7 @@ std::vector<DeviceConfig> Form_DeviceConfig::GetDeviceConfigs()
|
||||||
{
|
{
|
||||||
assert(3 == deviceConfig.valueType);
|
assert(3 == deviceConfig.valueType);
|
||||||
QSlider *slider = (QSlider *)ctrl;
|
QSlider *slider = (QSlider *)ctrl;
|
||||||
if (deviceConfig.doubleValue * 100 != slider->value())
|
if (round(deviceConfig.doubleValue * 100) != slider->value())
|
||||||
{
|
{
|
||||||
dc.doubleValue = slider->value() / 100.0;
|
dc.doubleValue = slider->value() / 100.0;
|
||||||
deviceConfigs.push_back(dc);
|
deviceConfigs.push_back(dc);
|
||||||
|
@ -389,8 +389,8 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
|
||||||
assert(3 == deviceConfig.valueType);
|
assert(3 == deviceConfig.valueType);
|
||||||
QSlider *slider = new QSlider;
|
QSlider *slider = new QSlider;
|
||||||
slider->setOrientation(Qt::Horizontal);
|
slider->setOrientation(Qt::Horizontal);
|
||||||
slider->setRange(deviceConfig.doubleValueMin * 100, deviceConfig.doubleValueMax * 100);
|
slider->setRange(round(deviceConfig.doubleValueMin * 100), round(deviceConfig.doubleValueMax * 100));
|
||||||
//slider->setValue(deviceConfig.doubleValue * 100);
|
//slider->setValue(round(deviceConfig.doubleValue * 100));
|
||||||
ctrl = slider;
|
ctrl = slider;
|
||||||
}
|
}
|
||||||
else if (0 == deviceConfig.rangeType)
|
else if (0 == deviceConfig.rangeType)
|
||||||
|
@ -407,7 +407,7 @@ void Form_DeviceConfig::Init(SANE_Handle devHandle)
|
||||||
#else
|
#else
|
||||||
spinBox->setMinimumWidth(150);
|
spinBox->setMinimumWidth(150);
|
||||||
#endif
|
#endif
|
||||||
spinBox->setRange(1, 1000);
|
spinBox->setRange(-1, 1000);
|
||||||
//spinBox->setValue(deviceConfig.intValue);
|
//spinBox->setValue(deviceConfig.intValue);
|
||||||
ctrl = spinBox;
|
ctrl = spinBox;
|
||||||
}
|
}
|
||||||
|
@ -484,7 +484,7 @@ void Form_DeviceConfig::Update(std::vector<DeviceConfigsGroup> &deviceConfigsGro
|
||||||
{
|
{
|
||||||
assert(3 == deviceConfig.valueType);
|
assert(3 == deviceConfig.valueType);
|
||||||
QSlider *slider = (QSlider *)ctrl;
|
QSlider *slider = (QSlider *)ctrl;
|
||||||
slider->setValue(deviceConfig.doubleValue * 100);
|
slider->setValue(round(deviceConfig.doubleValue * 100));
|
||||||
}
|
}
|
||||||
else if (0 == deviceConfig.rangeType)
|
else if (0 == deviceConfig.rangeType)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue