PM/DYT
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify ui

Browse Source
This commit is contained in:
jiegeaiai 2024-12-30 00:10:14 +08:00
parent b58690dbf7
commit 3d2b9aacff
5 changed files with 56 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/src/translations/Dyt_zh_CN.ts
View File

@ -388,60 +388,60 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="70"/> <location filename="../ui/MainWindow.ui" line="55"/>
<source>Tab 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/MainWindow.ui" line="60"/>
<source>Tab 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/MainWindow.cpp" line="67"/>
<source>model elements</source> <source>model elements</source>
<translation>模型元素</translation> <translation>模型元素</translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="76"/> <location filename="../ui/MainWindow.cpp" line="73"/>
<source>attribte</source> <source>attribte</source>
<translation>属性</translation> <translation>属性</translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="115"/> <location filename="../ui/MainWindow.cpp" line="113"/>
<source>Wave Curve</source> <source>Wave Curve</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="124"/> <location filename="../ui/MainWindow.cpp" line="122"/>
<source>Speed Curve</source> <source>Speed Curve</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="134"/> <location filename="../ui/MainWindow.cpp" line="132"/>
<source>3D Curve</source> <source>3D Curve</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="160"/> <location filename="../ui/MainWindow.cpp" line="158"/>
<source>Report Table</source> <source>Report Table</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="186"/> <location filename="../ui/MainWindow.cpp" line="184"/>
<source>Report</source> <source>Report</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="197"/> <location filename="../ui/MainWindow.cpp" line="195"/>
<source>Signal Indicator Lamp</source> <source>Signal Indicator Lamp</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="206"/> <location filename="../ui/MainWindow.cpp" line="204"/>
<source>ParamSetting</source> <source>ParamSetting</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../ui/MainWindow.cpp" line="211"/>
<source>name: 5year 0412</source>
<translation></translation>
</message>
<message>
<location filename="../ui/MainWindow.cpp" line="212"/>
<source>start: no start</source>
<translation></translation>
</message>
</context> </context>
<context> <context>
<name>ModelBrowser</name> <name>ModelBrowser</name>

6
Source/src/ui/MainFrame.cpp
View File

