diff --git a/logPlus/forminfo.cpp b/logPlus/forminfo.cpp index b4e6a17..cfe5b56 100644 --- a/logPlus/forminfo.cpp +++ b/logPlus/forminfo.cpp @@ -395,7 +395,7 @@ void FormInfo::initProperty_MCals(QJsonObject obj) { m_MinVal = 30;//最小井径 m_MaxVal = 65;//最大井径 - m_iStartArmPos = 0; //左边井径序号 + m_iStartArmPos = 1; //左边井径序号 m_iEndArmPos = 20;//右边井径序号 m_MinRatio = 0.5; //最小外径占道比例 m_MaxRatio = 0.6;//最大外径占道比例 @@ -2706,6 +2706,21 @@ void FormInfo::contextMenuEvent(QContextMenuEvent *event) menu.addAction(QIcon(::GetImagePath() + "icon/Delete.png"), "删除当前对象", this, &FormInfo::onDeleteTable); menu.exec(event->globalPos()); } + else if(m_strType=="ganzhuangtuObject" || m_strType=="JyktObject" ||m_strType=="DenvObject") + { + //杆状图、井眼垮塌矢量图、井斜方位图 + QMenu menu(this); + menu.addAction(QIcon(::GetImagePath() + "icon/Delete.png"), "删除当前对象", this, &FormInfo::onDeleteTable); + menu.exec(event->globalPos()); + } + else if(m_strType=="MCalsObject") + { + //多臂井径 + QMenu menu(this); + menu.addAction(QIcon(::GetImagePath() + "icon/Sheet.png"), "数据对象查看", this, &FormInfo::onShowWave); + menu.addAction(QIcon(::GetImagePath() + "icon/Delete.png"), "删除当前对象", this, &FormInfo::onDeleteWave); + menu.exec(event->globalPos()); + } } //曲线数据查看 diff --git a/logPlus/forminfo.h b/logPlus/forminfo.h index 1c13555..095c5cf 100644 --- a/logPlus/forminfo.h +++ b/logPlus/forminfo.h @@ -396,7 +396,7 @@ public: //多臂井径 float m_MinVal = 30; //最小井径 float m_MaxVal = 65; //最大井径 - int m_iStartArmPos = 0; //左边井径序号 + int m_iStartArmPos = 1; //左边井径序号 int m_iEndArmPos = 20; //右边井径序号 float m_MinRatio = 0.5; //最小外径占道比例 float m_MaxRatio = 0.6; //最大外径占道比例