1、数值试井数据采用单例模式；

Src/nmNum/nmSubWnd/nmSubWndGrid.cpp

@@ -49,7 +49,7 @@ nmSubWndGrid::nmSubWndGrid(QWidget *parent, QString sExt) :
     iSubWndBaseAF(parent, sExt)
 {
     m_sMdiWndType = s_MdiType_DataNum;
-	m_pAnalyzeData = nmDataDemo::getInstance();
+    m_pAnalyzeData = nmDataDemo::getInstance();
     setWindowTitle(tr("nmSubWndGrid"));
 }
 
@@ -102,7 +102,7 @@ QWidget* nmSubWndGrid::initUiMainWx()
         nmDataLogFile::getInstance()->writeLog(QString("%1 %2").arg(p.x()).arg(p.y()));
     }
     nmDataLogFile::getInstance()->writeLog("==== outline end ====");
-    QVector<QVector<double>> wellList = pPlot->getWellsInformation();
+    QVector<QVector<double >> wellList = pPlot->getWellsInformation();
     nmDataLogFile::getInstance()->writeLog("==== " + QString::number(outlineInformation.count()) + " ====");
     nmDataLogFile::getInstance()->writeLog("==== " + QString::number(wellList.count()) + " ====");
     // 根据边界和井的信息生成geo文件，先生成一个文件到tmp中
@@ -124,7 +124,7 @@ bool nmSubWndGrid::runCmdBy(QString sName, QString sID)
     return false;
 }
 
-void nmSubWndGrid::genGeo(QVector<QPointF> outlinePoints, QVector<QVector<double>> vWellsInfo)
+void nmSubWndGrid::genGeo(QVector<QPointF> outlinePoints, QVector<QVector<double >> vWellsInfo)
 {
     // 井数据结构
     QVector<CircleWell> circles;

Src/nmNum/nmSubWnd/nmSubWndMain.cpp

@@ -67,7 +67,7 @@ nmSubWndMain::nmSubWndMain(QWidget *parent, QString sExt) :
         m_pDataWell = zxCurWell;
     }
     m_sMdiWndType = s_MdiType_DataNum;
-	m_pAnalyzeData = nmDataDemo::getInstance();
+    m_pAnalyzeData = nmDataDemo::getInstance();
     setWindowTitle(tr("nmSubWndMain"));
 }
 

Src/nmNum/nmSubWnd/nmSubWndUtils.cpp

@@ -26,19 +26,15 @@ iSubWnd* nmSubWndUtils::createSubWnd(QString sID, QString sExt)
     int nID = sID.toInt();
     if (nID == 5101) {
         // 初始化一个数据类
-        //nmDataDemo* analyzeData = nmDataDemo::getInstance();
         // TODO，先弹窗做新建分析，再创建subWnd
-        nmWxNewNormalDlg* dlg = new nmWxNewNormalDlg(NULL);
+        nmWxNewNormalDlg dlg(NULL);
-		//dlg->show();
+        if(dlg.exec() == QDialog::Rejected) {
-		/*QDialog* dlg = new QDialog;
-		dlg->show();*/
-        if(dlg->exec() == QDialog::Rejected) {
             // 对话框被用户显式拒绝
             // 在这里处理你的逻辑
             return nullptr;
         }
-		nmSubWndMain* pSubWndDemo = new nmSubWndMain(NULL, sExt);
+        nmSubWndMain* pSubWndDemo = new nmSubWndMain(NULL, sExt);
-		pSubWnd = pSubWndDemo;
+        pSubWnd = pSubWndDemo;
     } else if (nID == 5401) {
         // 网格
         nmSubWndGrid* pSubWndGrid = new nmSubWndGrid(NULL, sExt);