diff --git a/doc/dyt修改.txt b/doc/dyt修改.txt
index 414fa278..9dd7edb5 100644
--- a/doc/dyt修改.txt
+++ b/doc/dyt修改.txt
@@ -7,9 +7,9 @@
3.窗口1的Report和窗口2的Report Table 展示的是不是同样的内容，如果是可以删除一个。需要在窗口1或2看的report时候通过窗口管理拖动实现。
解决方案
- a、保留窗口2的Report Table
+ a、保留窗口2的Report Table （解决）
b、窗口2中的Report Table, 可以拖动变成dock模式添加到其他的窗口中
- c、有缩放属性的控件，鼠标都显示为双箭头
+ c、有缩放属性的控件，鼠标都显示为双箭头 （解决）
d、所有的窗口表头可以采用拖动的形式调整列的位置
4.需要连续用到的操作、功能类似的放到一个大界面。这些不知道具体怎么分就需要讨论细分一下比如：
@@ -37,5 +37,5 @@
c、所有窗口都用dock形式，用户随意拖动放置到其他窗口中
d、窗口布局影响窗口位置
e、窗口会自动变大
- f、report窗口能分离出来
+ f、report窗口能分离出来 （解决）
\ No newline at end of file
diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts
index fec9d2c9..eefc0b8f 100644
--- a/src/translations/Dyt_zh_CN.ts
+++ b/src/translations/Dyt_zh_CN.ts
@@ -517,97 +517,81 @@
-
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
@@ -617,27 +601,22 @@
-
- Report
-
-
-
-
+
Signal Indicator Lamp
-
+
ParamSetting
-
+
Matlab File
-
+
name: 5year 0412
@@ -1668,7 +1647,7 @@
-
+
Data Table
diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp
index 73e230af..c3674fe2 100644
--- a/src/ui/MainWindow.cpp
+++ b/src/ui/MainWindow.cpp
@@ -158,31 +158,6 @@ void MainWindow::InitUI() {
}
- {
- targetUI_ = new TargetListWgt;
- //WorkSpaceManager::Get().SetTargetListWgt(targetUITable_);
-
- QStringList headerLabels;
- headerLabels << tr("Target number") << tr("Signal-to-noise ratio") //QString::fromLocal8Bit("Ŀ") << QString::fromLocal8Bit("")
- << tr("Azimuth line of sight") << tr("Pitch gaze angle") // QString::fromLocal8Bit("λ߽") << QString::fromLocal8Bit("߽")
- << tr("azimuth") << tr("Pitch angle") // QString::fromLocal8Bit("λ") << QString::fromLocal8Bit("")
- << tr("attribute") << tr("Doppler") // QString::fromLocal8Bit("") << QString::fromLocal8Bit("")
- << tr("course") << tr("Speed") // QString::fromLocal8Bit("") << QString::fromLocal8Bit("")
- << tr("longitude") << tr("latitude") // QString::fromLocal8Bit("") << QString::fromLocal8Bit("γ")
- << tr("distance") << tr("velocity") // QString::fromLocal8Bit("") << QString::fromLocal8Bit("ٶ")
- << tr("Radial dimensions") << tr("Target RCS"); // QString::fromLocal8Bit("ߴ") << QString::fromLocal8Bit("ĿRCS");
-
- targetUI_->SetHeader(headerLabels);
- const QString reportPath = RecourceHelper::Get().GetBasePath() + "/workspace/Report.txt";
- targetUI_->InitFile(reportPath, 50);
-
- DockWidget* dataTableDock = new DockWidget(tr("Report"), 0);
- // addDockWidget(pSettingUI->GetArea("TargetListWgt"), dataTableDock);
- targetUI_->AttachDock(dataTableDock);
- m_mapDockWidget.insert("TargetListWgt", dataTableDock);
- }
-
-
const QString lampPath = RecourceHelper::Get().GetBasePath() + "/workspace/Lamp.txt";
DockWidget* signalIndicatorLampDock = new DockWidget(tr("Signal Indicator Lamp"), 0);
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 3b221341..1dcb3da6 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -61,7 +61,6 @@ private:
class FitCurveDialog* fitYLgCurveDlg_{ nullptr };
class SurfaceDialog* surfaceDlg_{ nullptr };
class LayoutSettingUI* pSettingUI{ nullptr };
- class TargetListWgt* targetUI_{ nullptr };
class TargetListWgt* targetUITable_{ nullptr };
class QTabWidget* tabWidget_{ nullptr };
class SignalIndicatorLampUI* signalIndicatorLampUI_{ nullptr };
diff --git a/src/ui/Table/targetlistwgt.cpp b/src/ui/Table/targetlistwgt.cpp
index 725eacfe..3cd442a4 100644
--- a/src/ui/Table/targetlistwgt.cpp
+++ b/src/ui/Table/targetlistwgt.cpp
@@ -37,8 +37,6 @@ TargetListWgt::TargetListWgt(QWidget * parent) : QWidget(parent) {
InitWgt();
- m_bMoveWgt = false;
-
ui.lineEdit->setText("1");
ui.lineEdit_2->setText("1");
ui.spinBox_2->setValue(1);
@@ -272,51 +270,6 @@ void TargetListWgt::timerEvent(QTimerEvent *event)
}
-void TargetListWgt::mousePressEvent(QMouseEvent *event)
-{
- if (Qt::LeftButton == event->button())
- {
- m_bMoveWgt = true;
-
- m_pStartPos =mapToGlobal(event->pos());
- }
-
- QWidget::mousePressEvent(event);
-}
-
-void TargetListWgt::mouseMoveEvent(QMouseEvent *event)
-{
- if (m_bMoveWgt)
- {
- QPoint mousePos = mapToGlobal(event->pos());
-
- QPoint curPos = this->pos();
-
- QPoint movePos = curPos + (mousePos - m_pStartPos);
-
- this->move(movePos);
-
- m_pStartPos = mousePos;
- }
-
- QWidget::mouseMoveEvent(event);
-}
-
-void TargetListWgt::mouseReleaseEvent(QMouseEvent *event)
-{
- if (Qt::LeftButton == event->button())
- {
- m_bMoveWgt = false;
- }
-
- QWidget::mouseReleaseEvent(event);
-}
-
-void TargetListWgt::closeEvent(QCloseEvent *event)
-{
-
-}
-
void TargetListWgt::UpdateTable(int iTime)
{
if (iTime < 1)
diff --git a/src/ui/Table/targetlistwgt.h b/src/ui/Table/targetlistwgt.h
index cd6250da..ca1d3928 100644
--- a/src/ui/Table/targetlistwgt.h
+++ b/src/ui/Table/targetlistwgt.h
@@ -45,11 +45,6 @@ protected:
void timerEvent(QTimerEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
- void closeEvent(QCloseEvent *event);
-
void UpdateTable(int iTime);
protected slots:
@@ -79,9 +74,6 @@ private:
int m_nBoundaryWth;
- bool m_bMoveWgt; // 是否移动窗口
- QPoint m_pStartPos; // 初始位置
-
QVariantList m_varRowDataList;
QString m_strFile;