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

Compare commits

base: PM:5aa674d1cdbc49130dcf748713f5243334920932
Branches Tags
PM:main
PM:new_osg
PM:new_osg_render
PM:master
..
compare: PM:2e7030de3c41deb26be79e964bcf9b163ba12ef5
Branches Tags
PM:new_osg
PM:main
PM:new_osg_render
PM:master

No commits in common. "5aa674d1cdbc49130dcf748713f5243334920932" and "2e7030de3c41deb26be79e964bcf9b163ba12ef5" have entirely different histories.
5aa674d1cd ... 2e7030de3c

7 changed files with 51 additions and 50 deletions
Show Stats Expand all files Collapse all files

2
doc/dyt修改.txt
View File

@ -33,7 +33,7 @@
7.属性、实体、report等这些窗口，加上稍微明显一点的边界，然后点击边界拖动时候改变窗口大小或者改变位置。就和桌面上的文件一样任意改变窗口大小和位置。 7.属性、实体、report等这些窗口，加上稍微明显一点的边界，然后点击边界拖动时候改变窗口大小或者改变位置。就和桌面上的文件一样任意改变窗口大小和位置。
解决方案 解决方案
a、界面美化，层次感 (解决) a、界面美化，层次感 (解决)
b、鼠标拖动放大缩小之后，松开鼠标再次拖动无法缩小 （解决） b、鼠标拖动放大缩小之后，松开鼠标再次拖动无法缩小
c、所有窗口都用dock形式，用户随意拖动放置到其他窗口中 c、所有窗口都用dock形式，用户随意拖动放置到其他窗口中
d、窗口布局影响窗口位置 d、窗口布局影响窗口位置
e、窗口会自动变大 e、窗口会自动变大

86
src/translations/Dyt_zh_CN.ts
View File

@ -410,12 +410,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/chartPlot/FitCurveDialog.cpp" line="772"/> <location filename="../ui/chartPlot/FitCurveDialog.cpp" line="773"/>
<source>2D Curve</source> <source>2D Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/chartPlot/FitCurveDialog.cpp" line="776"/> <location filename="../ui/chartPlot/FitCurveDialog.cpp" line="777"/>
<source>2D(y(lg)) Curve</source> <source>2D(y(lg)) Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -478,7 +478,7 @@
<translation type="vanished">窗口管理</translation> <translation type="vanished">窗口管理</translation>
</message> </message>
<message> <message>
<location filename="../ui/MainFrame.cpp" line="113"/> <location filename="../ui/MainFrame.cpp" line="116"/>
<source>system manager</source> <source>system manager</source>
<translation>系统管理</translation> <translation>系统管理</translation>
</message> </message>
@ -506,138 +506,138 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="120"/> <location filename="../ui/MainWindow.cpp" line="122"/>
<source>Speed Curve</source> <source>Speed Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="129"/> <location filename="../ui/MainWindow.cpp" line="131"/>
<source>3D Curve</source> <source>3D Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="141"/> <location filename="../ui/MainWindow.cpp" line="143"/>
<location filename="../ui/MainWindow.cpp" line="166"/> <location filename="../ui/MainWindow.cpp" line="168"/>
<source>Target number</source> <source>Target number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="141"/> <location filename="../ui/MainWindow.cpp" line="143"/>
<location filename="../ui/MainWindow.cpp" line="166"/> <location filename="../ui/MainWindow.cpp" line="168"/>
<source>Signal-to-noise ratio</source> <source>Signal-to-noise ratio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="142"/> <location filename="../ui/MainWindow.cpp" line="144"/>
<location filename="../ui/MainWindow.cpp" line="167"/> <location filename="../ui/MainWindow.cpp" line="169"/>
<source>Azimuth line of sight</source> <source>Azimuth line of sight</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="142"/> <location filename="../ui/MainWindow.cpp" line="144"/>
<location filename="../ui/MainWindow.cpp" line="167"/> <location filename="../ui/MainWindow.cpp" line="169"/>
<source>Pitch gaze angle</source> <source>Pitch gaze angle</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="143"/> <location filename="../ui/MainWindow.cpp" line="145"/>
<location filename="../ui/MainWindow.cpp" line="168"/> <location filename="../ui/MainWindow.cpp" line="170"/>
<source>azimuth</source> <source>azimuth</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="143"/> <location filename="../ui/MainWindow.cpp" line="145"/>
<location filename="../ui/MainWindow.cpp" line="168"/> <location filename="../ui/MainWindow.cpp" line="170"/>
<source>Pitch angle</source> <source>Pitch angle</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="144"/> <location filename="../ui/MainWindow.cpp" line="146"/>
<location filename="../ui/MainWindow.cpp" line="169"/> <location filename="../ui/MainWindow.cpp" line="171"/>
<source>attribute</source> <source>attribute</source>
<translation type="unfinished">属性</translation> <translation type="unfinished">属性</translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="144"/> <location filename="../ui/MainWindow.cpp" line="146"/>
<location filename="../ui/MainWindow.cpp" line="169"/> <location filename="../ui/MainWindow.cpp" line="171"/>
<source>Doppler</source> <source>Doppler</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="145"/> <location filename="../ui/MainWindow.cpp" line="147"/>
<location filename="../ui/MainWindow.cpp" line="170"/> <location filename="../ui/MainWindow.cpp" line="172"/>
<source>course</source> <source>course</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="145"/> <location filename="../ui/MainWindow.cpp" line="147"/>
<location filename="../ui/MainWindow.cpp" line="170"/> <location filename="../ui/MainWindow.cpp" line="172"/>
<source>Speed</source> <source>Speed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="146"/> <location filename="../ui/MainWindow.cpp" line="148"/>
<location filename="../ui/MainWindow.cpp" line="171"/> <location filename="../ui/MainWindow.cpp" line="173"/>
<source>longitude</source> <source>longitude</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="146"/> <location filename="../ui/MainWindow.cpp" line="148"/>
<location filename="../ui/MainWindow.cpp" line="171"/> <location filename="../ui/MainWindow.cpp" line="173"/>
<source>latitude</source> <source>latitude</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="147"/> <location filename="../ui/MainWindow.cpp" line="149"/>
<location filename="../ui/MainWindow.cpp" line="172"/> <location filename="../ui/MainWindow.cpp" line="174"/>
<source>distance</source> <source>distance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="147"/> <location filename="../ui/MainWindow.cpp" line="149"/>
<location filename="../ui/MainWindow.cpp" line="172"/> <location filename="../ui/MainWindow.cpp" line="174"/>
<source>velocity</source> <source>velocity</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="148"/> <location filename="../ui/MainWindow.cpp" line="150"/>
<location filename="../ui/MainWindow.cpp" line="173"/> <location filename="../ui/MainWindow.cpp" line="175"/>
<source>Radial dimensions</source> <source>Radial dimensions</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="148"/> <location filename="../ui/MainWindow.cpp" line="150"/>
<location filename="../ui/MainWindow.cpp" line="173"/> <location filename="../ui/MainWindow.cpp" line="175"/>
<source>Target RCS</source> <source>Target RCS</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="154"/> <location filename="../ui/MainWindow.cpp" line="156"/>
<source>Report Table</source> <source>Report Table</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="179"/> <location filename="../ui/MainWindow.cpp" line="181"/>
<source>Report</source> <source>Report</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="188"/> <location filename="../ui/MainWindow.cpp" line="190"/>
<source>Signal Indicator Lamp</source> <source>Signal Indicator Lamp</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="195"/> <location filename="../ui/MainWindow.cpp" line="197"/>
<source>ParamSetting</source> <source>ParamSetting</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="200"/> <location filename="../ui/MainWindow.cpp" line="202"/>
<source>Matlab File</source> <source>Matlab File</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="205"/> <location filename="../ui/MainWindow.cpp" line="207"/>
<source>name: 5year 0412</source> <source>name: 5year 0412</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

4
src/ui/DockWidget.cpp
View File

