1、确定合并的文件；

Src4/nmNum/nmNum.pro

@@ -9,7 +9,5 @@ addSubdirs(nmData)
 addSubdirs(nmPlot)
 addSubdirs(nmSubWnd)
 addSubdirs(nmSubWxs)
-addSubdirs(nmXml)
-
 
 fixDepends()

Src4/nmNum/nmSubWxs/nmSubWxs.pro

@@ -1,6 +1,6 @@
 ## ///////////////////////////////////////
-## <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ  <20><>ֵ<EFBFBD>Ծ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+## 本类库主要  数值试井 如下内容
-## <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD>һЩ<EFBFBD>Ի<EFBFBD><EFBFBD><EFBFBD>֮<EFBFBD><EFBFBD>
+## 窗体组件，主要是一些对话框之类
 ## ///////////////////////////////////////
 
 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}/iPlot
-INCLUDEPATH += $${wtInclude}/iData/iDataEngine
+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 += -liGuiBase -liGuiGridPty -lmGuiJob -lmGuiPlot
-LIBS += -liSysUtils #-liDataPool
+LIBS += -liAlgMath -lmToolPvt
-LIBS += -lnmData
+LIBS += -liSysUtils -lmProjectManager -lnmData
+LIBS += -liPlotbase -liPlotCurveT -liPlotWxT