From 5866bcb28bcad16a787f85cf054e343665ae38fe Mon Sep 17 00:00:00 2001
From: ZESl <823989065@qq.com>
Date: Sun, 12 Apr 2020 20:23:18 +0800
Subject: [PATCH] =?UTF-8?q?ui=200.9=20=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Classes/Reconstruction.cpp | 13 ++++++++---
Classes/Reconstruction.h | 1 +
UI/Reconstruction.ui | 46 ++++++++++++++++++++++++++------------
3 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/Classes/Reconstruction.cpp b/Classes/Reconstruction.cpp
index ac4842d..561a694 100644
--- a/Classes/Reconstruction.cpp
+++ b/Classes/Reconstruction.cpp
@@ -82,7 +82,7 @@ void Reconstruction::on_pushButton_3_clicked()
}
#pragma endregion
-#pragma region 相机标定-按钮
+#pragma region 系统标定-按钮
// 添加图像
void Reconstruction::on_pushButton_5_clicked()
@@ -155,7 +155,7 @@ void Reconstruction::on_pushButton_8_clicked()
}
#pragma endregion
-#pragma region 图案投影-按钮
+#pragma region 三维重建-按钮
// 选择文件
void Reconstruction::on_pushButton_4_clicked()
@@ -232,9 +232,16 @@ void Reconstruction::on_pushButton_10_clicked()
mesg.warning(this, "WARNING", "Haven't taken picture!");
}
}
+
+// 开始重建
+void Reconstruction::on_pushButton_17_clicked()
+{
+ // todo 开始重建
+}
+
#pragma endregion
-#pragma region 三维重建-按钮
+#pragma region 点云渲染-按钮
// 异常点选择
void Reconstruction::on_pushButton_11_clicked()
diff --git a/Classes/Reconstruction.h b/Classes/Reconstruction.h
index 9b718b3..10f0acf 100644
--- a/Classes/Reconstruction.h
+++ b/Classes/Reconstruction.h
@@ -51,5 +51,6 @@ private slots:
void on_pushButton_14_clicked();
void on_pushButton_15_clicked();
void on_pushButton_16_clicked();
+ void on_pushButton_17_clicked();
void setPicAction(QString action);
};
diff --git a/UI/Reconstruction.ui b/UI/Reconstruction.ui
index 388414e..9c5511f 100644
--- a/UI/Reconstruction.ui
+++ b/UI/Reconstruction.ui
@@ -69,7 +69,7 @@
- 2
+ 1
@@ -600,7 +600,7 @@
- 460
+ 370
20
81
16
@@ -621,8 +621,8 @@
- 180
- 40
+ 90
+ 50
640
512
@@ -668,8 +668,8 @@
- 710
- 580
+ 810
+ 190
93
31
@@ -686,8 +686,8 @@
- 840
- 580
+ 810
+ 290
93
31
@@ -704,7 +704,7 @@
- 520
+ 620
580
111
31
@@ -722,7 +722,7 @@
- 170
+ 240
580
331
31
@@ -732,7 +732,7 @@
- 50
+ 90
580
111
30
@@ -757,6 +757,24 @@
Qt::AlignCenter
+
+
+
+ 810
+ 390
+ 93
+ 31
+
+
+
+
+ 榛戜綋
+
+
+
+ 寮濮嬮噸寤
+
+
@@ -1494,7 +1512,7 @@
- 鐩告満鏍囧畾
+ 绯荤粺鏍囧畾
@@ -1516,7 +1534,7 @@
- 鍥炬鎶曞奖
+ 涓夌淮閲嶅缓
@@ -1538,7 +1556,7 @@
- 涓夌淮閲嶅缓
+ 鐐逛簯娓叉煋