Merge branch 'master' of http://192.168.100.140:8099/sane/code_app
This commit is contained in:
commit
070ae4eeaf
|
@ -17,8 +17,8 @@ CutPaperTool::CutPaperTool(QWidget *parent) :
|
|||
//setPaperType(200,"A4",400);
|
||||
ui->widget->setSizeType(MILLIM);
|
||||
setSizeLabel();
|
||||
ui->pbtn_init->setFixedWidth(160);
|
||||
this->setFixedWidth(ui->widget->width()+20);
|
||||
//ui->pbtn_init->setFixedWidth(160);
|
||||
this->setFixedWidth(ui->widget->width()+40);
|
||||
}
|
||||
|
||||
CutPaperTool::~CutPaperTool()
|
||||
|
@ -41,7 +41,7 @@ void CutPaperTool::setPaperType(const int d, const QString &t, const int& w)
|
|||
ui->widget->setPaperSize(paperType,w);
|
||||
//ui->widget->refreshView();
|
||||
setSizeLabel();
|
||||
this->setFixedWidth(ui->widget->width()+20);
|
||||
this->setFixedWidth(ui->widget->width()+40);
|
||||
setSizeInit();
|
||||
}
|
||||
|
||||
|
|
|
@ -2,12 +2,15 @@
|
|||
<ui version="4.0">
|
||||
<class>CutPaperTool</class>
|
||||
<widget class="QWidget" name="CutPaperTool">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>439</width>
|
||||
<height>700</height>
|
||||
<height>676</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
|
@ -19,7 +22,7 @@
|
|||
<property name="windowTitle">
|
||||
<string>自定义扫描区域</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
|
@ -153,7 +156,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>421</width>
|
||||
<height>454</height>
|
||||
<height>430</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
|
|
Loading…
Reference in New Issue