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

扫描到对话框索引值更新

This commit is contained in:
yangjiaxuan 2023-08-10 17:40:10 +08:00
parent 64c9d87278
commit c145842d92
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/scanner2/dialog_aquireinto.cpp
View File

@ -16,7 +16,7 @@
#include <QDebug>
#include <QMessageBox>
Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
Dialog_AquireInto::Dialog_AquireInto(int fileNameStartIndex, QWidget* parent) :
QDialog(parent),
ui(new Ui::Dialog_AquireInto)
{
@ -42,7 +42,17 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
ui->comboBox_cfgScheme->setCurrentIndex(0);
}
setCfgBaseOnSection(getCurrentCfgName());
QString cfgName = getCurrentCfgName();
setCfgBaseOnSection(cfgName);
if (-1 != fileNameStartIndex)
{
ui->spin_index->setValue(fileNameStartIndex);
if (cfgName == tr("default scheme"))
{
saveCfgValue(cfgName.toLocal8Bit().toStdString().c_str(), "startIndex", fileNameStartIndex);
}
}
ui->lab_digitExp->setText(QString(tr("e.g. '%1%2'")).arg(ui->lineEdit_fileName->text())
.arg(ui->spin_index->value(), ui->cbox_digit->currentIndex() + 1, 10, QLatin1Char('0')));

2
app/scanner2/dialog_aquireinto.h
View File

@ -35,7 +35,7 @@ class Dialog_AquireInto : public QDialog
Q_OBJECT
public:
explicit Dialog_AquireInto(QWidget* parent = nullptr);
explicit Dialog_AquireInto(int fileNameStartIndex, QWidget* parent = nullptr);
~Dialog_AquireInto();
AquireIntoSaveParam getSaveParam();

1
app/scanner2/dialog_imageeditor.cpp
View File

@ -21,6 +21,7 @@ Dialog_ImageEditor::Dialog_ImageEditor(QWidget *parent)
for (int i = 0; i < ui->comboBox_lineWidth->count(); i++)
ui->comboBox_lineWidth->setItemData(i, m_lineWidth[i]);
m_scene->setColor(QColor("red"));
ui->comboBox_textSize->setCurrentIndex(2);
ui->graphicsView->setScene(m_scene);
ui->graphicsView->setParent(this);

10
app/scanner2/mainwindow.cpp
View File

@ -67,7 +67,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
, m_scanCurIndex(-1)
, m_scanFileName("")
, m_scanImgFmtWriter(nullptr)
, m_fileNameStartIndex(1)
, m_fileNameStartIndex(-1)
, m_isScanning(false)
, auto_save_changes_(false)
, save_from_changed_(false)
@ -622,7 +622,7 @@ void MainWindow::on_AcquireInto2()
m_scanInsertPos = -1;
m_scanCurIndex = -1;
Dialog_AquireInto dlg(this);
Dialog_AquireInto dlg(m_fileNameStartIndex, this);
m_aquireIntoSaveParam = dlg.getSaveParam();
m_fileNameStartIndex = m_aquireIntoSaveParam.m_fileNameStartIndex;
m_aquireIntoInBlank = true;
@ -678,7 +678,7 @@ void MainWindow::on_reloadAcquireIntoCfg()
void MainWindow::on_m_acquireIntoCfg_changed(QString schemeName)
{
QString selectedCfgName = m_cbtn_acquireIntoCfg->currentText();
Dialog_AquireInto dlg;
Dialog_AquireInto dlg(m_fileNameStartIndex, this);
dlg.setConfig(selectedCfgName);
}
@ -3318,7 +3318,7 @@ void MainWindow::on_act_acquireInto_triggered()
return;
}
Dialog_AquireInto dlg(this);
Dialog_AquireInto dlg(m_fileNameStartIndex, this);
connect(&dlg, SIGNAL(reloadAcquireIntoCfg()), this, SLOT(on_reloadAcquireIntoCfg()));
if (dlg.exec())
{
@ -3391,7 +3391,7 @@ void MainWindow::on_act_insertFromScanner_triggered()
break;
}
Dialog_AquireInto dlg2(this);
Dialog_AquireInto dlg2(m_fileNameStartIndex, this);
m_aquireIntoSaveParam = dlg2.getSaveParam();
m_fileNameStartIndex = m_aquireIntoSaveParam.m_fileNameStartIndex;
m_aquireIntoInBlank = true;