From c155e3ea7a7fcb5435256424c961a3a87996a290 Mon Sep 17 00:00:00 2001
From: simonyan <315082291@qq.com>
Date: Mon, 4 Nov 2024 13:23:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A1=AE=E5=AE=9A=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src4/nmNum/nmNum.pro             |  2 --
 Src4/nmNum/nmSubWxs/nmSubWxs.pro | 44 ++++++++++++++++++++++----------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/Src4/nmNum/nmNum.pro b/Src4/nmNum/nmNum.pro
index 7008a26..0290020 100644
--- a/Src4/nmNum/nmNum.pro
+++ b/Src4/nmNum/nmNum.pro
@@ -9,7 +9,5 @@ addSubdirs(nmData)
 addSubdirs(nmPlot)
 addSubdirs(nmSubWnd)
 addSubdirs(nmSubWxs)
-addSubdirs(nmXml)
-
 
 fixDepends()
diff --git a/Src4/nmNum/nmSubWxs/nmSubWxs.pro b/Src4/nmNum/nmSubWxs/nmSubWxs.pro
index b641714..e45bdb4 100644
--- a/Src4/nmNum/nmSubWxs/nmSubWxs.pro
+++ b/Src4/nmNum/nmSubWxs/nmSubWxs.pro
@@ -1,6 +1,6 @@
 ## ///////////////////////////////////////
-## �������Ҫ  ��ֵ�Ծ� ��������
-## �����������Ҫ��һЩ�Ի���֮��
+## ±¾Àà¿âÖ÷Òª  ÊýÖµÊÔ¾® ÈçÏÂÄÚÈÝ
+## ´°Ìå×é¼þ£¬Ö÷ÒªÊÇһЩ¶Ô»°¿òÖ®Àà
 ## ///////////////////////////////////////
 
 QT += core
@@ -12,7 +12,6 @@ TARGET = nmSubWxs
 TEMPLATE = lib
 
 include(../../setting.pri)
-include(../../vtk.pri)
 
 DEFINES += NM_SUB_WXS_LIBRARY
 
@@ -26,33 +25,52 @@ INCLUDEPATH += $${wtInclude}/iBase/iPlugin
 INCLUDEPATH += $${wtInclude}/iBase/iUnit
 INCLUDEPATH += $${wtInclude}/iBase/iXmlBase
 
+INCLUDEPATH += $${wtInclude}/iAlg
+INCLUDEPATH += $${wtInclude}/iAlg/iAlgMath
+
 INCLUDEPATH += $${wtInclude}/iData
-#INCLUDEPATH += $${wtInclude}/iData/iDataPool
+INCLUDEPATH += $${wtInclude}/iData/iDataEngine
+INCLUDEPATH += $${wtInclude}/iData/iDataPool
 INCLUDEPATH += $${wtInclude}/iData/iXmlManager
 INCLUDEPATH += $${wtInclude}/iData/iXmlManager/Models
 INCLUDEPATH += $${wtInclude}/iData/iSysUtils
 
-INCLUDEPATH += $${wtInclude}/iData/iDataPool
-INCLUDEPATH += $${wtInclude}/iData/iDataEngine
+INCLUDEPATH += $${wtInclude}/iPlot
+INCLUDEPATH += $${wtInclude}/iPlot/iPlotbase
+INCLUDEPATH += $${wtInclude}/iPlot/iPlotbase/Tools
+INCLUDEPATH += $${wtInclude}/iPlot/iPlotCurveT
+INCLUDEPATH += $${wtInclude}/iPlot/iPlotCurveT/Objects
+INCLUDEPATH += $${wtInclude}/iPlot/iPlotWxT
+INCLUDEPATH += $${wtInclude}/iPlot/iPlotWxT
 
 INCLUDEPATH += $${wtInclude}/iGui
 INCLUDEPATH += $${wtInclude}/iGui/iGuiBase
 INCLUDEPATH += $${wtInclude}/iGui/iGuiGridPty
 
-INCLUDEPATH += $${wtInclude}/nmNum
-INCLUDEPATH += $${wtInclude}/nmNum/nmSubWxs
-INCLUDEPATH += $${wtInclude}/nmNum/nmSubWxs/SubWxs
-
 INCLUDEPATH += $${wtInclude}/mData
 INCLUDEPATH += $${wtInclude}/mData/mModuleDefines
 INCLUDEPATH += $${wtInclude}/mData/mProjectManager
 INCLUDEPATH += $${wtInclude}/mData/mProjectManager/DataModels
 
+INCLUDEPATH += $${wtInclude}/mGui
+INCLUDEPATH += $${wtInclude}/mGui/mGuiJob
+INCLUDEPATH += $${wtInclude}/mGui/mGuiPlot
+
+INCLUDEPATH += $${wtInclude}/mTool
+INCLUDEPATH += $${wtInclude}/mTool/mToolPvt
+
+INCLUDEPATH += $${wtInclude}/nmNum
+INCLUDEPATH += $${wtInclude}/nmNum/nmData
+INCLUDEPATH += $${wtInclude}/nmNum/nmSubWxs
+INCLUDEPATH += $${wtInclude}/nmNum/nmSubWxs/SubWxs
+
 SOURCES += $${wtSrc}/nmNum/nmSubWxs/*.cpp
+FORMS += $${wtSrc}/nmNum/nmSubWxs/*.ui
 HEADERS += $${wtInclude}/nmNum/nmSubWxs/*.h
 #FORMS += $${wtSrc}/nmNum/nmSubWxs/SubWxs/*.ui
 
 LIBS += -liBase -liUtils -liPlugin -liLogs -liUnit -liXmlBase
-LIBS += -liGuiBase -liGuiGridPty
-LIBS += -liSysUtils #-liDataPool
-LIBS += -lnmData
+LIBS += -liGuiBase -liGuiGridPty -lmGuiJob -lmGuiPlot
+LIBS += -liAlgMath -lmToolPvt
+LIBS += -liSysUtils -lmProjectManager -lnmData
+LIBS += -liPlotbase -liPlotCurveT -liPlotWxT