Compare commits
2 Commits
2f4c8fe55b
...
7872497479
Author | SHA1 | Date |
---|---|---|
luoliangyi | 7872497479 | |
luoliangyi | be2e39ad6d |
|
@ -473,12 +473,12 @@ int Dialog_Scan::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsign
|
||||||
break;
|
break;
|
||||||
case SANE_EVENT_STATUS:
|
case SANE_EVENT_STATUS:
|
||||||
{
|
{
|
||||||
emit p->scanInfo((const char*)data, false);
|
//emit p->scanInfo((const char*)data, false);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SANE_EVENT_ERROR:
|
case SANE_EVENT_ERROR:
|
||||||
{
|
{
|
||||||
emit p->scanInfo((const char*)data, (0 != *len));
|
//emit p->scanInfo((const char*)data, (0 != *len));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SANE_EVENT_IMAGE_OK:
|
case SANE_EVENT_IMAGE_OK:
|
||||||
|
|
|
@ -29,11 +29,7 @@ void Dialog_ScanInfo::Start()
|
||||||
{
|
{
|
||||||
m_error = false;
|
m_error = false;
|
||||||
ui->labelScanInfo->setText("");
|
ui->labelScanInfo->setText("");
|
||||||
ui->labelScanInfo->repaint();
|
|
||||||
ui->labelScanCount->setText(tr("Scan count: 0"));
|
ui->labelScanCount->setText(tr("Scan count: 0"));
|
||||||
ui->labelScanCount->repaint();
|
|
||||||
this->repaint();
|
|
||||||
|
|
||||||
ui->pushButtonCancel->setVisible(true);
|
ui->pushButtonCancel->setVisible(true);
|
||||||
ui->pushButtonOK->setVisible(false);
|
ui->pushButtonOK->setVisible(false);
|
||||||
show();
|
show();
|
||||||
|
@ -42,15 +38,12 @@ void Dialog_ScanInfo::Start()
|
||||||
void Dialog_ScanInfo::SetScanInfo(const QString &info, bool error)
|
void Dialog_ScanInfo::SetScanInfo(const QString &info, bool error)
|
||||||
{
|
{
|
||||||
ui->labelScanInfo->setText(info);
|
ui->labelScanInfo->setText(info);
|
||||||
ui->labelScanInfo->repaint();
|
|
||||||
this->repaint();
|
|
||||||
m_error = error;
|
m_error = error;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Dialog_ScanInfo::SetScanCount(unsigned int count)
|
void Dialog_ScanInfo::SetScanCount(unsigned int count)
|
||||||
{
|
{
|
||||||
ui->labelScanCount->setText(tr("Scan count: ") + QString::number(count));
|
ui->labelScanCount->setText(tr("Scan count: ") + QString::number(count));
|
||||||
ui->labelScanCount->repaint();
|
|
||||||
this->repaint();
|
this->repaint();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -597,8 +597,7 @@ void Form_DeviceConfig::on_sliderClicked(int value)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QDoubleSpinBox* doubleSpinBox = reinterpret_cast<QDoubleSpinBox*>(abstractSpinBox);
|
QDoubleSpinBox* doubleSpinBox = reinterpret_cast<QDoubleSpinBox*>(abstractSpinBox);
|
||||||
double temp = value * doubleSpinBox->singleStep();
|
doubleSpinBox->setValue(value / 100.0);
|
||||||
doubleSpinBox->setValue(temp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
@ -634,8 +633,7 @@ void Form_DeviceConfig::on_doubleSpinboxClicked(double value)
|
||||||
QString sliderProverty = slider->property("config_name").toString();
|
QString sliderProverty = slider->property("config_name").toString();
|
||||||
if (sliderProverty == spinBoxProverty)
|
if (sliderProverty == spinBoxProverty)
|
||||||
{
|
{
|
||||||
int temp = round(value / spinBox->singleStep());
|
slider->setValue(round(value * 100));
|
||||||
slider->setValue(temp);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue