Compare commits

..

2 Commits

Author SHA1 Message Date
5aa674d1cd fix cursor sytle 2025-02-13 08:17:58 +08:00
1c63e9e3bc fix can not scale 2025-02-13 08:16:04 +08:00
7 changed files with 50 additions and 51 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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