V1.7 Release with more format GUI support

J3DEngine/transtest.cpp

@@ -12,7 +12,7 @@
 #include <fstream>
 #include "Global.h"
 #include "MVSEngine.h"
-
+#include "third_party/cmdLine/cmdLine.h"
 
 
 HWND m_hWnd;
@@ -769,11 +769,14 @@ void MsgProc(UINT msg, WPARAM wp, LPARAM lp)
 
 int main()
 {
+	std::cout << "\n正在初始化引擎，请稍等\n";
 	MSG msg;
 	SetTimer(NULL, 0, 1000, NULL);
 	_mkdir("C:\\ProgramData\\J3DEngine");
 	HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);
 	DWORD mode;
+	srand(time(NULL));
+	int sz = rand() % 300;
 	GetConsoleMode(hStdin, &mode);
 	mode &= ~ENABLE_QUICK_EDIT_MODE; //移除快速编辑模式
 	mode &= ~ENABLE_INSERT_MODE; //移除插入模式
@@ -793,8 +796,11 @@ int main()
 		SendMessage(m_hWnd, WM_USER, tid, 0);
 	}
 
+	for (int i = 0; i < sz; ++i)Sleep(20);
+
+
 	std::cout << "\n-----------------------------------" << std::endl;
-	std::cout << "        欢迎使用J3DEngine V1.6        " << std::endl;
+	std::cout << "        欢迎使用J3DEngine V1.7        " << std::endl;
 	std::cout << "            程序初始化成功             " << std::endl;
 	std::cout << "        请使用J3DGUI程序发起指令       " << std::endl;
 	std::cout << "     @Basic All rights reserved    " << std::endl;

J3DGUI/QT3DReconstruction.cpp

@@ -31,6 +31,7 @@ QT3DReconstruction::QT3DReconstruction(QWidget *parent)
 	setWindowFlags(windowFlags()& ~Qt::WindowMaximizeButtonHint);
 	setFixedSize(this->width(), this->height());
 	viewer = nullptr;
+	ViewerAva = false;
 }
 
 
@@ -122,7 +123,18 @@ void QT3DReconstruction::timerSlot()
 					return;
 
 				}
-				openView(fileName);
+				if (ViewerAva == true)
+				{
+					const char* path[2];
+					path[0] = fileName.toStdString().c_str();
+					path[1] = NULL;
+					viewer->window.Drop(1, path);
+				}
+				else
+				{
+					openViewCompatibility(fileName);
+				}
+
 			}
 			else if (temp == "densifypointcloud") {
 				QString fileName = Global::densifyWorkingDir + "/DenseCloud.J3D";
@@ -132,7 +144,17 @@ void QT3DReconstruction::timerSlot()
 					return;
 
 				}
-				openView(fileName);
+				if (ViewerAva == true)
+				{
+					const char* path[2];
+					path[0] = fileName.toStdString().c_str();
+					path[1] = NULL;
+					viewer->window.Drop(1, path);
+				}
+				else
+				{
+					openViewCompatibility(fileName);
+				}
 			}
 			else if (temp == "reconstructmesh") {
 				QString fileName = Global::reconstructMeshWorkingDir + "/TIN_Mesh.J3D";
@@ -142,7 +164,17 @@ void QT3DReconstruction::timerSlot()
 					return;
 
 				}
-				openView(fileName);
+				if (ViewerAva == true)
+				{
+					const char* path[2];
+					path[0] = fileName.toStdString().c_str();
+					path[1] = NULL;
+					viewer->window.Drop(1, path);
+				}
+				else
+				{
+					openViewCompatibility(fileName);
+				}
 			}
 			else if (temp == "texturemesh") {
 				QString fileName = Global::reconstructMeshWorkingDir + "/TEXTURE_Mesh.J3D";
@@ -152,7 +184,17 @@ void QT3DReconstruction::timerSlot()
 					return;
 
 				}
-				openView(fileName);
+				if (ViewerAva == true)
+				{
+					const char* path[2];
+					path[0] = fileName.toStdString().c_str();
+					path[1] = NULL;
+					viewer->window.Drop(1, path);
+				}
+				else
+				{
+					openViewCompatibility(fileName);
+				}
 			}
 			QMessageBox::information(NULL, u8"完成", u8"任务完成！ ", QMessageBox::Ok, QMessageBox::Ok);
 			Global::tasking = false;
@@ -274,7 +316,7 @@ void QT3DReconstruction::on_actionopen_mvs_file_triggered()
 		return;
 
 	}
-	if (viewer == nullptr)
+	if (ViewerAva == false)
 	{
 		openView(fileName);
 		return;
@@ -322,6 +364,7 @@ bool QT3DReconstruction::openView(QString fileName)
 
 	viewer->window.SetVisible(true);
 	// enter viewer loop
+	ViewerAva = true;
 	viewer->Loop();
 	FinalizeViewer();
 	return true;