diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index f00f8a2..2536b59 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -30,11 +30,11 @@ PropertyWidget::PropertyWidget(const QString &title, QWidget *parent , Qt::Windo connect( m_pVariantManager,SIGNAL(valueChanged(QtProperty *, const QVariant &)), this,SLOT(SlotPropertyChanged(QtProperty *, const QVariant &)) ); - QtColorSchemeComboBoxFactory * colorSchemeComboBoxFactory = new QtColorSchemeComboBoxFactory(); - m_pColorSchemeManager = new QtColorSchemeComboBoxPropertyManager(); - m_pPropertyBrowser->setFactoryForManager(m_pColorSchemeManager, colorSchemeComboBoxFactory); - connect(m_pColorSchemeManager, SIGNAL(valueChanged(QtProperty *, const int &, bool)), this, - SLOT(SlotPropertyChanged(QtProperty *, const int &, bool))); + QtColorSchemeComboBoxFactory * colorSchemeComboBoxFactory = new QtColorSchemeComboBoxFactory(); + m_pColorSchemeManager = new QtColorSchemeComboBoxPropertyManager(); + m_pPropertyBrowser->setFactoryForManager(m_pColorSchemeManager, colorSchemeComboBoxFactory); + connect(m_pColorSchemeManager, SIGNAL(valueChanged(QtProperty *, const int &, bool)), this, + SLOT(SlotPropertyChanged(QtProperty *, const int &, bool))); } PropertyWidget::~PropertyWidget() @@ -72,24 +72,24 @@ void PropertyWidget::InitCurrentViewInfo(bool bAll) m_propertyData.clear(); m_mapGroupItem.clear(); - if (bAll) - { - m_fromTop = NULL; - m_formInfo = NULL; - m_formHead = NULL; - m_tableWidget = NULL; - m_item = NULL; + if (bAll) + { + m_fromTop = NULL; + m_formInfo = NULL; + m_formHead = NULL; + m_tableWidget = NULL; + m_item = NULL; m_tdGujing = NULL; // - m_strUuid = ""; - m_strTrackUuid = ""; - m_strSlfName = ""; - m_strWellName = ""; - m_strTrackName = ""; - m_strLineName = ""; - // - m_strCurrentProperty = ""; - } + m_strUuid = ""; + m_strTrackUuid = ""; + m_strSlfName = ""; + m_strWellName = ""; + m_strTrackName = ""; + m_strLineName = ""; + // + m_strCurrentProperty = ""; + } } //处理通用属性 @@ -586,36 +586,36 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant } if (m_strCurrentProperty == Table_Property)//解释结论 - { - bool bDraw = false; - QStringList slist; - slist << "显示名称" << "垂向绘制" << "旋转角度(°)" << "字体" << "颜色" - << "结论占比%" << "显示位置(cm)" << "显示层号" << "层号字体" << "层号旋转"; - for (int i = 0; i < slist.length(); i++) - { - if (slist.at(i) == m_propertyData[pProperty]) - { - bDraw = m_formInfo->setInfoProperty(m_propertyData[pProperty], variant); - break; - } - } + { + bool bDraw = false; + QStringList slist; + slist << "显示名称" << "垂向绘制" << "旋转角度(°)" << "字体" << "颜色" + << "结论占比%" << "显示位置(cm)" << "显示层号" << "层号字体" << "层号旋转"; + for (int i = 0; i < slist.length(); i++) + { + if (slist.at(i) == m_propertyData[pProperty]) + { + bDraw = m_formInfo->setInfoProperty(m_propertyData[pProperty], variant); + break; + } + } - if (!slist.contains(m_propertyData[pProperty])) - bDraw = true; + if (!slist.contains(m_propertyData[pProperty])) + bDraw = true; - if (bDraw) - { - QVariantList listCond; - listCond << m_strUuid; - listCond << m_strSlfName; - listCond << m_strWellName; - listCond << m_strTrackName; - listCond << m_strLineName; - listCond << m_propertyData[pProperty]; - listCond << variant; - emit CallManage::getInstance()->sig_changeDrawProperty(listCond); - } - } + if (bDraw) + { + QVariantList listCond; + listCond << m_strUuid; + listCond << m_strSlfName; + listCond << m_strWellName; + listCond << m_strTrackName; + listCond << m_strLineName; + listCond << m_propertyData[pProperty]; + listCond << variant; + emit CallManage::getInstance()->sig_changeDrawProperty(listCond); + } + } else if(m_strCurrentProperty == Track_Property) { if(m_fromTop == NULL) @@ -651,46 +651,46 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant } return; } - else if (m_strCurrentProperty == Wave_Property) - { - bool bDraw = false; - QStringList slist; - slist << "显示名称" << "显示单位" << "曲线名称" << "曲线单位" << "曲线刻度" - << "类型" << "方式" << "左刻度" << "右刻度" << "幅度刻度" << "最大振幅" << "颜色" << "线宽" - << "绘制波深度" << "绘制波基线" << "奇偶配色" - << "波列基值" << "波形间隔" << "波形高度" << "显示刻度" << "色板" << "变密度颜色级数"; - for (int i = 0; i < slist.length(); i++) - { - if (slist.at(i) == m_propertyData[pProperty]) - { - bDraw = m_formInfo->setInfoProperty(m_propertyData[pProperty], variant); - break; - } - } + else if (m_strCurrentProperty == Wave_Property) + { + bool bDraw = false; + QStringList slist; + slist << "显示名称" << "显示单位" << "曲线名称" << "曲线单位" << "曲线刻度" + << "类型" << "方式" << "左刻度" << "右刻度" << "幅度刻度" << "最大振幅" << "颜色" << "线宽" + << "绘制波深度" << "绘制波基线" << "奇偶配色" + << "波列基值" << "波形间隔" << "波形高度" << "显示刻度" << "色板" << "变密度颜色级数"; + for (int i = 0; i < slist.length(); i++) + { + if (slist.at(i) == m_propertyData[pProperty]) + { + bDraw = m_formInfo->setInfoProperty(m_propertyData[pProperty], variant); + break; + } + } - if(!slist.contains(m_propertyData[pProperty])) - bDraw = true; + if(!slist.contains(m_propertyData[pProperty])) + bDraw = true; - if (bDraw) - { - QVariantList listCond; - listCond << m_strUuid; - listCond << m_strSlfName; - listCond << m_strWellName; - listCond << m_strTrackName; - listCond << m_strLineName; - listCond << m_propertyData[pProperty]; - listCond << variant; - emit CallManage::getInstance()->sig_changeDrawProperty(listCond); - } + if (bDraw) + { + QVariantList listCond; + listCond << m_strUuid; + listCond << m_strSlfName; + listCond << m_strWellName; + listCond << m_strTrackName; + listCond << m_strLineName; + listCond << m_propertyData[pProperty]; + listCond << variant; + emit CallManage::getInstance()->sig_changeDrawProperty(listCond); + } - if ("类型" == m_propertyData[pProperty]) - { - this->InitCurrentViewInfo(false); - initWaveProperty(m_formInfo, variant.toInt()); - } - return; - } + if ("类型" == m_propertyData[pProperty]) + { + this->InitCurrentViewInfo(false); + initWaveProperty(m_formInfo, variant.toInt()); + } + return; + } else if (m_strCurrentProperty == Gujing_Property)//固井结论道 { //先处理通用属性 @@ -873,7 +873,7 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant } } else if (m_strCurrentProperty == LayerItem_Property) - { + { //先处理通用属性 CommonPropertyChanged(pProperty, variant); @@ -941,54 +941,68 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant else if("岩性" == m_propertyData[pProperty]) { QString newResult = variant.value(); - m_tdLayer->setLith(newResult); - // - QCPRange currentRange = m_tdLayer->getRange(); - m_tdLayer->setRange(currentRange.lower, currentRange.upper); - } - } - else if (m_strCurrentProperty == JieshiItem_Property) - { - if (m_tdJieshi) - { - if ("顶深(m)" == m_propertyData[pProperty]) - { - double upper = variant.value(); - m_tdJieshi->setDragRect(2, -upper); - } - else if ("底深(m)" == m_propertyData[pProperty]) - { - double lower = variant.value(); - m_tdJieshi->setDragRect(1, -lower); - } - else - { - QString strProperty = m_propertyData[pProperty]; - if (strProperty == "油气结论") - { - m_tdJieshi->setDragResult(0, variant.toString()); - return; - } - int nidx = strProperty.indexOf("油气结论"); - if (nidx >= 0) - { - int nret = extractNumbers("油气结论(\\d+)", strProperty); - m_tdJieshi->setDragResult(nret, variant.toString()); - return; - } - nidx = strProperty.indexOf("分段点"); - if (nidx >= 0) - { - int nret = extractNumbers("分段点(\\d+)深度", strProperty); - m_tdJieshi->setDragDepth(nret, variant.toDouble()); - return; - } + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetLithSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + newResult.replace("\\","/"); + // + if(newResult.contains(strDefaultPath)) + { + m_tdLayer->setLith(newResult); + // + QCPRange currentRange = m_tdLayer->getRange(); + m_tdLayer->setRange(currentRange.lower, currentRange.upper); + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; } } } + else if (m_strCurrentProperty == JieshiItem_Property) + { + if (m_tdJieshi) + { + if ("顶深(m)" == m_propertyData[pProperty]) + { + double upper = variant.value(); + m_tdJieshi->setDragRect(2, -upper); + } + else if ("底深(m)" == m_propertyData[pProperty]) + { + double lower = variant.value(); + m_tdJieshi->setDragRect(1, -lower); + } + else + { + QString strProperty = m_propertyData[pProperty]; + if (strProperty == "油气结论") + { + m_tdJieshi->setDragResult(0, variant.toString()); + return; + } + int nidx = strProperty.indexOf("油气结论"); + if (nidx >= 0) + { + int nret = extractNumbers("油气结论(\\d+)", strProperty); + m_tdJieshi->setDragResult(nret, variant.toString()); + return; + } + nidx = strProperty.indexOf("分段点"); + if (nidx >= 0) + { + int nret = extractNumbers("分段点(\\d+)深度", strProperty); + m_tdJieshi->setDragDepth(nret, variant.toDouble()); + + return; + } + } + } + } else if (m_strCurrentProperty == GujingItem_Property) - { + { //先处理通用属性 CommonPropertyChanged(pProperty, variant); @@ -1021,12 +1035,26 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant if(m_tdGujing) { QString newResult = variant.value(); - m_tdGujing->setResult(newResult); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetGujingSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + newResult.replace("\\","/"); // - QCPRange currentRange = m_tdGujing->getRange(); - m_tdGujing->setRange(currentRange.lower, currentRange.upper); - //保存 - m_tdGujing->mPlot->SaveToSLF_Gujing(); + if(newResult.contains(strDefaultPath)) + { + m_tdGujing->setResult(newResult); + // + QCPRange currentRange = m_tdGujing->getRange(); + m_tdGujing->setRange(currentRange.lower, currentRange.upper); + //保存 + m_tdGujing->mPlot->SaveToSLF_Gujing(); + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; + } } } } @@ -1076,12 +1104,26 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant if(m_tdSwallCore) { QString newResult = variant.value(); - m_tdSwallCore->setLith(newResult); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetSymbolDir()+"取心岩性符号"; + //符号统一 + strDefaultPath.replace("\\","/"); + newResult.replace("\\","/"); // - QCPRange currentRange = m_tdSwallCore->getRange(); - m_tdSwallCore->setRange(currentRange.lower, currentRange.upper); - //保存 - m_tdSwallCore->mPlot->SaveToSLF_SwallCore(); + if(newResult.contains(strDefaultPath)) + { + m_tdSwallCore->setLith(newResult); + // + QCPRange currentRange = m_tdSwallCore->getRange(); + m_tdSwallCore->setRange(currentRange.lower, currentRange.upper); + //保存 + m_tdSwallCore->mPlot->SaveToSLF_SwallCore(); + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; + } } } else if("油气" == m_propertyData[pProperty]) @@ -1090,12 +1132,26 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant if(m_tdSwallCore) { QString newResult = variant.value(); - m_tdSwallCore->setOil(newResult); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetGasSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + newResult.replace("\\","/"); // - QCPRange currentRange = m_tdSwallCore->getRange(); - m_tdSwallCore->setRange(currentRange.lower, currentRange.upper); - //保存 - m_tdSwallCore->mPlot->SaveToSLF_SwallCore(); + if(newResult.contains(strDefaultPath)) + { + m_tdSwallCore->setOil(newResult); + // + QCPRange currentRange = m_tdSwallCore->getRange(); + m_tdSwallCore->setRange(currentRange.lower, currentRange.upper); + //保存 + m_tdSwallCore->mPlot->SaveToSLF_SwallCore(); + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; + } } } else if("颜色" == m_propertyData[pProperty]) @@ -1105,24 +1161,37 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant { QString ColorImage = variant.value(); - QString name = ""; - int CoreColor = 0; + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetColorSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); ColorImage.replace("\\","/"); - int l=ColorImage.lastIndexOf("/"); - if(l>-1) name=ColorImage.mid(l+1); - - l=name.indexOf("."); - if(l>-1)name=name.left(l); - int ind=m_tdSwallCore->mPlot->colors_SWallCore.indexOf(name); - if(ind<0||ind>=m_tdSwallCore->mPlot->colorinds_SWallCore.size()) CoreColor=0; - else CoreColor=m_tdSwallCore->mPlot->colorinds_SWallCore[ind].toInt(); - - m_tdSwallCore->setTitle(QString::number(CoreColor)); // - QCPRange currentRange = m_tdSwallCore->getRange(); - m_tdSwallCore->setRange(currentRange.lower, currentRange.upper); - //保存 - m_tdSwallCore->mPlot->SaveToSLF_SwallCore(); + if(ColorImage.contains(strDefaultPath)) + { + QString name = ""; + int CoreColor = 0; + ColorImage.replace("\\","/"); + int l=ColorImage.lastIndexOf("/"); + if(l>-1) name=ColorImage.mid(l+1); + + l=name.indexOf("."); + if(l>-1)name=name.left(l); + int ind=m_tdSwallCore->mPlot->colors_SWallCore.indexOf(name); + if(ind<0||ind>=m_tdSwallCore->mPlot->colorinds_SWallCore.size()) CoreColor=0; + else CoreColor=m_tdSwallCore->mPlot->colorinds_SWallCore[ind].toInt(); + + m_tdSwallCore->setTitle(QString::number(CoreColor)); + // + QCPRange currentRange = m_tdSwallCore->getRange(); + m_tdSwallCore->setRange(currentRange.lower, currentRange.upper); + //保存 + m_tdSwallCore->mPlot->SaveToSLF_SwallCore(); + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; + } } } else if("起始位置" == m_propertyData[pProperty]) @@ -1174,12 +1243,26 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant if(m_tdGeoLith) { QString newResult = variant.value(); - m_tdGeoLith->setLith(newResult, m_tdGeoLith->m_Color); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetMudSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + newResult.replace("\\","/"); // - QCPRange currentRange = m_tdGeoLith->getRange(); - m_tdGeoLith->setRange(currentRange.lower, currentRange.upper); - //保存 - m_tdGeoLith->mPlot->SaveToSLF_GeoLith(); + if(newResult.contains(strDefaultPath)) + { + m_tdGeoLith->setLith(newResult, m_tdGeoLith->m_Color); + // + QCPRange currentRange = m_tdGeoLith->getRange(); + m_tdGeoLith->setRange(currentRange.lower, currentRange.upper); + //保存 + m_tdGeoLith->mPlot->SaveToSLF_GeoLith(); + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; + } } } else if("油气" == m_propertyData[pProperty]) @@ -1188,12 +1271,26 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant if(m_tdGeoLith) { QString newResult = variant.value(); - m_tdGeoLith->setOil(newResult); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetGasSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + newResult.replace("\\","/"); // - QCPRange currentRange = m_tdGeoLith->getRange(); - m_tdGeoLith->setRange(currentRange.lower, currentRange.upper); - //保存 - m_tdGeoLith->mPlot->SaveToSLF_GeoLith(); + if(newResult.contains(strDefaultPath)) + { + m_tdGeoLith->setOil(newResult); + // + QCPRange currentRange = m_tdGeoLith->getRange(); + m_tdGeoLith->setRange(currentRange.lower, currentRange.upper); + //保存 + m_tdGeoLith->mPlot->SaveToSLF_GeoLith(); + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; + } } } else if("颜色" == m_propertyData[pProperty]) @@ -1202,12 +1299,26 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant if(m_tdGeoLith) { QString newResult = variant.value(); - m_tdGeoLith->setLith(m_tdGeoLith->m_Lith, newResult); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetColorSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + newResult.replace("\\","/"); // - QCPRange currentRange = m_tdGeoLith->getRange(); - m_tdGeoLith->setRange(currentRange.lower, currentRange.upper); - //保存 - m_tdGeoLith->mPlot->SaveToSLF_GeoLith(); + if(newResult.contains(strDefaultPath)) + { + m_tdGeoLith->setLith(m_tdGeoLith->m_Lith, newResult); + // + QCPRange currentRange = m_tdGeoLith->getRange(); + m_tdGeoLith->setRange(currentRange.lower, currentRange.upper); + //保存 + m_tdGeoLith->mPlot->SaveToSLF_GeoLith(); + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; + } } } else if("含油占比(1~8)" == m_propertyData[pProperty]) @@ -1675,24 +1786,38 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant //-------------------------- QString newResult = variant.value(); - m_tdGuan->setResult(newResult); - // - QCPRange currentRange = m_tdGuan->getRange(); - m_tdGuan->setRange(currentRange.lower, currentRange.upper); - //保存 - m_tdGuan->mPlot->SaveToSLF_Tubing(); - //--------- - bool bReDrawNew = m_tdGuan->mPlot->checkTubingName(m_tdGuan->m_Result); - if(bReDrawOld || bReDrawNew) + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = GetSymbolDir()+"管柱组件"; + //符号统一 + strDefaultPath.replace("\\","/"); + newResult.replace("\\","/"); + // + if(newResult.contains(strDefaultPath)) { - //组件改变后，重绘管柱 - m_tdGuan->mPlot->LoadFromSLF_ReDrawTubing(m_tdGuan->mPlot->m_strSlfName, m_tdGuan->mPlot->m_strLineName); + m_tdGuan->setResult(newResult); + // + QCPRange currentRange = m_tdGuan->getRange(); + m_tdGuan->setRange(currentRange.lower, currentRange.upper); + //保存 + m_tdGuan->mPlot->SaveToSLF_Tubing(); + + //--------- + bool bReDrawNew = m_tdGuan->mPlot->checkTubingName(m_tdGuan->m_Result); + if(bReDrawOld || bReDrawNew) + { + //组件改变后，重绘管柱 + m_tdGuan->mPlot->LoadFromSLF_ReDrawTubing(m_tdGuan->mPlot->m_strSlfName, m_tdGuan->mPlot->m_strLineName); + } + } + else { + QMessageBox::information(nullptr,"提示","所选目录不支持"); + return; } } } } - else if (m_strCurrentProperty == Depth_Property) // 深度 + else if (m_strCurrentProperty == Depth_Property) // 深度 { //先处理通用属性 CommonPropertyChanged(pProperty, variant); @@ -2169,7 +2294,7 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant m_item->setFont(newFont); } } - + @@ -2178,22 +2303,22 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant void PropertyWidget::SlotPropertyChanged(QtProperty *property, const int &val, bool islinestyle) { - QString str = m_propertyData[property]; - if (m_strCurrentProperty == Wave_Property) - { - m_formInfo->setInfoProperty(str, val); + QString str = m_propertyData[property]; + if (m_strCurrentProperty == Wave_Property) + { + m_formInfo->setInfoProperty(str, val); - QVariantList listCond; - listCond << m_strUuid; - listCond << m_strSlfName; - listCond << m_strWellName; - listCond << m_strTrackName; - listCond << m_strLineName; - listCond << str; - listCond << val; - emit CallManage::getInstance()->sig_changeDrawProperty(listCond); - } - return; + QVariantList listCond; + listCond << m_strUuid; + listCond << m_strSlfName; + listCond << m_strWellName; + listCond << m_strTrackName; + listCond << m_strLineName; + listCond << str; + listCond << val; + emit CallManage::getInstance()->sig_changeDrawProperty(listCond); + } + return; } void PropertyWidget::ChangHeadItemProperty() @@ -2421,14 +2546,14 @@ QtVariantProperty* PropertyWidget::_CreateVariantPropertyItem(QString strGroup, m_propertyData[item] = strPropertyCaption; pGroupItem->addSubProperty(item); - // 字体不展开 - if (QVariant::Font == propertyType || QVariant::Color == propertyType) - { - QList list = m_pPropertyBrowser->items(item); - if (list.size() > 0) - m_pPropertyBrowser->setExpanded(list.at(0), false); - } - return item; + // 字体不展开 + if (QVariant::Font == propertyType || QVariant::Color == propertyType) + { + QList list = m_pPropertyBrowser->items(item); + if (list.size() > 0) + m_pPropertyBrowser->setExpanded(list.at(0), false); + } + return item; } void PropertyWidget::_CreateVariantPropertyItem(QString strGroup, QString strPropertyCaption, QVariant vtPropertyValue, int propertyType, double dMin, double dMax) @@ -2481,33 +2606,33 @@ void PropertyWidget::_CreateEnumPropertyItem(QString strGroup, QString strProper void PropertyWidget::_CreateColorSchemePropertyItem(QString strGroup, QString strPropertyCaption, QVariant vtPropertyValue) { - QtProperty *pGroupItem = NULL; - { - QMap::Iterator it = m_mapGroupItem.find(strGroup); - if (it != m_mapGroupItem.end()) - { - pGroupItem = it.value(); - } - else - { - pGroupItem = m_pVariantManager->addProperty(QtVariantPropertyManager::groupTypeId(), strGroup); - m_mapGroupItem[strGroup] = pGroupItem; - m_pPropertyBrowser->addProperty(pGroupItem); - } - } + QtProperty *pGroupItem = NULL; + { + QMap::Iterator it = m_mapGroupItem.find(strGroup); + if (it != m_mapGroupItem.end()) + { + pGroupItem = it.value(); + } + else + { + pGroupItem = m_pVariantManager->addProperty(QtVariantPropertyManager::groupTypeId(), strGroup); + m_mapGroupItem[strGroup] = pGroupItem; + m_pPropertyBrowser->addProperty(pGroupItem); + } + } - QtProperty *colorSchemeProperty = m_pColorSchemeManager->addProperty(strPropertyCaption); - m_pColorSchemeManager->setLinear(colorSchemeProperty); - if (colorSchemeProperty) - { - m_propertyData[colorSchemeProperty] = strPropertyCaption; - pGroupItem->addSubProperty(colorSchemeProperty); - m_pColorSchemeManager->setValue(colorSchemeProperty, vtPropertyValue.toInt(), false); - //if (pMetaProperty) - //{ - // m_mapProperty[colorSchemeProperty] = pMetaProperty; - //} - } + QtProperty *colorSchemeProperty = m_pColorSchemeManager->addProperty(strPropertyCaption); + m_pColorSchemeManager->setLinear(colorSchemeProperty); + if (colorSchemeProperty) + { + m_propertyData[colorSchemeProperty] = strPropertyCaption; + pGroupItem->addSubProperty(colorSchemeProperty); + m_pColorSchemeManager->setValue(colorSchemeProperty, vtPropertyValue.toInt(), false); + //if (pMetaProperty) + //{ + // m_mapProperty[colorSchemeProperty] = pMetaProperty; + //} + } } void PropertyWidget::initWidgetProperty(QString strUuid, int iScale) @@ -2605,7 +2730,7 @@ void PropertyWidget::initCurveProperty(FormInfo *formInfo, QStringList strListOt //初始化，清空 InitCurrentViewInfo(); m_strUuid = formInfo->m_strUuid; - m_strTrackUuid = formInfo->m_strTrackUuid; + m_strTrackUuid = formInfo->m_strTrackUuid; m_formInfo = formInfo; // @@ -2684,8 +2809,8 @@ void PropertyWidget::initCurveProperty(FormInfo *formInfo, QStringList strListOt _CreateVariantPropertyItem("刻度设置", "左刻度", formInfo->m_vmin, QVariant::Double); _CreateVariantPropertyItem("刻度设置", "右刻度", formInfo->m_vmax, QVariant::Double); _CreateEnumPropertyItem("刻度设置", "刻度类型", listScaleType.indexOf(formInfo->m_strScaleType), listScaleType); - _CreateVariantPropertyItem("刻度设置", "左跨道个数", formInfo->m_nLeftCross, QVariant::Int); - _CreateVariantPropertyItem("刻度设置", "右跨道个数", formInfo->m_nRightCross, QVariant::Int); + _CreateVariantPropertyItem("刻度设置", "左跨道个数", formInfo->m_nLeftCross, QVariant::Int); + _CreateVariantPropertyItem("刻度设置", "右跨道个数", formInfo->m_nRightCross, QVariant::Int); // _CreateVariantPropertyItem("曲线线型", "线宽", formInfo->m_dWidth, QVariant::Double, 1, 20); _CreateVariantPropertyItem("曲线线型", "颜色", formInfo->m_lineColor, QVariant::Color); @@ -2714,8 +2839,8 @@ void PropertyWidget::initCurveProperty(FormInfo *formInfo, QStringList strListOt _CreateVariantPropertyItem("岩性填充", "岩性前景色", formInfo->m_frontColor, QVariant::Color); _CreateVariantPropertyItem("岩性填充", "岩性背景色", formInfo->m_backColor, QVariant::Color); - //当前属性类型 - m_strCurrentProperty = Curve_Property; + //当前属性类型 + m_strCurrentProperty = Curve_Property; } @@ -2781,21 +2906,21 @@ void PropertyWidget::initHeadProperty(FormHead *formHead, QTableWidget *tableWid void PropertyWidget::initTableProperty(FormInfo *formInfo) { - _CreateVariantPropertyItem("通常", "选择井曲线", m_strLineName + "@" + m_strSlfName, QVariant::String); + _CreateVariantPropertyItem("通常", "选择井曲线", m_strLineName + "@" + m_strSlfName, QVariant::String); - _CreateVariantPropertyItem("名称", "显示名称", formInfo->m_strLineName, QVariant::String); - _CreateVariantPropertyItem("名称", "垂向绘制", formInfo->m_bVerticaDrawing, QVariant::Bool); - _CreateVariantPropertyItem("名称", "旋转角度(°)", formInfo->m_nRotationAngle, QVariant::Int); - _CreateVariantPropertyItem("名称", "字体", formInfo->m_curveNameFont, QVariant::Font); - _CreateVariantPropertyItem("名称", "颜色", formInfo->m_lineColor, QVariant::Color); + _CreateVariantPropertyItem("名称", "显示名称", formInfo->m_strLineName, QVariant::String); + _CreateVariantPropertyItem("名称", "垂向绘制", formInfo->m_bVerticaDrawing, QVariant::Bool); + _CreateVariantPropertyItem("名称", "旋转角度(°)", formInfo->m_nRotationAngle, QVariant::Int); + _CreateVariantPropertyItem("名称", "字体", formInfo->m_curveNameFont, QVariant::Font); + _CreateVariantPropertyItem("名称", "颜色", formInfo->m_lineColor, QVariant::Color); - _CreateVariantPropertyItem("显示", "结论占比%", formInfo->m_nConclusionProportion, QVariant::Int); - _CreateVariantPropertyItem("显示", "显示位置(cm)", formInfo->m_nShowPos, QVariant::Int); - _CreateVariantPropertyItem("显示", "显示层号", formInfo->m_bShowLayerNo, QVariant::Bool); - _CreateVariantPropertyItem("显示", "层号字体", formInfo->m_layerFont, QVariant::Font); - _CreateVariantPropertyItem("显示", "层号旋转", formInfo->m_fLayerRotate, QVariant::Double); + _CreateVariantPropertyItem("显示", "结论占比%", formInfo->m_nConclusionProportion, QVariant::Int); + _CreateVariantPropertyItem("显示", "显示位置(cm)", formInfo->m_nShowPos, QVariant::Int); + _CreateVariantPropertyItem("显示", "显示层号", formInfo->m_bShowLayerNo, QVariant::Bool); + _CreateVariantPropertyItem("显示", "层号字体", formInfo->m_layerFont, QVariant::Font); + _CreateVariantPropertyItem("显示", "层号旋转", formInfo->m_fLayerRotate, QVariant::Double); - m_strCurrentProperty = Table_Property; + m_strCurrentProperty = Table_Property; } void PropertyWidget::initDepthProperty(FormInfo *formInfo) @@ -2839,24 +2964,24 @@ void PropertyWidget::initDepthProperty(FormInfo *formInfo) void PropertyWidget::initProperty(FormInfo *formInfo) { - if (formInfo == NULL) - return; + if (formInfo == NULL) + return; - //初始化，清空 - InitCurrentViewInfo(); + //初始化，清空 + InitCurrentViewInfo(); - m_formInfo = formInfo; + m_formInfo = formInfo; - m_strUuid = formInfo->m_strUuid; - m_strTrackUuid = formInfo->m_strTrackUuid; - // - m_strSlfName = formInfo->m_strSlfName; - m_strWellName = formInfo->m_strWellName; - m_strTrackName = formInfo->m_strTrackName; - m_strLineName = formInfo->m_strLineName; + m_strUuid = formInfo->m_strUuid; + m_strTrackUuid = formInfo->m_strTrackUuid; + // + m_strSlfName = formInfo->m_strSlfName; + m_strWellName = formInfo->m_strWellName; + m_strTrackName = formInfo->m_strTrackName; + m_strLineName = formInfo->m_strLineName; - if (formInfo->m_strType == "tableObject") - { + if (formInfo->m_strType == "tableObject") + { if (m_strLineName == "GUJING1_RESULT" || m_strLineName == "GUJING2_RESULT" || m_strLineName == "GUJING3_RESULT") { //固井结论 @@ -2896,18 +3021,18 @@ void PropertyWidget::initProperty(FormInfo *formInfo) { this->initTableProperty(formInfo); } - } - else if (formInfo->m_strType == "depthObject") - { - this->initDepthProperty(formInfo); - } - else if (formInfo->m_strType == "roseObject") - { - this->initRoseProperty(formInfo); - } - else if (formInfo->m_strType == "waveObject") - { - this->initWaveProperty(formInfo, formInfo->m_nDrawType); + } + else if (formInfo->m_strType == "depthObject") + { + this->initDepthProperty(formInfo); + } + else if (formInfo->m_strType == "roseObject") + { + this->initRoseProperty(formInfo); + } + else if (formInfo->m_strType == "waveObject") + { + this->initWaveProperty(formInfo, formInfo->m_nDrawType); } else if (formInfo->m_strType == "JiegutextObject") { @@ -2919,7 +3044,7 @@ void PropertyWidget::initProperty(FormInfo *formInfo) //沉积相 this->initFacProperty(formInfo); } - else if(formInfo->m_strType=="SantuyibiaoObject") + else if(formInfo->m_strType=="SantuyibiaoObject") { this->initTvdProperty(formInfo); } @@ -2932,152 +3057,152 @@ void PropertyWidget::initProperty(FormInfo *formInfo) void PropertyWidget::initRoseProperty(FormInfo *formInfo) { - // - _CreateVariantPropertyItem("数据", "名称", formInfo->m_strAliasName, QVariant::String); + // + _CreateVariantPropertyItem("数据", "名称", formInfo->m_strAliasName, QVariant::String); - QStringList listType; - listType.append("曲线型数据"); - listType.append("表格型数据"); - _CreateEnumPropertyItem("数据", "数据类型", listType.indexOf("曲线型数据"), listType); - _CreateVariantPropertyItem("数据", "显示单位", "°", QVariant::String); - _CreateVariantPropertyItem("数据", "井文件名称", m_strSlfName, QVariant::String); - _CreateVariantPropertyItem("数据", "方位曲线", "STRDIR", QVariant::String); - _CreateVariantPropertyItem("数据", "倾角曲线", "CALM", QVariant::String); - // - _CreateVariantPropertyItem("玫瑰图", "扇形", 36, QVariant::Int); - _CreateVariantPropertyItem("玫瑰图", "圆半径(cm)", 1, QVariant::Int); - _CreateVariantPropertyItem("玫瑰图", "辐射圈", 9, QVariant::Int); - _CreateVariantPropertyItem("玫瑰图", "方位打印间隔", 3, QVariant::Int); - _CreateVariantPropertyItem("玫瑰图", "圆线颜色", QColor(0,0,0), QVariant::Color); - _CreateVariantPropertyItem("玫瑰图", "圆线宽度", 2, QVariant::Int); - _CreateVariantPropertyItem("玫瑰图", "应力线颜色", QColor(255, 170, 0), QVariant::Color); - _CreateVariantPropertyItem("玫瑰图", "垮塌线颜色", QColor(0, 0, 255), QVariant::Color); - _CreateVariantPropertyItem("玫瑰图", "绘制辐射线？", true, QVariant::Bool); - _CreateVariantPropertyItem("玫瑰图", "绘制井眼垮塌", true, QVariant::Bool); - _CreateVariantPropertyItem("玫瑰图", "是否填充", true, QVariant::Bool); - _CreateVariantPropertyItem("玫瑰图", "是否绘制标注？", true, QVariant::Bool); + QStringList listType; + listType.append("曲线型数据"); + listType.append("表格型数据"); + _CreateEnumPropertyItem("数据", "数据类型", listType.indexOf("曲线型数据"), listType); + _CreateVariantPropertyItem("数据", "显示单位", "°", QVariant::String); + _CreateVariantPropertyItem("数据", "井文件名称", m_strSlfName, QVariant::String); + _CreateVariantPropertyItem("数据", "方位曲线", "STRDIR", QVariant::String); + _CreateVariantPropertyItem("数据", "倾角曲线", "CALM", QVariant::String); + // + _CreateVariantPropertyItem("玫瑰图", "扇形", 36, QVariant::Int); + _CreateVariantPropertyItem("玫瑰图", "圆半径(cm)", 1, QVariant::Int); + _CreateVariantPropertyItem("玫瑰图", "辐射圈", 9, QVariant::Int); + _CreateVariantPropertyItem("玫瑰图", "方位打印间隔", 3, QVariant::Int); + _CreateVariantPropertyItem("玫瑰图", "圆线颜色", QColor(0,0,0), QVariant::Color); + _CreateVariantPropertyItem("玫瑰图", "圆线宽度", 2, QVariant::Int); + _CreateVariantPropertyItem("玫瑰图", "应力线颜色", QColor(255, 170, 0), QVariant::Color); + _CreateVariantPropertyItem("玫瑰图", "垮塌线颜色", QColor(0, 0, 255), QVariant::Color); + _CreateVariantPropertyItem("玫瑰图", "绘制辐射线？", true, QVariant::Bool); + _CreateVariantPropertyItem("玫瑰图", "绘制井眼垮塌", true, QVariant::Bool); + _CreateVariantPropertyItem("玫瑰图", "是否填充", true, QVariant::Bool); + _CreateVariantPropertyItem("玫瑰图", "是否绘制标注？", true, QVariant::Bool); // _CreateVariantPropertyItem("玫瑰图", "道头字体", fromTop->m_font, QVariant::Font); // _CreateVariantPropertyItem("玫瑰图", "道头字颜色", fromTop->m_fontColor, QVariant::Color); } void PropertyWidget::initWaveProperty(FormInfo *formInfo, int nType) { - if (formInfo == NULL) - return; + if (formInfo == NULL) + return; - _CreateVariantPropertyItem("通常", "选择井曲线", m_strLineName + "@" + m_strSlfName, QVariant::String); - _CreateVariantPropertyItem("通常", "显示名称", formInfo->m_strLineName, QVariant::String); - //_CreateVariantPropertyItem("通常", "例区高度(cm)", formInfo->m_strUnit, QVariant::Double); - QStringList lineType; - lineType.append("线性"); - lineType.append("对数"); - lineType.append("核磁对数"); - lineType.append("二维核磁"); - lineType.append("色级图"); - lineType.append("时间对数"); - lineType.append("时间指数"); - _CreateEnumPropertyItem("通常", "曲线类型", lineType.indexOf("线性"), lineType); + _CreateVariantPropertyItem("通常", "选择井曲线", m_strLineName + "@" + m_strSlfName, QVariant::String); + _CreateVariantPropertyItem("通常", "显示名称", formInfo->m_strLineName, QVariant::String); + //_CreateVariantPropertyItem("通常", "例区高度(cm)", formInfo->m_strUnit, QVariant::Double); + QStringList lineType; + lineType.append("线性"); + lineType.append("对数"); + lineType.append("核磁对数"); + lineType.append("二维核磁"); + lineType.append("色级图"); + lineType.append("时间对数"); + lineType.append("时间指数"); + _CreateEnumPropertyItem("通常", "曲线类型", lineType.indexOf("线性"), lineType); - _CreateVariantPropertyItem("曲线单位", "显示单位", formInfo->m_strUnit, QVariant::String); + _CreateVariantPropertyItem("曲线单位", "显示单位", formInfo->m_strUnit, QVariant::String); - _CreateVariantPropertyItem("字体", "曲线名称", formInfo->m_curveNameFont, QVariant::Font); - _CreateVariantPropertyItem("字体", "曲线单位", formInfo->m_curveUnitFont, QVariant::Font); - _CreateVariantPropertyItem("字体", "曲线刻度", formInfo->m_curveScaleFont, QVariant::Font); + _CreateVariantPropertyItem("字体", "曲线名称", formInfo->m_curveNameFont, QVariant::Font); + _CreateVariantPropertyItem("字体", "曲线单位", formInfo->m_curveUnitFont, QVariant::Font); + _CreateVariantPropertyItem("字体", "曲线刻度", formInfo->m_curveScaleFont, QVariant::Font); - QStringList drawType; - drawType.append("波形"); - drawType.append("填充"); - drawType.append("变密度（成像）"); - drawType.append("全阵列"); - drawType.append("奇数阵列"); - drawType.append("偶数阵列"); - drawType.append("变密度（镜像）"); - drawType.append("自选阵列"); - drawType.append("三维图像"); - drawType.append("多臂井径"); - _CreateEnumPropertyItem("绘图类型", "类型", formInfo->m_nDrawType, drawType); + QStringList drawType; + drawType.append("波形"); + drawType.append("填充"); + drawType.append("变密度（成像）"); + drawType.append("全阵列"); + drawType.append("奇数阵列"); + drawType.append("偶数阵列"); + drawType.append("变密度（镜像）"); + drawType.append("自选阵列"); + drawType.append("三维图像"); + drawType.append("多臂井径"); + _CreateEnumPropertyItem("绘图类型", "类型", formInfo->m_nDrawType, drawType); - if (nType == 2) - { - QStringList fillType; - fillType.append("全周"); - fillType.append("正半周"); - fillType.append("负半周"); - _CreateEnumPropertyItem("填充方式", "方式", formInfo->m_nFillType, fillType); - } + if (nType == 2) + { + QStringList fillType; + fillType.append("全周"); + fillType.append("正半周"); + fillType.append("负半周"); + _CreateEnumPropertyItem("填充方式", "方式", formInfo->m_nFillType, fillType); + } - if (nType == 0 || nType == 1) - { - _CreateVariantPropertyItem("波形绘制参数", "绘制波深度", formInfo->m_bDrawDepth, QVariant::Bool); - _CreateVariantPropertyItem("波形绘制参数", "绘制波基线", formInfo->m_bDrawBase, QVariant::Bool); - _CreateVariantPropertyItem("波形绘制参数", "奇偶配色", formInfo->m_bOddEven, QVariant::Bool); - } - //_CreateVariantPropertyItem("波形绘制参数", "自动平滑", true, QVariant::Bool); - _CreateVariantPropertyItem("波形绘制参数", "左刻度", formInfo->m_vmin, QVariant::Double); - _CreateVariantPropertyItem("波形绘制参数", "右刻度", formInfo->m_vmax, QVariant::Double); - _CreateVariantPropertyItem("波形绘制参数", "幅度刻度", formInfo->m_strAmp, QVariant::String); - _CreateVariantPropertyItem("波形绘制参数", "最大振幅", formInfo->m_fMaxAmp, QVariant::Double); - _CreateVariantPropertyItem("波形绘制参数", "显示刻度", formInfo->m_bShowScale, QVariant::Bool); - _CreateVariantPropertyItem("波形绘制参数", "波列基值", formInfo->m_fWaveBase, QVariant::Double); - _CreateVariantPropertyItem("波形绘制参数", "波形间隔", formInfo->m_nWaveJg, QVariant::Int); - _CreateVariantPropertyItem("波形绘制参数", "波形高度", formInfo->m_fWaveHei, QVariant::Double); - if (nType == 0 || nType == 1) - { - _CreateVariantPropertyItem("波形绘制参数", "线宽", formInfo->m_dWidth, QVariant::Int); - _CreateVariantPropertyItem("波形绘制参数", "颜色", formInfo->m_lineColor, QVariant::Color); - } - //_CreateVariantPropertyItem("成像显示", "RGBA数据", false, QVariant::Bool); - //_CreateVariantPropertyItem("成像显示", "绘制阵列数", 1, QVariant::Int); - //_CreateVariantPropertyItem("成像显示", "是否顶底倒置", false, QVariant::Bool); - //_CreateVariantPropertyItem("成像显示", "是否行列互换", false, QVariant::Bool); - //_CreateVariantPropertyItem("成像显示", "无效值跳过", false, QVariant::Bool); - //_CreateVariantPropertyItem("成像显示", "是否方位校正", false, QVariant::Bool); - //_CreateVariantPropertyItem("成像显示", "是否深度校正", false, QVariant::Bool); - //_CreateVariantPropertyItem("成像显示", "是否自动计算波参数", "", QVariant::String); + if (nType == 0 || nType == 1) + { + _CreateVariantPropertyItem("波形绘制参数", "绘制波深度", formInfo->m_bDrawDepth, QVariant::Bool); + _CreateVariantPropertyItem("波形绘制参数", "绘制波基线", formInfo->m_bDrawBase, QVariant::Bool); + _CreateVariantPropertyItem("波形绘制参数", "奇偶配色", formInfo->m_bOddEven, QVariant::Bool); + } + //_CreateVariantPropertyItem("波形绘制参数", "自动平滑", true, QVariant::Bool); + _CreateVariantPropertyItem("波形绘制参数", "左刻度", formInfo->m_vmin, QVariant::Double); + _CreateVariantPropertyItem("波形绘制参数", "右刻度", formInfo->m_vmax, QVariant::Double); + _CreateVariantPropertyItem("波形绘制参数", "幅度刻度", formInfo->m_strAmp, QVariant::String); + _CreateVariantPropertyItem("波形绘制参数", "最大振幅", formInfo->m_fMaxAmp, QVariant::Double); + _CreateVariantPropertyItem("波形绘制参数", "显示刻度", formInfo->m_bShowScale, QVariant::Bool); + _CreateVariantPropertyItem("波形绘制参数", "波列基值", formInfo->m_fWaveBase, QVariant::Double); + _CreateVariantPropertyItem("波形绘制参数", "波形间隔", formInfo->m_nWaveJg, QVariant::Int); + _CreateVariantPropertyItem("波形绘制参数", "波形高度", formInfo->m_fWaveHei, QVariant::Double); + if (nType == 0 || nType == 1) + { + _CreateVariantPropertyItem("波形绘制参数", "线宽", formInfo->m_dWidth, QVariant::Int); + _CreateVariantPropertyItem("波形绘制参数", "颜色", formInfo->m_lineColor, QVariant::Color); + } + //_CreateVariantPropertyItem("成像显示", "RGBA数据", false, QVariant::Bool); + //_CreateVariantPropertyItem("成像显示", "绘制阵列数", 1, QVariant::Int); + //_CreateVariantPropertyItem("成像显示", "是否顶底倒置", false, QVariant::Bool); + //_CreateVariantPropertyItem("成像显示", "是否行列互换", false, QVariant::Bool); + //_CreateVariantPropertyItem("成像显示", "无效值跳过", false, QVariant::Bool); + //_CreateVariantPropertyItem("成像显示", "是否方位校正", false, QVariant::Bool); + //_CreateVariantPropertyItem("成像显示", "是否深度校正", false, QVariant::Bool); + //_CreateVariantPropertyItem("成像显示", "是否自动计算波参数", "", QVariant::String); - if (nType == 2) - { - _CreateColorSchemePropertyItem("调色板参数设置", "色板", formInfo->m_nSchemeIndex); - _CreateVariantPropertyItem("调色板参数设置", "变密度颜色级数", formInfo->m_nColorNum, QVariant::Int); - } + if (nType == 2) + { + _CreateColorSchemePropertyItem("调色板参数设置", "色板", formInfo->m_nSchemeIndex); + _CreateVariantPropertyItem("调色板参数设置", "变密度颜色级数", formInfo->m_nColorNum, QVariant::Int); + } // _CreateVariantPropertyItem("调色板参数设置", "图例置顶", false, QVariant::Bool); // _CreateVariantPropertyItem("调色板参数设置", "反转显示", false, QVariant::Bool); - - m_strCurrentProperty = Wave_Property; + + m_strCurrentProperty = Wave_Property; } void PropertyWidget::initJieshiItemProperty(TransparentGroupResult* tdJieshi, double lower, double upper, QString strResult) { - //初始化，清空 - InitCurrentViewInfo(); + //初始化，清空 + InitCurrentViewInfo(); - m_tdJieshi = tdJieshi; + m_tdJieshi = tdJieshi; - // - _CreateVariantPropertyItem("当前项", "顶深(m)", -upper, QVariant::Double); - _CreateVariantPropertyItem("当前项", "底深(m)", -lower, QVariant::Double); - _CreateVariantPropertyItem("当前项", "解释层号", tdJieshi->getTitle(), QVariant::String); - QtVariantProperty* pItem = _CreateVariantPropertyItem("当前项", "油气结论", tdJieshi->getOilGasConclusion(0), VariantManager::filePathTypeId()); - m_pVariantManager->setAttribute(pItem, "filepath", GetOilSymbolDir()); - m_pVariantManager->setAttribute(pItem, "filter", "图片(*.png *.svg)"); + // + _CreateVariantPropertyItem("当前项", "顶深(m)", -upper, QVariant::Double); + _CreateVariantPropertyItem("当前项", "底深(m)", -lower, QVariant::Double); + _CreateVariantPropertyItem("当前项", "解释层号", tdJieshi->getTitle(), QVariant::String); + QtVariantProperty* pItem = _CreateVariantPropertyItem("当前项", "油气结论", tdJieshi->getOilGasConclusion(0), VariantManager::filePathTypeId()); + m_pVariantManager->setAttribute(pItem, "filepath", GetOilSymbolDir()); + m_pVariantManager->setAttribute(pItem, "filter", "图片(*.png *.svg)"); - _CreateVariantPropertyItem("当前项", "备注", tdJieshi->getRemark(), QVariant::String); - for (int i = 1; i <= 10; i++) - { - QString s = tdJieshi->getOilGasConclusion(i); - QtVariantProperty* pItem = _CreateVariantPropertyItem("当前项", QString("油气结论%1").arg(i), s, VariantManager::filePathTypeId()); - //pItem->setAttribute("FilePath", "123542"); - m_pVariantManager->setAttribute(pItem, "filepath", GetOilSymbolDir()); - m_pVariantManager->setAttribute(pItem, "filter", "图片(*.png *.svg)"); - } - for (int i = 1; i <= 10; i++) - { - QString s = tdJieshi->getOilGasDepth(i); - _CreateVariantPropertyItem("当前项", QString("分段点%1深度").arg(i), s, QVariant::Double); - } - //当前属性类型 - m_strCurrentProperty = JieshiItem_Property; + _CreateVariantPropertyItem("当前项", "备注", tdJieshi->getRemark(), QVariant::String); + for (int i = 1; i <= 10; i++) + { + QString s = tdJieshi->getOilGasConclusion(i); + QtVariantProperty* pItem = _CreateVariantPropertyItem("当前项", QString("油气结论%1").arg(i), s, VariantManager::filePathTypeId()); + //pItem->setAttribute("FilePath", "123542"); + m_pVariantManager->setAttribute(pItem, "filepath", GetOilSymbolDir()); + m_pVariantManager->setAttribute(pItem, "filter", "图片(*.png *.svg)"); + } + for (int i = 1; i <= 10; i++) + { + QString s = tdJieshi->getOilGasDepth(i); + _CreateVariantPropertyItem("当前项", QString("分段点%1深度").arg(i), s, QVariant::Double); + } + //当前属性类型 + m_strCurrentProperty = JieshiItem_Property; } void PropertyWidget::initSwallCoreProperty(FormInfo *formInfo) @@ -3125,9 +3250,51 @@ void PropertyWidget::initSwallCoreItemProperty(TransparentDraggableSwallCore* td // _CreateVariantPropertyItem("当前项", "深度", -Depth, QVariant::Double); - _CreateVariantPropertyItem("当前项", "岩性", LithologyImage, VariantManager::filePathTypeId()); - _CreateVariantPropertyItem("当前项", "油气", OilGasImage, VariantManager::filePathTypeId()); - _CreateVariantPropertyItem("当前项", "颜色", ColorImage, VariantManager::filePathTypeId()); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetSymbolDir()+"取心岩性符号"; + //符号统一 + strDefaultPath.replace("\\","/"); + LithologyImage.replace("\\","/"); + // + if(LithologyImage.contains(strDefaultPath)) + { + _CreateVariantPropertyItem("当前项", "岩性", LithologyImage, VariantManager::filePathTypeId()); + } + else{ + _CreateVariantPropertyItem("当前项", "岩性", strDefaultPath, VariantManager::filePathTypeId()); + } + + //只能选择自己的符号，不能选择其他。 + strDefaultPath = ::GetGasSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + OilGasImage.replace("\\","/"); + // + if(OilGasImage.contains(strDefaultPath)) + { + _CreateVariantPropertyItem("当前项", "油气", OilGasImage, VariantManager::filePathTypeId()); + } + else + { + _CreateVariantPropertyItem("当前项", "油气", strDefaultPath, VariantManager::filePathTypeId()); + } + + //只能选择自己的符号，不能选择其他。 + strDefaultPath = ::GetColorSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + ColorImage.replace("\\","/"); + // + if(ColorImage.contains(strDefaultPath)) + { + _CreateVariantPropertyItem("当前项", "颜色", ColorImage, VariantManager::filePathTypeId()); + } + else + { + _CreateVariantPropertyItem("当前项", "颜色", strDefaultPath, VariantManager::filePathTypeId()); + } + _CreateVariantPropertyItem("当前项", "起始位置", Sideleft, QVariant::Double); //_CreateVariantPropertyItem("当前项", "宽度", -Depth, QVariant::Double); } @@ -3236,7 +3403,7 @@ void PropertyWidget::initLayerItemProperty(TransparentDraggableLayer* tdLayer, d // _CreateVariantPropertyItem("当前项", "顶深(m)", -upper, QVariant::Double); _CreateVariantPropertyItem("当前项", "底深(m)", -lower, QVariant::Double); - _CreateVariantPropertyItem("当前项", "文字结论", strResult, QVariant::String); + _CreateVariantPropertyItem("当前项", "文字结论", strResult, QVariant::String); QFont myFont = tdLayer->wordfont; //("Arial", 12, QFont::Bold); // 名称字体 QColor myColor = tdLayer->fontColor; //Qt::black; //颜色 @@ -3294,7 +3461,21 @@ void PropertyWidget::initGujingItemProperty(TransparentDraggableGujing* tdGujing // _CreateVariantPropertyItem("当前项", "顶深(m)", -upper, QVariant::Double); _CreateVariantPropertyItem("当前项", "底深(m)", -lower, QVariant::Double); - _CreateVariantPropertyItem("当前项", "固井结论", strResult, VariantManager::filePathTypeId()); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetGujingSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + strResult.replace("\\","/"); + // + if(strResult.contains(strDefaultPath)) + { + _CreateVariantPropertyItem("当前项", "固井结论", strResult, VariantManager::filePathTypeId()); + } + else + { + _CreateVariantPropertyItem("当前项", "固井结论", strDefaultPath, VariantManager::filePathTypeId()); + } } void PropertyWidget::initImageProperty(FormInfo *formInfo) @@ -3612,7 +3793,7 @@ void PropertyWidget::initTvdProperty(FormInfo *formInfo) m_strCurrentProperty = Tvd_Property; } -void PropertyWidget::initGeoLithItemProperty(TransparentDraggableGeoLith* tdGeoLith, double lower, double upper, const QString myLith, const QString myOil, const QString myColor) +void PropertyWidget::initGeoLithItemProperty(TransparentDraggableGeoLith* tdGeoLith, double lower, double upper, QString myLith, QString myOil, QString myColor) { //初始化，清空 InitCurrentViewInfo(); @@ -3654,9 +3835,51 @@ void PropertyWidget::initGeoLithItemProperty(TransparentDraggableGeoLith* tdGeoL // _CreateVariantPropertyItem("当前项", "顶深(m)", -upper, QVariant::Double); _CreateVariantPropertyItem("当前项", "底深(m)", -lower, QVariant::Double); - _CreateVariantPropertyItem("当前项", "岩性", myLith, VariantManager::filePathTypeId()); - _CreateVariantPropertyItem("当前项", "油气", myOil, VariantManager::filePathTypeId()); - _CreateVariantPropertyItem("当前项", "颜色", myColor, VariantManager::filePathTypeId()); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = ::GetMudSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + myLith.replace("\\","/"); + // + if(myLith.contains(strDefaultPath)) + { + _CreateVariantPropertyItem("当前项", "岩性", myLith, VariantManager::filePathTypeId()); + } + else{ + _CreateVariantPropertyItem("当前项", "岩性", strDefaultPath, VariantManager::filePathTypeId()); + } + + //只能选择自己的符号，不能选择其他。 + strDefaultPath = ::GetGasSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + myOil.replace("\\","/"); + // + if(myOil.contains(strDefaultPath)) + { + _CreateVariantPropertyItem("当前项", "油气", myOil, VariantManager::filePathTypeId()); + } + else + { + _CreateVariantPropertyItem("当前项", "油气", strDefaultPath, VariantManager::filePathTypeId()); + } + + //只能选择自己的符号，不能选择其他。 + strDefaultPath = ::GetColorSymbolDir(); + //符号统一 + strDefaultPath.replace("\\","/"); + myColor.replace("\\","/"); + // + if(myColor.contains(strDefaultPath)) + { + _CreateVariantPropertyItem("当前项", "颜色", myColor, VariantManager::filePathTypeId()); + } + else + { + _CreateVariantPropertyItem("当前项", "颜色", strDefaultPath, VariantManager::filePathTypeId()); + } + } //气测/FMT/射孔/文本 @@ -3815,7 +4038,20 @@ void PropertyWidget::initTubingItemProperty(TransparentDraggableGuan* tdGuan, do // _CreateVariantPropertyItem("当前项", "深度(m)", -(upper+lower)/2.0, QVariant::Double); - _CreateVariantPropertyItem("当前项", "组件类型", strResult, VariantManager::filePathTypeId()); + + //只能选择自己的符号，不能选择其他。 + QString strDefaultPath = GetSymbolDir()+"管柱组件"; + //符号统一 + strDefaultPath.replace("\\","/"); + strResult.replace("\\","/"); + // + if(strResult.contains(strDefaultPath)) + { + _CreateVariantPropertyItem("当前项", "组件类型", strResult, VariantManager::filePathTypeId()); + } + else { + _CreateVariantPropertyItem("当前项", "组件类型", strDefaultPath, VariantManager::filePathTypeId()); + } } void PropertyWidget::changedDepthProperty(QString strProperty, QVariant varVal) diff --git a/logPlus/customtabwidget.cpp b/logPlus/customtabwidget.cpp index 427fd92..1f7bd6c 100644 --- a/logPlus/customtabwidget.cpp +++ b/logPlus/customtabwidget.cpp @@ -189,6 +189,16 @@ void CustomTabWidget::dropEvent(QDropEvent *event) //关闭 void CustomTabWidget::slot_tabClose(int index) { + QWidget *selectWidget = tabWidget(index); + + QString objectName = selectWidget->objectName(); + if(objectName == "MainWindowSplitter") + { + int flag = QMessageBox::warning(NULL,"提示",QString("图文件尚未保存,您确信关闭当前窗口？"),QMessageBox::Yes,QMessageBox::No); + if(flag!=QMessageBox::Yes) return; + } + + //移除 removeTab(index); //属性清空 diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 2798823..d55b760 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -8154,6 +8154,63 @@ void FormDraw::dropEvent(QDropEvent* event) //新建表格曲线 emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); } + else if(strType=="depthObject") + { + qDebug() << "新建深度"; + //新建曲线 + emit CallManage::getInstance()->sig_AddDepth(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="ganzhuangtuObject") + { + //新建杆状图 + emit CallManage::getInstance()->sig_AddGanZhuangTu(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="JyktObject") + { + //新建井眼垮塌矢量图 + emit CallManage::getInstance()->sig_AddJykt(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="DenvObject") + { + //新建井斜方位图 + emit CallManage::getInstance()->sig_AddDenv(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="DrawImageObject") + { + //图像 成图 + emit CallManage::getInstance()->sig_AddDrawImage(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="SantuyibiaoObject") + { + //斜井三图一表 + emit CallManage::getInstance()->sig_AddSantuyibiao(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="CrackObject") + { + //裂缝 + emit CallManage::getInstance()->sig_AddCrack(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="JiegutextObject") + { + //气测/FMT/射孔/文本 + emit CallManage::getInstance()->sig_AddJiegutext(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="LogfaceObject") + { + //沉积相 + emit CallManage::getInstance()->sig_AddLogface(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="MCalsObject") + { + //多臂井径 + emit CallManage::getInstance()->sig_AddMCals(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="TubingstringObject") + { + //套管组件 + emit CallManage::getInstance()->sig_AddTubingstring(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + // 接受拖拽事件 event->setDropAction(Qt::MoveAction); event->accept(); diff --git a/logPlus/formtracktop.cpp b/logPlus/formtracktop.cpp index b721042..e5e3b07 100644 --- a/logPlus/formtracktop.cpp +++ b/logPlus/formtracktop.cpp @@ -137,6 +137,62 @@ void FormTrackTop::dropEvent(QDropEvent* event) //新建表格曲线 emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); } + else if(strType=="depthObject") + { + qDebug() << "新建深度"; + //新建曲线 + emit CallManage::getInstance()->sig_AddDepth(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="ganzhuangtuObject") + { + //新建杆状图 + emit CallManage::getInstance()->sig_AddGanZhuangTu(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="JyktObject") + { + //新建井眼垮塌矢量图 + emit CallManage::getInstance()->sig_AddJykt(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="DenvObject") + { + //新建井斜方位图 + emit CallManage::getInstance()->sig_AddDenv(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="DrawImageObject") + { + //图像 成图 + emit CallManage::getInstance()->sig_AddDrawImage(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="SantuyibiaoObject") + { + //斜井三图一表 + emit CallManage::getInstance()->sig_AddSantuyibiao(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="CrackObject") + { + //裂缝 + emit CallManage::getInstance()->sig_AddCrack(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="JiegutextObject") + { + //气测/FMT/射孔/文本 + emit CallManage::getInstance()->sig_AddJiegutext(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="LogfaceObject") + { + //沉积相 + emit CallManage::getInstance()->sig_AddLogface(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="MCalsObject") + { + //多臂井径 + emit CallManage::getInstance()->sig_AddMCals(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="TubingstringObject") + { + //套管组件 + emit CallManage::getInstance()->sig_AddTubingstring(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } // 接受拖拽事件 event->setDropAction(Qt::MoveAction); event->accept(); diff --git a/logPlus/formwell.cpp b/logPlus/formwell.cpp index 6fdab02..71d0cfa 100644 --- a/logPlus/formwell.cpp +++ b/logPlus/formwell.cpp @@ -28,8 +28,12 @@ FormWell::FormWell(QWidget *parent, QString strWellName) : ui->tableWidget->setRowCount(rowcount); //动态设置行数 //ui->tableWidget->verticalHeader()->setFixedWidth(3);//标题栏宽度 ui->tableWidget->horizontalHeader()->setFixedHeight(3); - - ui->tableWidget->setStyleSheet( "QTableView::item:selected {color:#57595B; background:#E4E4E4;}"); + //左右边框隐藏 + ui->tableWidget->setStyleSheet("QTableView::item {border-left: 0px solid black;} \ + QTableView::item:selected {border-left: 0px solid black; color:#57595B; background:#E4E4E4;}\ + QTableView::item {border-right: 0px solid black;} \ + QTableView::item:selected {border-right: 0px solid black;}"); + //"QTableView::item:selected {color:#57595B; background:#E4E4E4;}" // 假设你的类中有一个槽函数：onTableRowsInserted(QModelIndex parent, int first, int last) //connect(ui->tableWidget->model(), &QAbstractItemModel::columnsInserted, diff --git a/logPlus/preqtablewidget.cpp b/logPlus/preqtablewidget.cpp index b27d323..bee6c2f 100644 --- a/logPlus/preqtablewidget.cpp +++ b/logPlus/preqtablewidget.cpp @@ -125,7 +125,71 @@ void PreQTableWidget::dropEvent(QDropEvent *event) //新建表格曲线 emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); } + else if(strType=="depthObject") + { + qDebug() << "新建深度"; + //新建曲线 + emit CallManage::getInstance()->sig_AddDepth(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="ganzhuangtuObject") + { + //新建杆状图 + emit CallManage::getInstance()->sig_AddGanZhuangTu(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="JyktObject") + { + //新建井眼垮塌矢量图 + emit CallManage::getInstance()->sig_AddJykt(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="DenvObject") + { + //新建井斜方位图 + emit CallManage::getInstance()->sig_AddDenv(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="DrawImageObject") + { + //图像 成图 + emit CallManage::getInstance()->sig_AddDrawImage(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="SantuyibiaoObject") + { + //斜井三图一表 + emit CallManage::getInstance()->sig_AddSantuyibiao(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="CrackObject") + { + //裂缝 + emit CallManage::getInstance()->sig_AddCrack(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="JiegutextObject") + { + //删除表格 +// emit CallManage::getInstance()->sig_delTableLine(m_strUuid, strWellName, strTrackName, strLineName); + //气测/FMT/射孔/文本 + emit CallManage::getInstance()->sig_AddJiegutext(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="LogfaceObject") + { + //删除表格 +// emit CallManage::getInstance()->sig_delTableLine(m_strUuid, strWellName, strTrackName, strLineName); + + //沉积相 + emit CallManage::getInstance()->sig_AddLogface(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="MCalsObject") + { + //多臂井径 + emit CallManage::getInstance()->sig_AddMCals(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="TubingstringObject") + { + //删除表格 +// emit CallManage::getInstance()->sig_delTableLine(m_strUuid, strWellName, strTrackName, strLineName); + + //套管组件 + emit CallManage::getInstance()->sig_AddTubingstring(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } // //m_listLineName.push_back(strLineName); @@ -190,7 +254,62 @@ void PreQTableWidget::dropEvent(QDropEvent *event) //新建表格曲线 emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); } - + else if(strType=="depthObject") + { + qDebug() << "新建深度"; + //新建曲线 + emit CallManage::getInstance()->sig_AddDepth(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="ganzhuangtuObject") + { + //新建杆状图 + emit CallManage::getInstance()->sig_AddGanZhuangTu(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="JyktObject") + { + //新建井眼垮塌矢量图 + emit CallManage::getInstance()->sig_AddJykt(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="DenvObject") + { + //新建井斜方位图 + emit CallManage::getInstance()->sig_AddDenv(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="DrawImageObject") + { + //图像 成图 + emit CallManage::getInstance()->sig_AddDrawImage(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="SantuyibiaoObject") + { + //斜井三图一表 + emit CallManage::getInstance()->sig_AddSantuyibiao(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="CrackObject") + { + //裂缝 + emit CallManage::getInstance()->sig_AddCrack(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="JiegutextObject") + { + //气测/FMT/射孔/文本 + emit CallManage::getInstance()->sig_AddJiegutext(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="LogfaceObject") + { + //沉积相 + emit CallManage::getInstance()->sig_AddLogface(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="MCalsObject") + { + //多臂井径 + emit CallManage::getInstance()->sig_AddMCals(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } + else if(strType=="TubingstringObject") + { + //套管组件 + emit CallManage::getInstance()->sig_AddTubingstring(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); + } // //m_listLineName.push_back(strLineName); @@ -237,9 +356,10 @@ void PreQTableWidget::performDrag() // 执行拖拽操作 m_AddSuc = false; Qt::DropAction dropAction = drag->exec(Qt::MoveAction); - if (dropAction == Qt::MoveAction) { //&& m_AddSuc + if (dropAction == Qt::MoveAction) + { // 处理拖拽结束的逻辑，例如从界面上移除拖拽的项 - removeRow(iCurrentRow); +// removeRow(iCurrentRow); if(strType=="curveObject") { //删除曲线 @@ -252,12 +372,67 @@ void PreQTableWidget::performDrag() } else if(strType=="tableObject") { - //删除波列 + //删除表格 emit CallManage::getInstance()->sig_delTableLine(m_strUuid, formInfo->m_strWellName, formInfo->m_strTrackName, formInfo->m_strLineName); } + else if(strType=="depthObject") + { + //深度 - // - //m_listLineName.removeOne(formInfo->m_strLineName); + } + else if(strType=="ganzhuangtuObject") + { + //杆状图 + + } + else if(strType=="JyktObject") + { + //井眼垮塌矢量图 + + } + else if(strType=="DenvObject") + { + //井斜方位图 + + } + else if(strType=="DrawImageObject") + { + //图像 成图 + + } + else if(strType=="SantuyibiaoObject") + { + //斜井三图一表 + + } + else if(strType=="CrackObject") + { + //裂缝 + + } + else if(strType=="JiegutextObject") + { + //气测/FMT/射孔/文本 + //删除表格 + emit CallManage::getInstance()->sig_delTableLine(m_strUuid, formInfo->m_strWellName, formInfo->m_strTrackName, formInfo->m_strLineName); + } + else if(strType=="LogfaceObject") + { + //沉积相 + //删除表格 + emit CallManage::getInstance()->sig_delTableLine(m_strUuid, formInfo->m_strWellName, formInfo->m_strTrackName, formInfo->m_strLineName); + } + else if(strType=="MCalsObject") + { + //多臂井径 + + } + else if(strType=="TubingstringObject") + { + //套管组件 + //删除表格 + emit CallManage::getInstance()->sig_delTableLine(m_strUuid, formInfo->m_strWellName, formInfo->m_strTrackName, formInfo->m_strLineName); + } } } }