合并声明

logPlus/mainwindowcurve.h

@@ -91,6 +91,9 @@ public:
     void DisplayWell_One(QJsonObject wellObjInfo);
     //展示所有道
     void DisplayTracks(QJsonArray tracksArray);
+
+    void DisplayTrack_Top(QJsonObject trackTop, int id);
+
     //展示其中一道
     void DisplayTrack_One(QJsonObject trackObjInfo, int id);
     //展示所有曲线
@@ -136,6 +139,9 @@ public slots:
     //改变道宽
     void s_changeWidth(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, int iCurrentCol, int iNewWidth);
 
+    //改变属性
+    void s_changeTrackProperty(QVariantList vlist);
+
     void onItemClicked(QTableWidgetItem* item);
     void mousePressEvent(QMouseEvent *event);
     void s_Raise(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, int iTableType, QString strFormInfoType);
@@ -151,6 +157,9 @@ public slots:
     void s_NewWell(QString strWellName, QString strSlfName);//新建井
     void s_NewTrackChangeWidth(QString strWellName, int nW=0);//新建道后，改变井宽
     void s_NewTrack_No_Line(QString strWellName, QString strTrackName);//新建空白道，没有曲线
+
+    void s_NewTrack_No_Line(QJsonObject obj);//新建空白道，没有曲线
+
     void s_AddLine_Property(QString strSlfName, QString strWellName, QString strTrackName, QString strLineName,
                               double newLeftScale, double newRightScale, QString strScaleType, QColor lineColor, double width, Qt::PenStyle lineStyle);//新建曲线，带属性