diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index dd9cb58..cee78d3 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -2056,6 +2056,15 @@ void FormDraw::DisplayLine_One(QJsonObject lineObjInfo) bDrawSymmetry = value.toBool(); } } + // + QCPScatterStyle::ScatterShape pointStyle=QCPScatterStyle::ssCircle;//数据点，符号类型，圆，三角等 + if (lineObjInfo.contains("pointStyle")) + { + QJsonValue value = lineObjInfo.value("pointStyle"); + if (value.isDouble()) { + pointStyle = (QCPScatterStyle::ScatterShape)value.toInt(); + } + } QString folderPath = GetLogdataPath(); folderPath = folderPath + g_prjname; @@ -2099,6 +2108,8 @@ void FormDraw::DisplayLine_One(QJsonObject lineObjInfo) else{ listOtherProperty.append("0"); } + // + listOtherProperty.append(QString::number(pointStyle)); //新建曲线 s_AddLine_Property(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName, @@ -4184,7 +4195,9 @@ void FormDraw::initForm(QMyCustomPlot *widget, QString strSlfName, QString strLi bool bDrawGan = false; // 杆状 bool bDrawPoint = false; // 点状 bool bDrawSymmetry = false; // 绘制对称曲线 - if(listOtherProperty.size()>=7) + QCPScatterStyle::ScatterShape pointStyle=QCPScatterStyle::ssCircle;//数据点，符号类型，圆，三角等 + + if(listOtherProperty.size()>=8) { if(listOtherProperty[3]=="DrawLine") { @@ -4221,6 +4234,8 @@ void FormDraw::initForm(QMyCustomPlot *widget, QString strSlfName, QString strLi { bDrawSymmetry = false; } + // + pointStyle = (QCPScatterStyle::ScatterShape)listOtherProperty[7].toInt(); } //最大值，最小值 @@ -4321,6 +4336,7 @@ void FormDraw::initForm(QMyCustomPlot *widget, QString strSlfName, QString strLi widget->m_bDrawGan = bDrawGan; widget->m_bDrawPoint = bDrawPoint; widget->m_bDrawSymmetry = bDrawSymmetry; + widget->m_pointStyle = pointStyle; addRandomGraph(widget, x, y, strSlfName, strLineName, strAliasName, strUnit, newLeftScale, newRightScale, strScaleType, lineColor, width, lineStyle, listOtherProperty); diff --git a/logPlus/forminfo.cpp b/logPlus/forminfo.cpp index 8c2199c..381c632 100644 --- a/logPlus/forminfo.cpp +++ b/logPlus/forminfo.cpp @@ -267,6 +267,7 @@ QJsonObject FormInfo::makeJson() rootObj["DrawGan"] = m_bDrawGan; // 杆状 rootObj["DrawPoint"] = m_bDrawPoint; // 点状 rootObj["DrawSymmetry"] = m_bDrawSymmetry; // 绘制对称曲线 + rootObj["pointStyle"] = m_pointStyle; //岩性填充 rootObj["newFillMode"] = m_newFillMode; diff --git a/logPlus/formtrack.cpp b/logPlus/formtrack.cpp index e8e8ce4..e79a5a8 100644 --- a/logPlus/formtrack.cpp +++ b/logPlus/formtrack.cpp @@ -370,7 +370,7 @@ void FormTrack::s_addLine(QString strSlfName, QString strWellName, QString strTr curveNameFont.fromString(listOtherProperty[2]); formInfo->m_curveNameFont = curveNameFont; } - if(listOtherProperty.size()>=7) + if(listOtherProperty.size()>=8) { if(listOtherProperty[3]=="DrawLine") { @@ -407,6 +407,11 @@ void FormTrack::s_addLine(QString strSlfName, QString strWellName, QString strTr { formInfo->m_bDrawSymmetry = false; } + + // + QCPScatterStyle::ScatterShape pointStyle=QCPScatterStyle::ssCircle;//数据点，符号类型，圆，三角等 + pointStyle = (QCPScatterStyle::ScatterShape)listOtherProperty[7].toInt(); + formInfo->m_pointStyle = pointStyle; } //设置高度 diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index d3ed5af..6b63424 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -197,7 +197,7 @@ void MainWindowCurve::initMainToolBar() QIcon executeDepthShiftIcon(::GetImagePath()+"icon/ExecuteDepthShift.png"); QIcon joindepthIcon(::GetImagePath()+"icon/joindepth.png"); QIcon ModuleOpenIcon(::GetImagePath()+"icon/ModuleOne.png"); - QIcon openFileIcon(":/image/open.png"); + QIcon SaveAsPictureIcon(::GetImagePath()+"icon/SaveAsPicture.png"); QIcon runIcon(":/image/capacity.png"); QIcon debugIcon(":/image/anaysis.png"); QIcon loadIcon(":/image/export.png"); @@ -210,7 +210,7 @@ void MainWindowCurve::initMainToolBar() QAction* m_executeDepthShiftAc = nullptr; //校深 QAction* m_joindepthAc = nullptr; //拼接 QAction* m_ModuleOpenAc = nullptr; //处理方法 - //QAction* m_openAc = nullptr; //打开 + QAction* m_SaveAsPictureAc = nullptr; //导出长图 // QAction* m_runAc = nullptr;// // QAction* m_debugAc = nullptr; // // QAction* m_loadAc = nullptr; //加载 @@ -222,7 +222,7 @@ void MainWindowCurve::initMainToolBar() m_executeDepthShiftAc = new QAction(executeDepthShiftIcon, "校深", this); m_joindepthAc = new QAction(joindepthIcon, "拼接", this); m_ModuleOpenAc = new QAction(ModuleOpenIcon, "处理方法", this); -// m_runAc = new QAction(runIcon, "设置井", this); + m_SaveAsPictureAc = new QAction(SaveAsPictureIcon, "导出长图", this); // m_debugAc = new QAction(debugIcon, "撤销", this); // m_loadAc = new QAction(loadIcon, "重做", this); //m_openAc = new QAction(openFileIcon, "打开", this); @@ -238,7 +238,8 @@ void MainWindowCurve::initMainToolBar() ui->mainToolBar->addAction(m_joindepthAc); ui->mainToolBar->addAction(m_ModuleOpenAc); -// ui->mainToolBar->addAction(m_runAc); + //ui->mainToolBar->addAction(m_SaveAsPictureAc);//导出长图 + // ui->mainToolBar->addAction(m_debugAc); // ui->mainToolBar->addAction(m_loadAc); //ui->mainToolBar->addAction(m_openAc); @@ -251,10 +252,10 @@ void MainWindowCurve::initMainToolBar() connect(m_joindepthAc, &QAction::triggered, this, &MainWindowCurve::s_ExecuteMerge); connect(m_ModuleOpenAc, &QAction::triggered, this, &MainWindowCurve::s_ModuleOpen); + connect(m_SaveAsPictureAc, &QAction::triggered, this, &MainWindowCurve::s_SaveAsPicture); // connect(m_grepAc, &QAction::triggered, this, &MainWindow::s_Risize); // connect(m_compileAc, &QAction::triggered, this, &MainWindow::s_AddOne); -// connect(m_runAc, &QAction::triggered, this, &MainWindow::s_SaveImage); // connect(m_debugAc, &QAction::triggered, this, &MainWindow::s_DrawImg); // connect(m_loadAc, &QAction::triggered, this, &MainWindow::s_DrawLine); //connect(m_openAc, &QAction::triggered, this, &MainWindowCurve::s_Open); @@ -2320,6 +2321,14 @@ void MainWindowCurve::s_ModuleOpen() m_pParentWin->setModuleOpenOrClose(); } +//导出长图 +void MainWindowCurve::s_SaveAsPicture() +{ + //指标体系图 + QPixmap pPixmap = ui->tableWidget_2->grab(QRect(0, 0, ui->tableWidget_2->width()*2, ui->tableWidget_2->height()*2)); + pPixmap.save("d:\\3.png", "png"); +} + //void MainWindowCurve::s_Open(QString fileFull) //{ diff --git a/logPlus/mainwindowcurve.h b/logPlus/mainwindowcurve.h index af843ff..cc22bed 100644 --- a/logPlus/mainwindowcurve.h +++ b/logPlus/mainwindowcurve.h @@ -243,7 +243,7 @@ public slots: void s_ExecuteDepthShift(); //校深 void s_ExecuteMerge(); //拼接 void s_ModuleOpen(); //处理算法 - //void s_Open(QString fileFull);//打开 + void s_SaveAsPicture(); //导出长图 };