From a15b26e3d878c6b031dac81848fb37a13ffa15a0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Fri, 12 Jun 2026 11:28:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9F=A5=E7=9C=8B=E6=B3=A2=E5=88=97?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=EF=BC=8C=20WellLogTableDia?= =?UTF-8?q?logNew=E7=95=8C=E9=9D=A2=E4=B8=8D=E8=A6=81=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=A4=9A=E4=B8=AA=E7=95=8C=E9=9D=A2=202.?= =?UTF-8?q?=E5=85=B3=E9=97=ADWellLogTableDialogNew=E5=90=8E=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E5=85=B1=E4=BA=AB=E5=86=85=E5=AD=98HANDLE=203.?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E7=9C=8B=E6=B3=A2=E5=88=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=95=E8=B5=B7=E7=9A=84=E5=B4=A9=E6=BA=83=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=204.=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E5=90=8E=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95=E5=AF=B9=E8=AF=9D=E6=A1=86?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E9=97=AD=E5=8F=AF=E8=A7=86=E8=A7=A3=E9=87=8A?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=AF=B9=E5=BA=94=E7=9A=84=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../include/WellLogWorkflowDataModel.h | 4 +- OSGDataModel/src/ObjWellLogWavefile.cpp | 8 +- WellLogUI/include/WellLogTableDialogNew.h | 1 + WellLogUI/include/griddataadapter.h | 2 +- WellLogUI/src/WellLogTableDialogNew.cpp | 19 ++- WellLogUI/src/griddataadapter.cpp | 10 +- .../include/PaiWorkflowDataModel.h | 8 +- logPlus/logPlus.pro | 2 + logPlus/logplus.vcxproj | 5 + logPlus/logplus.vcxproj.filters | 15 ++ logPlus/mainwindow.cpp | 40 +++++- logPlus/mainwindow.h | 3 + logPlus/mainwindowcurve.cpp | 128 +++++++++++++++++- logPlus/mainwindowcurve.h | 14 ++ logPlus/mainwindowsplitter.cpp | 24 ++-- logPlus/qmycustomplot.cpp | 4 +- 16 files changed, 253 insertions(+), 34 deletions(-) diff --git a/OSGDataModel/include/WellLogWorkflowDataModel.h b/OSGDataModel/include/WellLogWorkflowDataModel.h index 89f78a4..6f8256a 100644 --- a/OSGDataModel/include/WellLogWorkflowDataModel.h +++ b/OSGDataModel/include/WellLogWorkflowDataModel.h @@ -86,8 +86,8 @@ public: void LoadFromTemplateFile(); pai::module::CModule* m_pModule; private: - CBaseObject * m_SingleWellWindowDocument; - CBaseObject * m_MultiWellWindowDocument; + CBaseObject * m_SingleWellWindowDocument = nullptr; + CBaseObject * m_MultiWellWindowDocument = nullptr; bool isSingleModuleMode;//true则是单方法模式，false就是workflow模式 bool isDefineMothodMode;//true则是运行模式，false就是定义合成方法模式 QString CurrentWellRoundPath;//当前井次 diff --git a/OSGDataModel/src/ObjWellLogWavefile.cpp b/OSGDataModel/src/ObjWellLogWavefile.cpp index b41041b..9f99619 100644 --- a/OSGDataModel/src/ObjWellLogWavefile.cpp +++ b/OSGDataModel/src/ObjWellLogWavefile.cpp @@ -19,7 +19,12 @@ CObjWellLogWavefile::CObjWellLogWavefile() CObjWellLogWavefile::~CObjWellLogWavefile() { - + if (!key.isEmpty() && IsMappingMem(key.toStdString().c_str())) { + CloseView(m_Handle, m_SharedMemory); + m_SharedMemory = NULL; + m_Handle = NULL; + key = ""; + } } QUuid CObjWellLogWavefile::GetTypeID()const { @@ -308,6 +313,7 @@ bool CObjWellLogWavefile::LoadFromSLF() if(IsMappingMem(name.toStdString().c_str())) { + CloseView(m_Handle, m_SharedMemory); // GetObjectEvent().OnDeAttchData(m_SlfFileName,GetName()); } m_SharedMemory=NULL; diff --git a/WellLogUI/include/WellLogTableDialogNew.h b/WellLogUI/include/WellLogTableDialogNew.h index deb6ac0..55fc953 100644 --- a/WellLogUI/include/WellLogTableDialogNew.h +++ b/WellLogUI/include/WellLogTableDialogNew.h @@ -137,6 +137,7 @@ public: int m_ObjectType; public: + bool isEqual(QString strOldPath, QString strOldName, int nObjectType); void setName(QString strOldPath, QString strOldName, int nObjectType); void setShowCurveName(QString strPath, QString strName, QMap> mapShowObject); }; diff --git a/WellLogUI/include/griddataadapter.h b/WellLogUI/include/griddataadapter.h index 5d88ff4..7b22d2e 100644 --- a/WellLogUI/include/griddataadapter.h +++ b/WellLogUI/include/griddataadapter.h @@ -325,7 +325,7 @@ private: bool m_switch; int m_nVerScrollValue; AssetCopy* m_pAssetCopy; - QMenu *m_menu; + QMenu *m_menu = nullptr; bool canLoadFromSLF; FLOATPROPERTY tempdata; diff --git a/WellLogUI/src/WellLogTableDialogNew.cpp b/WellLogUI/src/WellLogTableDialogNew.cpp index e900e22..6615e72 100644 --- a/WellLogUI/src/WellLogTableDialogNew.cpp +++ b/WellLogUI/src/WellLogTableDialogNew.cpp @@ -173,6 +173,18 @@ void WellLogTableDialogNew::slotImport() TableFromCSVFile(m_pUI->tableWidget); } +bool WellLogTableDialogNew::isEqual(QString strOldPath, QString strOldName, int nObjectType) +{ + bool bret = false; + if (FileName == strOldPath + && CurveName == strOldName + && m_ObjectType == nObjectType) + { + bret = true; + } + return bret; +} + void WellLogTableDialogNew::setName(QString strOldPath, QString strOldName, int nObjectType) { FileName = strOldPath; @@ -619,7 +631,12 @@ void WellLogTableDialogNew::slotSave() WellLogTableDialogNew::~WellLogTableDialogNew() { //luol 20200302 - // m_gridData->deleteLater(); + m_gridData->deleteLater(); + for (int j = 0; j < m_pWellLogs.size(); j++) + { + m_pWellLogs.at(j)->deleteLater(); + } + m_pWellLogs.clear(); // if(NULL != m_gridData) // { // delete m_gridData; diff --git a/WellLogUI/src/griddataadapter.cpp b/WellLogUI/src/griddataadapter.cpp index 71f202b..91ae440 100644 --- a/WellLogUI/src/griddataadapter.cpp +++ b/WellLogUI/src/griddataadapter.cpp @@ -310,11 +310,11 @@ GridDataAdapter::~GridDataAdapter() delete m_popTip; m_popTip=NULL; } - if(NULL != m_menu) - { - delete m_menu; - m_menu = NULL; - } +// if(NULL != m_menu) +// { +// delete m_menu; +// m_menu = NULL; +// } if(!ifItemWidth){ delete []itemWidth; itemWidth = NULL; diff --git a/Workflow/WFEngine/ObjectModel/ObjectModel/include/PaiWorkflowDataModel.h b/Workflow/WFEngine/ObjectModel/ObjectModel/include/PaiWorkflowDataModel.h index 4439931..fb63f21 100644 --- a/Workflow/WFEngine/ObjectModel/ObjectModel/include/PaiWorkflowDataModel.h +++ b/Workflow/WFEngine/ObjectModel/ObjectModel/include/PaiWorkflowDataModel.h @@ -770,10 +770,10 @@ private: QString GetFriendlyParamStringValue(const pai::module::CParameterItem *pParamItem) const; private: - pai::workflow::CWorkFlowFile *m_pWorkflowFile; ///< 工作流文件 - std::vector< pai::graphics2d::PaiModuleStyle* > *m_pModuleStyle; ///< 模块图形信息 - std::vector< pai::graphics2d::PaiConnectionStyle* > *m_pConnectionStyle; ///< 关系图形信息 - pai::objectmodel::PaiWorkflowSubmitter *m_pSubmitter; ///< 工作流提交器，用来提交工作流 + pai::workflow::CWorkFlowFile *m_pWorkflowFile = nullptr; ///< 工作流文件 + std::vector< pai::graphics2d::PaiModuleStyle* > *m_pModuleStyle = nullptr; ///< 模块图形信息 + std::vector< pai::graphics2d::PaiConnectionStyle* > *m_pConnectionStyle = nullptr;///< 关系图形信息 + pai::objectmodel::PaiWorkflowSubmitter *m_pSubmitter = nullptr; ///< 工作流提交器，用来提交工作流 QString m_MissingModules; ///< 丢失的模块信息 bool m_template; ///< 模板标记 bool m_CanSubmit; ///< 模块有错误时将该标记设为false diff --git a/logPlus/logPlus.pro b/logPlus/logPlus.pro index 5adece8..1c3f3c1 100644 --- a/logPlus/logPlus.pro +++ b/logPlus/logPlus.pro @@ -40,6 +40,7 @@ SOURCES += \ InterfaceWidget.cpp \ LogmudItemDrawer.cpp \ LogmudResultItem.cpp \ + MyGraphicsView.cpp \ PickFrac.cpp \ PropertyWidget.cpp \ QCPSizeHandle.cpp \ @@ -114,6 +115,7 @@ HEADERS += \ InterfaceWidget.h \ LogmudResultItem.h \ LogmuditemDrawer.h \ + MyGraphicsView.h \ PickFrac.h \ PropertyWidget.h \ QCPSizeHandle.h \ diff --git a/logPlus/logplus.vcxproj b/logPlus/logplus.vcxproj index 16de92c..55ebaca 100644 --- a/logPlus/logplus.vcxproj +++ b/logPlus/logplus.vcxproj @@ -11,6 +11,8 @@ + + @@ -187,6 +189,7 @@ + @@ -201,6 +204,7 @@ + @@ -254,6 +258,7 @@ + {BE733E79-9D41-44C5-A0A3-048959EE70A0} diff --git a/logPlus/logplus.vcxproj.filters b/logPlus/logplus.vcxproj.filters index bba419e..3fdb4cb 100644 --- a/logPlus/logplus.vcxproj.filters +++ b/logPlus/logplus.vcxproj.filters @@ -325,6 +325,12 @@ Header Files + + Header Files + + + Header Files + @@ -681,6 +687,12 @@ Source Files + + Source Files + + + Source Files + @@ -760,5 +772,8 @@ Form Files + + Form Files + \ No newline at end of file diff --git a/logPlus/mainwindow.cpp b/logPlus/mainwindow.cpp index 99c06b0..9739612 100644 --- a/logPlus/mainwindow.cpp +++ b/logPlus/mainwindow.cpp @@ -197,11 +197,15 @@ void MainWindow::ReadConfig() } else { + if (iHeight < QApplication::desktop()->width()) + { + iHeight = QApplication::desktop()->width(); + } if(iHeight < QApplication::desktop()->height()) { //不能低于分辨率 iHeight = QApplication::desktop()->height(); - } + } } g_iHeight_MyCustom = iHeight; @@ -455,6 +459,9 @@ bool MainWindow::closeProject() for(int i=0; itabWidget(i); + if (!selectWidget) + continue; + QString objectName = selectWidget->objectName(); if(objectName == "MainWindowSplitter") { @@ -868,13 +875,36 @@ void MainWindow::s_ShowWave(QString strSlfName, QString strName) { if(m_centerWidgets) { - WellLogTableDialogNew* pDialog = new WellLogTableDialogNew(); - pDialog->setName(strSlfName, strName, WAVE_OBJECT); + WellLogTableDialogNew* pDialog = nullptr; + for (int nIndex = m_pWellLogTableDialogNew.size() - 1; nIndex >= 0; nIndex--) + { + QPointer pDlg = m_pWellLogTableDialogNew[nIndex]; + if (pDlg.isNull()) + { + m_pWellLogTableDialogNew.removeAt(nIndex); + continue; + } + bool equ = pDlg->isEqual(strSlfName, strName, WAVE_OBJECT); + if (equ) + { + pDialog = pDlg; + break; + } + + } + if (!pDialog) + { + QPointer pTmp = new WellLogTableDialogNew(); + pTmp->setName(strSlfName, strName, WAVE_OBJECT); + m_pWellLogTableDialogNew.append(pTmp); + pDialog = pTmp; + } + QString wellname;QString path; GetWellNameAndPath(strSlfName, wellname, path); m_centerWidgets->addTab(pDialog, wellname + ":" + strName); - int iCount = m_centerWidgets->count(); - m_centerWidgets->m_pTabBar->setCurrentIndex(iCount-1); +// int iCount = m_centerWidgets->count(); +// m_centerWidgets->m_pTabBar->setCurrentIndex(iCount-1); } } //编辑测井信息 diff --git a/logPlus/mainwindow.h b/logPlus/mainwindow.h index 3ea6e94..7db61bd 100644 --- a/logPlus/mainwindow.h +++ b/logPlus/mainwindow.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "qtprojectwidgets.h" //#include "qtcenterwidgets.h" @@ -24,6 +25,7 @@ namespace Ui { class MainWindow; } +class WellLogTableDialogNew; class MainWindow : public QMainWindow { Q_OBJECT @@ -50,6 +52,7 @@ public: PropertyWidget *m_propertyWidget;//属性 ConsoleOutputWidget *m_consoleOutputWidget;//日志 + QList> m_pWellLogTableDialogNew; public: virtual void closeEvent(QCloseEvent *event); protected: diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index e551853..36e4c3d 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -18,6 +18,7 @@ #include "mainwindow.h" #include #include "ItemBorderDelegate.h" +#include "MyGraphicsView.h" #ifdef WIN32 #include "tiffio.h" @@ -426,6 +427,18 @@ void MainWindowCurve::SetNo() } MainWindowCurve::~MainWindowCurve() { + if (m_pModuleDlg) + { + m_pModuleDlg->m_toolBar_plugin = nullptr; + m_pModuleDlg->close(); + } + if (m_pModuleConsole) + { + m_pModuleConsole->g_mModuleParamers->deleteLater(); + m_pModuleConsole->m_pWorkflowDataModel->deleteLater(); + m_pModuleConsole->deleteLater(); + } + if(m_SharedMemory.isAttached()){ int *isNo=(int*)m_SharedMemory.data(); m_SharedMemory.detach(); @@ -3388,7 +3401,44 @@ void MainWindowCurve::s_ExecuteMerge() void MainWindowCurve::s_ModuleOpen() { - m_pParentWin->setModuleOpenOrClose(); + QString strSlfName = ""; + QString strLeft = m_leftWidgets->getLeftTreeString(); + if (strLeft.length() > 0) + { + QStringList list = strLeft.split("#@@#");//QString字符串分割函数 + if (list.size() > 3) + { + strSlfName = list[0]; + QString strWellName = list[1]; + } + } + if (strSlfName.isEmpty()) + { + QMessageBox::information(nullptr, "提示", "请先选中待处理井次"); + return; + } + if (m_pModuleConsole == nullptr) + { + CModuleConsole* pModuleConsole = new pai::graphics::CModuleConsole(); + m_pModuleConsole = pModuleConsole; + pai::graphics::CModuleParamers* pDialog = new pai::graphics::CModuleParamers(pModuleConsole);//::CreatParamControlWidget(); + m_pModuleDlg = pDialog; + pModuleConsole->g_mModuleParamers = pDialog; + pModuleConsole->m_pWorkflowDataModel = new CWellLogWorkflowDataModel(); + pDialog->m_CurrentSLFFileName = m_leftWidgets->m_strSlfName; + pDialog->m_toolBar_plugin = getPluginToolBar(); + pDialog->m_mapAllSlfFile = m_leftWidgets->m_mapAllSlfFile; + pDialog->CreatParamControlWidget(); + pDialog->setWindowTitle("处理方法"); + } + if (m_pModuleDlg->isVisible()) + m_pModuleDlg->close(); + SetWorkflowConsole(m_pModuleConsole); + m_pModuleDlg->setFixedSize(600,800); + m_pModuleDlg->show(); + + //rotateCentralWidget90(); + //m_pParentWin->setModuleOpenOrClose(); } //缩放 @@ -7070,3 +7120,79 @@ void MainWindowCurve::wheelEvent(QWheelEvent *e) // 调用父类事件函数，保证鼠标滚轮查看文本功能正常 QMainWindow::wheelEvent(e); } + +void MainWindowCurve::rotateCentralWidget90() { + QWidget *oldCentral = takeCentralWidget(); + QObject* obj = oldCentral->parent(); + if (m_pGraphicsScene == NULL) + { + // 获取当前的centralWidget + QWidget *oldCentral = takeCentralWidget(); + if (!oldCentral) return; + m_pTakeWidget = oldCentral; + + QSize oldSize = oldCentral->size(); + // 创建场景并将oldCentral嵌入 + m_pGraphicsScene = new QGraphicsScene(this); + m_pGraphicsProxy = m_pGraphicsScene->addWidget(oldCentral); + m_pGraphicsProxy->setRotation(-90); // 旋转90度 + + // 创建QGraphicsView作为新的centralWidget + m_view = new MyGraphicsView(m_pGraphicsScene, this); + m_view->setGraphicsProxyWidget(m_pGraphicsProxy); + // 将view设置为主窗口的centralWidget + setCentralWidget(m_view); + m_pGraphicsScene->setSceneRect(0, 0, oldSize.width(), oldSize.height()-3); + // 将旋转原点设置为代理部件的中心点 + m_pGraphicsProxy->setTransformOriginPoint(m_pGraphicsProxy->boundingRect().center()); + + QRect gt = oldCentral->geometry(); + gt.setLeft(0); + gt.setTop(0); + gt.setWidth(oldSize.height()); + gt.setHeight(oldSize.width()); + oldCentral->setGeometry(gt); + + QRectF sceneRect = m_pGraphicsProxy->sceneBoundingRect(); + // 移动 proxy，使得 sceneBoundingRect 的左上角位于 (0, 0) + m_pGraphicsProxy->setPos(m_pGraphicsProxy->pos() - sceneRect.topLeft()); + + m_bHVDisplay = true; + } + else + { + m_bHVDisplay = !m_bHVDisplay; + + if (m_bHVDisplay) + { + int nrot = 0; + QRectF RTF = m_pGraphicsScene->sceneRect(); + int nw = RTF.width(); + int nh = RTF.height(); + nrot = -90; + nw = RTF.height(); + nh = RTF.width(); + + QRect gt = m_pTakeWidget->geometry(); + gt.setWidth(nw); + gt.setHeight(nh); + m_pTakeWidget->setGeometry(gt); + m_pGraphicsProxy->setRotation(nrot); // 旋转90度 + + QRectF sceneRect = m_pGraphicsProxy->sceneBoundingRect(); + // 移动 proxy，使得 sceneBoundingRect 的左上角位于 (0, 0) + m_pGraphicsProxy->setPos(m_pGraphicsProxy->pos() - sceneRect.topLeft()); + } + else + { + setCentralWidget(m_pTakeWidget); + + m_pGraphicsScene->deleteLater(); + m_pGraphicsScene = nullptr; + m_view->deleteLater(); + m_view = nullptr; + } + + } + +} diff --git a/logPlus/mainwindowcurve.h b/logPlus/mainwindowcurve.h index f47beef..d248634 100644 --- a/logPlus/mainwindowcurve.h +++ b/logPlus/mainwindowcurve.h @@ -7,6 +7,7 @@ #include "formmultiheads.h" #include "qtprojectwidgets.h" #include "CurveLine.h" +#include "LogModuleConsole.h" #pragma execution_character_set("utf-8") @@ -22,6 +23,7 @@ struct SelectTableItem QString m_strFormInfoType="";//类型：curve, wave }; class MainWindowSplitter; +class MyGraphicsView; namespace Ui { class MainWindowCurve; @@ -43,6 +45,8 @@ protected: void resizeEvent(QResizeEvent *event); void wheelEvent(QWheelEvent *e) override; //滚轮事件 + void rotateCentralWidget90(); + public: void resizeItem(QString strWellName, double tempWidth, double tempHight); void getTableSize_Head(int &iHight); @@ -117,6 +121,13 @@ public: //预览图 bool g_bPreviewPrint = false; int m_iTableSize_Head2 = 104; + + QGraphicsScene *m_pGraphicsScene = NULL; + QGraphicsProxyWidget *m_pGraphicsProxy = NULL; + MyGraphicsView *m_view = NULL; + // 横竖显示，默认竖显示 + bool m_bHVDisplay = false; + QWidget * m_pTakeWidget = NULL; public: //黑白图，针对共享内存，使用老版本代码，需要以下定义 //整图放大缩小比例 @@ -268,6 +279,9 @@ public: QAction* m_wellsSpaceAc = nullptr; //井间距 QAction* m_ModuleOpenAc = nullptr; //处理方法 + CModuleConsole* m_pModuleConsole = nullptr; //CModuleConsole + CModuleParamers* m_pModuleDlg = nullptr; + public slots: void s_NewWell(QString strWellName, QString strSlfName, bool bShowTrackHead = true);//新建井 void s_NewTrackChangeWidth(QString strWellName, double nW=0);//新建道后，改变井宽 diff --git a/logPlus/mainwindowsplitter.cpp b/logPlus/mainwindowsplitter.cpp index ef77e45..1374362 100644 --- a/logPlus/mainwindowsplitter.cpp +++ b/logPlus/mainwindowsplitter.cpp @@ -1,7 +1,5 @@ #include "mainwindowsplitter.h" #include "ui_mainwindowsplitter.h" -#include "LogModuleParamers.h" -#include "LogModuleConsole.h" MainWindowSplitter::MainWindowSplitter(QWidget *parent) : QMainWindow(parent), @@ -20,17 +18,17 @@ void MainWindowSplitter::setSplitterWidget(QtProjectWidgets *pWidgets) m_mainWindowCurve = new MainWindowCurve(this);//中间工作区 // 左侧树 m_mainWindowCurve->m_leftWidgets = pWidgets; - m_PluginToolBar = m_mainWindowCurve->getPluginToolBar(); + //m_PluginToolBar = m_mainWindowCurve->getPluginToolBar(); - CModuleConsole* pModuleConsole = new pai::graphics::CModuleConsole(); - CModuleParamers* pDialog = new CModuleParamers(pModuleConsole);//::CreatParamControlWidget(); - SetWorkflowConsole(pModuleConsole); - pModuleConsole->g_mModuleParamers = pDialog; - pModuleConsole->m_pWorkflowDataModel = new CWellLogWorkflowDataModel(); - pDialog->m_CurrentSLFFileName = pWidgets->m_strSlfName; - pDialog->m_toolBar_plugin = m_PluginToolBar; - pDialog->m_mapAllSlfFile = pWidgets->m_mapAllSlfFile; - pDialog->CreatParamControlWidget(); + //CModuleConsole* pModuleConsole = new pai::graphics::CModuleConsole(); + //CModuleParamers* pDialog = new CModuleParamers(pModuleConsole);//::CreatParamControlWidget(); + //SetWorkflowConsole(pModuleConsole); + //pModuleConsole->g_mModuleParamers = pDialog; + //pModuleConsole->m_pWorkflowDataModel = new CWellLogWorkflowDataModel(); + //pDialog->m_CurrentSLFFileName = pWidgets->m_strSlfName; + //pDialog->m_toolBar_plugin = m_PluginToolBar; + // pDialog->m_mapAllSlfFile = pWidgets->m_mapAllSlfFile; + //pDialog->CreatParamControlWidget(); //QString subStr = strSlfName; //int startPos = strSlfName.indexOf("Logdata"); @@ -45,7 +43,7 @@ void MainWindowSplitter::setSplitterWidget(QtProjectWidgets *pWidgets) m_pVSplitter = new QSplitter(Qt::Horizontal); m_pVSplitter->addWidget(m_mainWindowCurve); - m_pVSplitter->addWidget(pDialog); + //m_pVSplitter->addWidget(pDialog); setCentralWidget(m_pVSplitter); diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 365d5ef..9f9cd17 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -5192,6 +5192,8 @@ void QMyCustomPlot::s_ReloadPlot(QString strUuid, QString strSlfName, QString st { return; } + if (graph(0) == NULL) + return; if(strLineName == "") { @@ -11935,7 +11937,7 @@ void QMyCustomPlot::drawRose(bool bTableData, QString csCurveDDIR, QString csCur float maxd=max(m_RightVal , m_LeftVal); float dirmax,dipmax,dr; float deps; - float ftmpSdep = 2890;//m_SDep; + float ftmpSdep = 500;//m_SDep; float ftmpEdep = m_EDep; if (m_bTableData)