diff --git a/doc/dyt修改.txt b/doc/dyt修改.txt
index 3780a144..414fa278 100644
--- a/doc/dyt修改.txt
+++ b/doc/dyt修改.txt
@@ -33,7 +33,7 @@
7.属性、实体、report等这些窗口,加上稍微明显一点的边界,然后点击边界拖动时候改变窗口大小或者改变位置。就和桌面上的文件一样任意改变窗口大小和位置。
解决方案
a、界面美化,层次感 (解决)
- b、鼠标拖动放大缩小之后,松开鼠标再次拖动无法缩小
+ b、鼠标拖动放大缩小之后,松开鼠标再次拖动无法缩小 (解决)
c、所有窗口都用dock形式,用户随意拖动放置到其他窗口中
d、窗口布局影响窗口位置
e、窗口会自动变大
diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts
index 5450fc9e..fec9d2c9 100644
--- a/src/translations/Dyt_zh_CN.ts
+++ b/src/translations/Dyt_zh_CN.ts
@@ -410,12 +410,12 @@
-
+
2D Curve
-
+
2D(y(lg)) Curve
@@ -478,7 +478,7 @@
窗口管理
-
+
system manager
系统管理
@@ -506,138 +506,138 @@
-
+
Speed Curve
-
+
3D Curve
-
-
+
+
Target number
-
-
+
+
Signal-to-noise ratio
-
-
+
+
Azimuth line of sight
-
-
+
+
Pitch gaze angle
-
-
+
+
azimuth
-
-
+
+
Pitch angle
-
-
+
+
attribute
属性
-
-
+
+
Doppler
-
-
+
+
course
-
-
+
+
Speed
-
-
+
+
longitude
-
-
+
+
latitude
-
-
+
+
distance
-
-
+
+
velocity
-
-
+
+
Radial dimensions
-
-
+
+
Target RCS
-
+
Report Table
-
+
Report
-
+
Signal Indicator Lamp
-
+
ParamSetting
-
+
Matlab File
-
+
name: 5year 0412
diff --git a/src/ui/MainFrame.cpp b/src/ui/MainFrame.cpp
index 0fefd328..855f9bd5 100644
--- a/src/ui/MainFrame.cpp
+++ b/src/ui/MainFrame.cpp
@@ -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_);
diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp
index a1ee2269..73e230af 100644
--- a/src/ui/MainWindow.cpp
+++ b/src/ui/MainWindow.cpp
@@ -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);
diff --git a/src/ui/chartPlot/FitCurveDialog.cpp b/src/ui/chartPlot/FitCurveDialog.cpp
index 6b764150..10dea141 100644
--- a/src/ui/chartPlot/FitCurveDialog.cpp
+++ b/src/ui/chartPlot/FitCurveDialog.cpp
@@ -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);