feat(nmNum): 移除数值试井新建井菜单及命令入口

Bin/XmlFiles/MenuDefines_Ribbon_cn.xml

@@ -236,8 +236,10 @@
             <Cmd ID="5104" Bounds="0,5" Name="NmPolygon" Alias="矩形边界" Icon="NmRectangle" />
             <Cmd ID="5105" Bounds="1,5" Name="NmPolygon" Alias="圆形边界" Icon="NmRound" />
             <Cmd ID="5106" Bounds="0,6,2,1" Name="NmFault" Alias="断层" Icon="NmFault" />
-            <Cmd ID="5107" Bounds="0,7" Name="NmWell" Alias="选择井" Icon="NmWell" />
+            <Cmd ID="5107" Bounds="0,7,2,1" Name="NmWell" Alias="选择井" Icon="NmWell" />
+            <!-- 新建井菜单暂时停用
             <Cmd ID="5108" Bounds="1,7" Name="NmWell" Alias="新建井" Icon="NmWell" />
+            -->
             <Cmd ID="5109" Bounds="0,8,2,1" Name="NmFault" Alias="裂缝" Icon="NmFault" />
             <Cmd ID="5110" Bounds="0,9" Name="NmLimit" Alias="区域" Icon="NmLimit" />
             <Cmd ID="5111" Bounds="1,9" Name="NmRegion" Alias="标记区域" Icon="NmRegion" />

Bin/XmlFiles/MenuDefines_Ribbon_en.xml

@@ -234,8 +234,10 @@
             <Cmd ID="5104" Bounds="0,5" Name="NmPolygon" Alias="Rectangle Boundary" Icon="NmRectangle" />
             <Cmd ID="5105" Bounds="1,5" Name="NmPolygon" Alias="Circle Boundary" Icon="NmRound" />
             <Cmd ID="5106" Bounds="0,6,2,1" Name="NmFault" Alias="Fault" Icon="NmFault" />
-            <Cmd ID="5107" Bounds="0,7" Name="NmWell" Alias="Select Well" Icon="NmWell" />
+            <Cmd ID="5107" Bounds="0,7,2,1" Name="NmWell" Alias="Select Well" Icon="NmWell" />
+            <!-- New Well menu is temporarily disabled.
             <Cmd ID="5108" Bounds="1,7" Name="NmWell" Alias="New Well" Icon="NmWell" />
+            -->
             <Cmd ID="5109" Bounds="0,8,2,1" Name="NmFault" Alias="Fracture" Icon="NmFault" />
             <Cmd ID="5110" Bounds="0,9" Name="NmLimit" Alias="Region" Icon="NmLimit" />
             <Cmd ID="5111" Bounds="1,9" Name="NmRegion" Alias="Mark Region" Icon="NmRegion" />

Include/nmNum/nmSubWnd/nmSubWndMain.h

@@ -171,8 +171,8 @@ class NM_SUB_WND_EXPORT nmSubWndMain : public iSubWndBaseFit {
     void drawFault();
     // 选择井
     void selectWell();
-    // 画井点
+    // 新建井菜单暂时停用。
-    void drawWell();
+    // void drawWell();
     // 画裂缝
     void drawCrack();
     // 画区域

Src/nmNum/nmSubWnd/nmSubWndMain.cpp

@@ -442,9 +442,10 @@ bool nmSubWndMain::runCmdBy(QString sName, QString sID)
             this->selectWell();
             return true;
 
-        case 5108:
+        // 新建井菜单暂时停用。
-            this->drawWell();
+        // case 5108:
-            return true;
+        //     this->drawWell();
+        //     return true;
 
         case 5109:
             this->drawCrack();
@@ -1293,18 +1294,12 @@ void nmSubWndMain::selectWell()
 	}
 }
 
-void nmSubWndMain::drawWell()
+// 新建井菜单暂时停用。
-{
+// void nmSubWndMain::drawWell()
-    // 获取多边形边界的绘制，并模拟触发点击操作
+// {
-    // 目前多边形边界绘制是工具栏的第4个，所以用 3
+//     this->triggerToolBarAction(NMOT_Point_Well);
-    //    QList<QAction *> actions = m_pPlotToolBar->actions();
+//     nmDataLogFile::getInstance()->writeLog(" in drawWell ");
-    //    if (!actions.isEmpty()) {
+// }
-    //        QAction *action = actions[0];
-    //        action->trigger();
-    //    }
-    this->triggerToolBarAction(NMOT_Point_Well);
-    nmDataLogFile::getInstance()->writeLog(" in drawWell ");
-}
 
 void nmSubWndMain::drawCrack()
 {
@@ -2126,7 +2121,7 @@ void nmSubWndMain::setLocked()
         nIDs.append("5105");
         nIDs.append("5106");
         nIDs.append("5107");
-        nIDs.append("5108");
+        // nIDs.append("5108"); // 新建井菜单暂时停用
         nIDs.append("5109");
         nIDs.append("5110");
         nIDs.append("5111");
@@ -2181,7 +2176,7 @@ void nmSubWndMain::setLocked()
         nIDs.append("5105");
         nIDs.append("5106");
         nIDs.append("5107");
-        nIDs.append("5108");
+        // nIDs.append("5108"); // 新建井菜单暂时停用
         nIDs.append("5109");
         nIDs.append("5110");
         nIDs.append("5111");