@ -72,10 +72,6 @@ void DockWidget::showEvent(QShowEvent* e) {
void DockWidget::resizeEvent(QResizeEvent* e) { void DockWidget::resizeEvent(QResizeEvent* e) {
QDockWidget::resizeEvent(e); QDockWidget::resizeEvent(e);
}
void DockWidget::paintEvent(QPaintEvent* e) {
QDockWidget::paintEvent(e);
QStyleOptionDockWidget opt; QStyleOptionDockWidget opt;
initStyleOption(&opt); initStyleOption(&opt);
} }

1
src/ui/DockWidget.h
View File

@ -41,7 +41,6 @@ Q_SIGNALS:
protected: protected:
void showEvent(QShowEvent* e) override; void showEvent(QShowEvent* e) override;
void resizeEvent(QResizeEvent* e) override; void resizeEvent(QResizeEvent* e) override;
void paintEvent(QPaintEvent* e) override;
private: private:
void OnClose(); void OnClose();

5
src/ui/MainFrame.cpp
View File

@ -38,7 +38,7 @@ MainFrame::MainFrame(QWidget *parent) :
assert(nullptr == s_instance); assert(nullptr == s_instance);
s_instance = this; s_instance = this;
ui->titleFrame->SetMainWidget(this); ui->titleFrame->SetMainWidget(this);
ui->titleFrame->SetTitle(tr("Dyt")); ui->titleFrame->SetTitle(tr("Dyt"));
ui->titleFrame->InitMenuWidget(); ui->titleFrame->InitMenuWidget();
@ -109,6 +109,9 @@ void MainFrame::InitUI() {
PlayManagerMenu* playMenu = new PlayManagerMenu(this); PlayManagerMenu* playMenu = new PlayManagerMenu(this);
AddMenuWidget("play_manager", tr("play manager"), playMenu); AddMenuWidget("play_manager", tr("play manager"), playMenu);
//WindowManagerMenu* windowMenu = new WindowManagerMenu(this);
//AddMenuWidget("window_manager", tr("window manager"), windowMenu);
SystemManagerMenu* system_ = new SystemManagerMenu(this); SystemManagerMenu* system_ = new SystemManagerMenu(this);
AddMenuWidget("system_manager", tr("system manager"), system_); AddMenuWidget("system_manager", tr("system manager"), system_);

2
src/ui/MainWindow.cpp
View File

@ -112,11 +112,13 @@ void MainWindow::InitUI() {
} }
DockWidget* fitCurveDock = new DockWidget(tr("Wave Curve"), 0); DockWidget* fitCurveDock = new DockWidget(tr("Wave Curve"), 0);
fitCurveDlg_ = new FitCurveDialog(1); fitCurveDlg_ = new FitCurveDialog(1);
fitCurveDlg_->AttachDock(fitCurveDock); fitCurveDlg_->AttachDock(fitCurveDock);
m_mapDockWidget.insert("WaveCurveDialog", fitCurveDock); m_mapDockWidget.insert("WaveCurveDialog", fitCurveDock);
fitCurveDlg_->InitWaveFile(wavePath); fitCurveDlg_->InitWaveFile(wavePath);
DockWidget* fitLgCurveDock = new DockWidget(tr("Speed Curve"), 0); DockWidget* fitLgCurveDock = new DockWidget(tr("Speed Curve"), 0);
fitYLgCurveDlg_ = new FitCurveDialog(1); fitYLgCurveDlg_ = new FitCurveDialog(1);

1
src/ui/chartPlot/FitCurveDialog.cpp
View File

@ -25,6 +25,7 @@ FitCurveDialog::FitCurveDialog(int iType, QWidget* parent) :
setWindowTitle("2D(y(lg)) Curve"); setWindowTitle("2D(y(lg)) Curve");
} }
qApp->setOverrideCursor(Qt::ArrowCursor); //允许系统弹窗、提示
initQChartView(); initQChartView();
connect(&WorkSpaceManager::Get(), &WorkSpaceManager::WorkSpaceChanged, this, &FitCurveDialog::OnWorkSpaceChanged); connect(&WorkSpaceManager::Get(), &WorkSpaceManager::WorkSpaceChanged, this, &FitCurveDialog::OnWorkSpaceChanged);