diff --git a/Source/src/translations/Dyt_zh_CN.ts b/Source/src/translations/Dyt_zh_CN.ts
index b5788e64..070d10a4 100644
--- a/Source/src/translations/Dyt_zh_CN.ts
+++ b/Source/src/translations/Dyt_zh_CN.ts
@@ -388,60 +388,60 @@
-
+
+ Tab 1
+
+
+
+
+ Tab 2
+
+
+
+
model elements
模型元素
-
+
attribte
属性
-
+
Wave Curve
-
+
Speed Curve
-
+
3D Curve
-
+
Report Table
-
+
Report
-
+
Signal Indicator Lamp
-
+
ParamSetting
-
-
- name: 5year 0412
-
-
-
-
- start: no start
-
-
ModelBrowser
diff --git a/Source/src/ui/MainFrame.cpp b/Source/src/ui/MainFrame.cpp
index fb250859..3a9e6f2c 100644
--- a/Source/src/ui/MainFrame.cpp
+++ b/Source/src/ui/MainFrame.cpp
@@ -113,11 +113,11 @@ void MainFrame::InitUI() {
// AddMenuWidget("chartPlot_manager", tr("chartPlot manager"), chartMenu);
- MainWindow* mainWindow = new MainWindow(this);
+ /* MainWindow* mainWindow = new MainWindow(this);
layout->addWidget(mainWindow);
QtOsgViewWidget* viewWidget = mainWindow->GetViewWidget();
- connect(fileMenu, &FileManagerMenu::LoadDyt, viewWidget, &QtOsgViewWidget::OnLoadDyt);
+ connect(fileMenu, &FileManagerMenu::LoadDyt, viewWidget, &QtOsgViewWidget::OnLoadDyt);*/
//connect(chartMenu, &ChartPlotMenu::signalAddCurve, mainWindow->GetFitCurveDlg(), &FitCurveDialog::slotAddSeries);
//connect(chartMenu, &ChartPlotMenu::signalDelCurve, mainWindow->GetFitCurveDlg(), &FitCurveDialog::slotDelCurve);
@@ -127,7 +127,7 @@ void MainFrame::InitUI() {
//connect(chartMenu, &ChartPlotMenu::signalAddSurfaceCurve, mainWindow->GetSurfaceDlg(), &SurfaceDialog::slotAddSeries);
- connect(system_, &SystemManagerMenu::signalShowUISetting, mainWindow, &MainWindow::slotShowUISetting);
+ //connect(system_, &SystemManagerMenu::signalShowUISetting, mainWindow, &MainWindow::slotShowUISetting);
if (ui->menuWidget->count() > 0) {
ui->menuWidget->setCurrentIndex(0);
diff --git a/Source/src/ui/MainWindow.cpp b/Source/src/ui/MainWindow.cpp
index 6fb8fcc1..52576ec1 100644
--- a/Source/src/ui/MainWindow.cpp
+++ b/Source/src/ui/MainWindow.cpp
@@ -48,12 +48,9 @@ MainWindow::~MainWindow() {
}
void MainWindow::InitUI() {
+ ui->tabWidget->setTabPosition(QTabWidget::South);
+ ui->tabWidget->tabBar()->setMinimumWidth(300);
- tabWidget_ = new QTabWidget;
- tabWidget_->setTabPosition(QTabWidget::South);
- tabWidget_->tabBar()->setMinimumWidth(300);
-
- ui->viewWidget->layout()->addWidget(tabWidget_);
pSettingUI = new LayoutSettingUI();
@@ -83,10 +80,11 @@ void MainWindow::InitUI() {
connect(modelBrowser_, &ModelBrowser::EntityChange, propertyBrowser_, &PropertyBrowser::OnEntityChange);
qtOsgViewWidget_ = new QtOsgViewWidget;
+ setCentralWidget(qtOsgViewWidget_);
//ui->viewWidget->layout()->addWidget(qtOsgViewWidget_);
OsgViewer::Get().Initialize();
OsgViewer::Get().OnFrame();
-
+
m_mapDockWidget.insert("PropertyBrowser", attribte);
QString wavePath = WorkSpaceManager::Get().GetDYTWaveFile();
@@ -208,9 +206,9 @@ void MainWindow::InitUI() {
addParamDlg_->AttachDock(addParamSettingDock);
m_mapDockWidget.insert("ParamSetting", addParamSettingDock);
- ui->discript->setText(tr("name: 5year 0412"));
- ui->status->setText(tr("start: no start"));
-
+ //ui->discript->setText(tr("name: 5year 0412"));
+ //ui->status->setText(tr("start: no start"));
+
InitDockLayout();
#if 0
@@ -221,33 +219,17 @@ void MainWindow::InitUI() {
void MainWindow::InitDockLayout()
{
- while (tabWidget_->count() > 0)
- {
- tabWidget_->removeTab(0);
- }
-
QVariantList listTab = pSettingUI->GetAreaLayout().toList();
for (int i = 0; i < listTab.size(); i++)
{
QVariantMap mapTab = listTab[i].toMap();
QString strTabName = mapTab.value("Name").toString();
- QMainWindow* mainWindow_ = new QMainWindow;
+ QWidget* mainWindow_ = new QWidget;
QVariantList listDocArea = mapTab.value("Widget").toList();
- tabWidget_->insertTab(i, mainWindow_, strTabName);
- if (listDocArea[0].toList().size() > 0)
- {
- mainWindow_->setCentralWidget(qtOsgViewWidget_);
- OsgViewer::Get().Initialize();
- OsgViewer::Get().OnFrame();
- }
- else
- {
- mainWindow_->takeCentralWidget();
- }
-
+ //tabWidget_->insertTab(i, mainWindow_, strTabName);
if (listDocArea.size() > 0)
{
@@ -284,7 +266,7 @@ void MainWindow::InitDockLayout()
if (pDock == nullptr) {
continue;
}
- mainWindow_->addDockWidget(dockArea, pDock);
+ addDockWidget(dockArea, pDock);
lastDock = pDock;
}
else
@@ -293,18 +275,18 @@ void MainWindow::InitDockLayout()
for (int k = 0; k < listWidget.size(); k++)
{
QDockWidget* pDock = m_mapDockWidget.value(listWidget[k].toString());
- mainWindow_->addDockWidget(dockArea, pDock);
+ addDockWidget(dockArea, pDock);
if (k == 0)
{
if (lastDock)
{
- mainWindow_->splitDockWidget(lastDock, pDock, Qt::Vertical);
+ splitDockWidget(lastDock, pDock, Qt::Vertical);
}
}
else
{
- mainWindow_->splitDockWidget(lastDock, pDock, Qt::Horizontal);
+ splitDockWidget(lastDock, pDock, Qt::Horizontal);
}
lastDock = pDock;
diff --git a/Source/src/ui/MainWindow.h b/Source/src/ui/MainWindow.h
index 9c093330..37ae8174 100644
--- a/Source/src/ui/MainWindow.h
+++ b/Source/src/ui/MainWindow.h
@@ -60,7 +60,6 @@ private:
class LayoutSettingUI* pSettingUI{ nullptr };
class TargetListWgt* targetUI_{nullptr};
class TargetListWgt* targetUITable_{ nullptr };
- class QTabWidget* tabWidget_{ nullptr };
class SignalIndicatorLampUI* signalIndicatorLampUI_{ nullptr };
class AddParamSetting* addParamDlg_{ nullptr };
diff --git a/Source/src/ui/MainWindow.ui b/Source/src/ui/MainWindow.ui
index 91b76efd..a1d25cfe 100644
--- a/Source/src/ui/MainWindow.ui
+++ b/Source/src/ui/MainWindow.ui
@@ -6,8 +6,8 @@
0
0
- 800
- 658
+ 1112
+ 774
@@ -31,42 +31,35 @@
0
-
-
+
- 19
+ 0
- 19
+ 0
- 19
+ 0
- 19
+ 0
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
+
+
+ QTabWidget::South
+
+
+
+ Tab 1
+
+
+
+
+ Tab 2
+
+