Skip to content

Commit 91c9a28

Browse files
SoulBasicSoulBasic
committed
some changes
1 parent 8afdf94 commit 91c9a28

4 files changed

Lines changed: 6 additions & 52 deletions

File tree

‎J3DGUI/Global.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <time.h>
1010
#include <io.h>
1111

12-
#define SUPPORT_OSG //支持打开和转换OSG文件，需要存在osgviewer.exe、osgcv.exe和相关osg库dll文件
12+
//#define SUPPORT_OSG //支持打开和转换OSG文件，需要存在osgviewer.exe、osgcv.exe和相关osg库dll文件
1313
//#define SUPPORT_GLTF //支持GLTF输出，需安装obj2gltf插件，用于cesium显示
1414

1515
#define CMD_FULLAUTO 100

‎J3DGUI/QT3DReconstruction.cpp‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ QT3DReconstruction::QT3DReconstruction(QWidget *parent)
88
: QMainWindow(parent)
99
{
1010
ui.setupUi(this);
11-
1211
timer = new QTimer(this);
1312
connect(timer, SIGNAL(timeout()), this, SLOT(timerSlot()));
1413
timer->start(500);
@@ -97,16 +96,13 @@ void QT3DReconstruction::timerSlot()
9796
{
9897
fileName = Global::reconstructMeshWorkingDir + "/TEXTURE_Mesh.J3D";
9998
}
100-
QMessageBox::information(NULL, u8"完成", u8"任务完成! ", QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
99+
QMessageBox::information(this, u8"完成", u8"任务完成! ", QMessageBox::Ok, QMessageBox::Ok);
101100
if (!fileName.isEmpty())
102101
{
103102
if (J3DViewerAva)
104103
{
105-
const char* path[2];
106104
auto codec = QTextCodec::codecForName("gb2312");
107-
path[0] = codec->fromUnicode(fileName).toStdString().c_str();
108-
path[1] = NULL;
109-
J3DViewer->window.Drop(1, path);
105+
J3DViewer->window.NewModel(codec->fromUnicode(fileName).toStdString());
110106
}
111107
else
112108
{
@@ -234,7 +230,6 @@ void QT3DReconstruction::on_actionopen_mvs_file_triggered()
234230
openView(fileName);
235231
return;
236232
}
237-
const char* path[2];
238233
auto codec = QTextCodec::codecForName("gb2312");
239234
J3DViewer->window.NewModel(codec->fromUnicode(fileName).toStdString());
240235
}

‎J3DGUI/QT3DReconstruction.ui‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,13 @@
301301
<addaction name="action"/>
302302
</widget>
303303
<addaction name="menuSFM_Engine"/>
304-
<addaction name="menuMVS_Engine"/>
305304
<addaction name="action_import_BlocksExchange"/>
305+
<addaction name="separator"/>
306+
<addaction name="menuMVS_Engine"/>
306307
</widget>
307308
<widget class="QMenu" name="menu_3">
308309
<property name="title">
309-
<string>文件</string>
310+
<string>可视化模块</string>
310311
</property>
311312
<addaction name="actionopen_mvs_file"/>
312313
<addaction name="action_2"/>

‎J3DReconstruction.sln‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -30,90 +30,48 @@ Global
3030
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3131
Debug|x64 = Debug|x64
3232
Debug|x86 = Debug|x86
33-
MinSizeRel|x64 = MinSizeRel|x64
34-
MinSizeRel|x86 = MinSizeRel|x86
3533
Release|x64 = Release|x64
3634
Release|x86 = Release|x86
37-
RelWithDebInfo|x64 = RelWithDebInfo|x64
38-
RelWithDebInfo|x86 = RelWithDebInfo|x86
3935
EndGlobalSection
4036
GlobalSection(ProjectConfigurationPlatforms) = postSolution
4137
{876553CC-6603-4752-B10D-EDEE46B76701}.Debug|x64.ActiveCfg = Debug|x64
4238
{876553CC-6603-4752-B10D-EDEE46B76701}.Debug|x64.Build.0 = Debug|x64
4339
{876553CC-6603-4752-B10D-EDEE46B76701}.Debug|x86.ActiveCfg = Debug|Win32
4440
{876553CC-6603-4752-B10D-EDEE46B76701}.Debug|x86.Build.0 = Debug|Win32
45-
{876553CC-6603-4752-B10D-EDEE46B76701}.MinSizeRel|x64.ActiveCfg = Release|x64
46-
{876553CC-6603-4752-B10D-EDEE46B76701}.MinSizeRel|x64.Build.0 = Release|x64
47-
{876553CC-6603-4752-B10D-EDEE46B76701}.MinSizeRel|x86.ActiveCfg = Release|Win32
48-
{876553CC-6603-4752-B10D-EDEE46B76701}.MinSizeRel|x86.Build.0 = Release|Win32
4941
{876553CC-6603-4752-B10D-EDEE46B76701}.Release|x64.ActiveCfg = Release|x64
5042
{876553CC-6603-4752-B10D-EDEE46B76701}.Release|x64.Build.0 = Release|x64
5143
{876553CC-6603-4752-B10D-EDEE46B76701}.Release|x86.ActiveCfg = Release|Win32
5244
{876553CC-6603-4752-B10D-EDEE46B76701}.Release|x86.Build.0 = Release|Win32
53-
{876553CC-6603-4752-B10D-EDEE46B76701}.RelWithDebInfo|x64.ActiveCfg = Release|x64
54-
{876553CC-6603-4752-B10D-EDEE46B76701}.RelWithDebInfo|x64.Build.0 = Release|x64
55-
{876553CC-6603-4752-B10D-EDEE46B76701}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
56-
{876553CC-6603-4752-B10D-EDEE46B76701}.RelWithDebInfo|x86.Build.0 = Release|Win32
5745
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.Debug|x64.ActiveCfg = Debug|x64
5846
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.Debug|x64.Build.0 = Debug|x64
5947
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.Debug|x86.ActiveCfg = Debug|Win32
6048
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.Debug|x86.Build.0 = Debug|Win32
61-
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.MinSizeRel|x64.ActiveCfg = Debug|x64
62-
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.MinSizeRel|x64.Build.0 = Debug|x64
63-
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.MinSizeRel|x86.ActiveCfg = Release|Win32
64-
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.MinSizeRel|x86.Build.0 = Release|Win32
6549
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.Release|x64.ActiveCfg = Release|x64
6650
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.Release|x64.Build.0 = Release|x64
6751
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.Release|x86.ActiveCfg = Release|Win32
6852
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.Release|x86.Build.0 = Release|Win32
69-
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.RelWithDebInfo|x64.ActiveCfg = Release|x64
70-
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.RelWithDebInfo|x64.Build.0 = Release|x64
71-
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
72-
{34E1DCE3-43FC-45FE-89AB-BE84E115FCEC}.RelWithDebInfo|x86.Build.0 = Release|Win32
7353
{84686931-3F00-3FD3-BD52-233F97739FF2}.Debug|x64.ActiveCfg = Debug|x64
7454
{84686931-3F00-3FD3-BD52-233F97739FF2}.Debug|x64.Build.0 = Debug|x64
7555
{84686931-3F00-3FD3-BD52-233F97739FF2}.Debug|x86.ActiveCfg = Debug|x64
76-
{84686931-3F00-3FD3-BD52-233F97739FF2}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
77-
{84686931-3F00-3FD3-BD52-233F97739FF2}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
78-
{84686931-3F00-3FD3-BD52-233F97739FF2}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
7956
{84686931-3F00-3FD3-BD52-233F97739FF2}.Release|x64.ActiveCfg = Release|x64
8057
{84686931-3F00-3FD3-BD52-233F97739FF2}.Release|x64.Build.0 = Release|x64
8158
{84686931-3F00-3FD3-BD52-233F97739FF2}.Release|x86.ActiveCfg = Release|x64
82-
{84686931-3F00-3FD3-BD52-233F97739FF2}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
83-
{84686931-3F00-3FD3-BD52-233F97739FF2}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
84-
{84686931-3F00-3FD3-BD52-233F97739FF2}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
8559
{B2482291-0BAD-4B20-857A-D3E886D30880}.Debug|x64.ActiveCfg = Debug|x64
8660
{B2482291-0BAD-4B20-857A-D3E886D30880}.Debug|x64.Build.0 = Debug|x64
8761
{B2482291-0BAD-4B20-857A-D3E886D30880}.Debug|x86.ActiveCfg = Debug|Win32
8862
{B2482291-0BAD-4B20-857A-D3E886D30880}.Debug|x86.Build.0 = Debug|Win32
89-
{B2482291-0BAD-4B20-857A-D3E886D30880}.MinSizeRel|x64.ActiveCfg = Debug|x64
90-
{B2482291-0BAD-4B20-857A-D3E886D30880}.MinSizeRel|x64.Build.0 = Debug|x64
91-
{B2482291-0BAD-4B20-857A-D3E886D30880}.MinSizeRel|x86.ActiveCfg = Release|Win32
92-
{B2482291-0BAD-4B20-857A-D3E886D30880}.MinSizeRel|x86.Build.0 = Release|Win32
9363
{B2482291-0BAD-4B20-857A-D3E886D30880}.Release|x64.ActiveCfg = Release|x64
9464
{B2482291-0BAD-4B20-857A-D3E886D30880}.Release|x64.Build.0 = Release|x64
9565
{B2482291-0BAD-4B20-857A-D3E886D30880}.Release|x86.ActiveCfg = Release|Win32
9666
{B2482291-0BAD-4B20-857A-D3E886D30880}.Release|x86.Build.0 = Release|Win32
97-
{B2482291-0BAD-4B20-857A-D3E886D30880}.RelWithDebInfo|x64.ActiveCfg = Release|x64
98-
{B2482291-0BAD-4B20-857A-D3E886D30880}.RelWithDebInfo|x64.Build.0 = Release|x64
99-
{B2482291-0BAD-4B20-857A-D3E886D30880}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
100-
{B2482291-0BAD-4B20-857A-D3E886D30880}.RelWithDebInfo|x86.Build.0 = Release|Win32
10167
{47DDE12E-E262-4317-9F05-679422DE938D}.Debug|x64.ActiveCfg = Debug|x64
10268
{47DDE12E-E262-4317-9F05-679422DE938D}.Debug|x64.Build.0 = Debug|x64
10369
{47DDE12E-E262-4317-9F05-679422DE938D}.Debug|x86.ActiveCfg = Debug|Win32
10470
{47DDE12E-E262-4317-9F05-679422DE938D}.Debug|x86.Build.0 = Debug|Win32
105-
{47DDE12E-E262-4317-9F05-679422DE938D}.MinSizeRel|x64.ActiveCfg = Release|x64
106-
{47DDE12E-E262-4317-9F05-679422DE938D}.MinSizeRel|x64.Build.0 = Release|x64
107-
{47DDE12E-E262-4317-9F05-679422DE938D}.MinSizeRel|x86.ActiveCfg = Release|Win32
108-
{47DDE12E-E262-4317-9F05-679422DE938D}.MinSizeRel|x86.Build.0 = Release|Win32
10971
{47DDE12E-E262-4317-9F05-679422DE938D}.Release|x64.ActiveCfg = Release|x64
11072
{47DDE12E-E262-4317-9F05-679422DE938D}.Release|x64.Build.0 = Release|x64
11173
{47DDE12E-E262-4317-9F05-679422DE938D}.Release|x86.ActiveCfg = Release|Win32
11274
{47DDE12E-E262-4317-9F05-679422DE938D}.Release|x86.Build.0 = Release|Win32
113-
{47DDE12E-E262-4317-9F05-679422DE938D}.RelWithDebInfo|x64.ActiveCfg = Release|x64
114-
{47DDE12E-E262-4317-9F05-679422DE938D}.RelWithDebInfo|x64.Build.0 = Release|x64
115-
{47DDE12E-E262-4317-9F05-679422DE938D}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
116-
{47DDE12E-E262-4317-9F05-679422DE938D}.RelWithDebInfo|x86.Build.0 = Release|Win32
11775
EndGlobalSection
11876
GlobalSection(SolutionProperties) = preSolution
11977
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)