@ -113,11 +113,11 @@ void MainFrame::InitUI() {
// AddMenuWidget("chartPlot_manager", tr("chartPlot manager"), chartMenu); // AddMenuWidget("chartPlot_manager", tr("chartPlot manager"), chartMenu);
MainWindow* mainWindow = new MainWindow(this); /* MainWindow* mainWindow = new MainWindow(this);
layout->addWidget(mainWindow); layout->addWidget(mainWindow);
QtOsgViewWidget* viewWidget = mainWindow->GetViewWidget(); 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::signalAddCurve, mainWindow->GetFitCurveDlg(), &FitCurveDialog::slotAddSeries);
//connect(chartMenu, &ChartPlotMenu::signalDelCurve, mainWindow->GetFitCurveDlg(), &FitCurveDialog::slotDelCurve); //connect(chartMenu, &ChartPlotMenu::signalDelCurve, mainWindow->GetFitCurveDlg(), &FitCurveDialog::slotDelCurve);
@ -127,7 +127,7 @@ void MainFrame::InitUI() {
//connect(chartMenu, &ChartPlotMenu::signalAddSurfaceCurve, mainWindow->GetSurfaceDlg(), &SurfaceDialog::slotAddSeries); //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) { if (ui->menuWidget->count() > 0) {
ui->menuWidget->setCurrentIndex(0); ui->menuWidget->setCurrentIndex(0);

44
Source/src/ui/MainWindow.cpp
View File

@ -48,12 +48,9 @@ MainWindow::~MainWindow() {
} }
void MainWindow::InitUI() { 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(); pSettingUI = new LayoutSettingUI();
@ -83,10 +80,11 @@ void MainWindow::InitUI() {
connect(modelBrowser_, &ModelBrowser::EntityChange, propertyBrowser_, &PropertyBrowser::OnEntityChange); connect(modelBrowser_, &ModelBrowser::EntityChange, propertyBrowser_, &PropertyBrowser::OnEntityChange);
qtOsgViewWidget_ = new QtOsgViewWidget; qtOsgViewWidget_ = new QtOsgViewWidget;
setCentralWidget(qtOsgViewWidget_);
//ui->viewWidget->layout()->addWidget(qtOsgViewWidget_); //ui->viewWidget->layout()->addWidget(qtOsgViewWidget_);
OsgViewer::Get().Initialize(); OsgViewer::Get().Initialize();
OsgViewer::Get().OnFrame(); OsgViewer::Get().OnFrame();
m_mapDockWidget.insert("PropertyBrowser", attribte); m_mapDockWidget.insert("PropertyBrowser", attribte);
QString wavePath = WorkSpaceManager::Get().GetDYTWaveFile(); QString wavePath = WorkSpaceManager::Get().GetDYTWaveFile();
@ -208,9 +206,9 @@ void MainWindow::InitUI() {
addParamDlg_->AttachDock(addParamSettingDock); addParamDlg_->AttachDock(addParamSettingDock);
m_mapDockWidget.insert("ParamSetting", addParamSettingDock); m_mapDockWidget.insert("ParamSetting", addParamSettingDock);
ui->discript->setText(tr("name: 5year 0412")); //ui->discript->setText(tr("name: 5year 0412"));
ui->status->setText(tr("start: no start")); //ui->status->setText(tr("start: no start"));
InitDockLayout(); InitDockLayout();
#if 0 #if 0
@ -221,33 +219,17 @@ void MainWindow::InitUI() {
void MainWindow::InitDockLayout() void MainWindow::InitDockLayout()
{ {
while (tabWidget_->count() > 0)
{
tabWidget_->removeTab(0);
}
QVariantList listTab = pSettingUI->GetAreaLayout().toList(); QVariantList listTab = pSettingUI->GetAreaLayout().toList();
for (int i = 0; i < listTab.size(); i++) for (int i = 0; i < listTab.size(); i++)
{ {
QVariantMap mapTab = listTab[i].toMap(); QVariantMap mapTab = listTab[i].toMap();
QString strTabName = mapTab.value("Name").toString(); QString strTabName = mapTab.value("Name").toString();
QMainWindow* mainWindow_ = new QMainWindow; QWidget* mainWindow_ = new QWidget;
QVariantList listDocArea = mapTab.value("Widget").toList(); QVariantList listDocArea = mapTab.value("Widget").toList();
tabWidget_->insertTab(i, mainWindow_, strTabName); //tabWidget_->insertTab(i, mainWindow_, strTabName);
if (listDocArea[0].toList().size() > 0)
{
mainWindow_->setCentralWidget(qtOsgViewWidget_);
OsgViewer::Get().Initialize();
OsgViewer::Get().OnFrame();
}
else
{
mainWindow_->takeCentralWidget();
}
if (listDocArea.size() > 0) if (listDocArea.size() > 0)
{ {
@ -284,7 +266,7 @@ void MainWindow::InitDockLayout()
if (pDock == nullptr) { if (pDock == nullptr) {
continue; continue;
} }
mainWindow_->addDockWidget(dockArea, pDock); addDockWidget(dockArea, pDock);
lastDock = pDock; lastDock = pDock;
} }
else else
@ -293,18 +275,18 @@ void MainWindow::InitDockLayout()
for (int k = 0; k < listWidget.size(); k++) for (int k = 0; k < listWidget.size(); k++)
{ {
QDockWidget* pDock = m_mapDockWidget.value(listWidget[k].toString()); QDockWidget* pDock = m_mapDockWidget.value(listWidget[k].toString());
mainWindow_->addDockWidget(dockArea, pDock); addDockWidget(dockArea, pDock);
if (k == 0) if (k == 0)
{ {
if (lastDock) if (lastDock)
{ {
mainWindow_->splitDockWidget(lastDock, pDock, Qt::Vertical); splitDockWidget(lastDock, pDock, Qt::Vertical);
} }
} }
else else
{ {
mainWindow_->splitDockWidget(lastDock, pDock, Qt::Horizontal); splitDockWidget(lastDock, pDock, Qt::Horizontal);
} }
lastDock = pDock; lastDock = pDock;

1
Source/src/ui/MainWindow.h
View File

@ -60,7 +60,6 @@ private:
class LayoutSettingUI* pSettingUI{ nullptr }; class LayoutSettingUI* pSettingUI{ nullptr };
class TargetListWgt* targetUI_{nullptr}; class TargetListWgt* targetUI_{nullptr};
class TargetListWgt* targetUITable_{ nullptr }; class TargetListWgt* targetUITable_{ nullptr };
class QTabWidget* tabWidget_{ nullptr };
class SignalIndicatorLampUI* signalIndicatorLampUI_{ nullptr }; class SignalIndicatorLampUI* signalIndicatorLampUI_{ nullptr };
class AddParamSetting* addParamDlg_{ nullptr }; class AddParamSetting* addParamDlg_{ nullptr };

49
Source/src/ui/MainWindow.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>1112</width>
<height>658</height> <height>774</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -31,42 +31,35 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="viewDisplay" native="true"> <widget class="QWidget" name="mainWidget" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin"> <property name="leftMargin">
<number>19</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>19</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>19</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>19</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="viewWidget" native="true"> <widget class="QTabWidget" name="tabWidget">
<layout class="QGridLayout" name="gridLayout_2"> <property name="tabPosition">
<property name="leftMargin"> <enum>QTabWidget::South</enum>
<number>0</number> </property>
</property> <widget class="QWidget" name="tab">
<property name="topMargin"> <attribute name="title">
<number>0</number> <string>Tab 1</string>
</property> </attribute>
<property name="rightMargin"> </widget>
<number>0</number> <widget class="QWidget" name="tab_2">
</property> <attribute name="title">
<property name="bottomMargin"> <string>Tab 2</string>
<number>0</number> </attribute>
</property> </widget>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout"/>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>