jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

Browse Source
This commit is contained in:
zhaolei 2026-01-16 17:58:31 +08:00
commit 90fe46cd50
6 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
logPlus/DrawTvd.cpp
View File

@ -13,6 +13,10 @@
#include "DrawTvd.h" #include "DrawTvd.h"
#pragma warning( pop ) #pragma warning( pop )
extern int g_iY1;
extern int g_iY2;
//BEGIN_OSGGRAPHICS_NAMESPACE; //BEGIN_OSGGRAPHICS_NAMESPACE;
CDrawTvd::CDrawTvd(void) CDrawTvd::CDrawTvd(void)
@ -65,6 +69,15 @@ CDrawTvd::CDrawTvd(void)
Xmin=9999.; Xmin=9999.;
Ymax=-9999.; Ymax=-9999.;
Ymin=9999.; Ymin=9999.;
//
m_SDep = -g_iY2;
m_EDep = -g_iY1;
rgbList.append(QRgb(4294967295));
rgbList.append(QRgb(4294966617));
rgbList.append(QRgb(4294944512));
rgbList.append(QRgb(4293345792));
rgbList.append(QRgb(4288741473));
rgbList.append(QRgb(4278190080));
QString ConfigName = ::GetConfPath()+"TvdTable.ini"; QString ConfigName = ::GetConfPath()+"TvdTable.ini";
QFile file(ConfigName); QFile file(ConfigName);
@ -72,6 +85,7 @@ CDrawTvd::CDrawTvd(void)
if(file.open(QIODevice::ReadOnly )) if(file.open(QIODevice::ReadOnly ))
{ {
QTextStream textstream( &file ); QTextStream textstream( &file );
textstream.setCodec("UTF-8"); // 设置UTF-8编码
while(!textstream.atEnd()) while(!textstream.atEnd())
{ {
QString line = textstream.readLine(); QString line = textstream.readLine();
@ -637,8 +651,8 @@ void CDrawTvd::DrawTvd(QPainter* pDC,QRectF mrt)
// } // }
// else h=0; // else h=0;
m_Width=mrt.width()/GetPixelPerCm()-3; // m_Width=mrt.width()/GetPixelPerCm();
m_Height=mrt.width()/GetPixelPerCm()-3; // m_Height=mrt.width()/GetPixelPerCm();
sdep=m_SDep; sdep=m_SDep;
edep=m_EDep; edep=m_EDep;
@ -675,7 +689,7 @@ void CDrawTvd::DrawTvd(QPainter* pDC,QRectF mrt)
TitleFontWidth=TitleFontHeight=fm4.height()/2.0; TitleFontWidth=TitleFontHeight=fm4.height()/2.0;
XCenter=mrt.left()+m_Left*100.+(mrt.width()-(m_Left+m_Right)*100.)/2.; XCenter=mrt.left()+m_Left*100.+(mrt.width()-(m_Left+m_Right)*100.)/2.;
if(1) { if(0) {
//if(m_pWellSceneManager->GetIsColorPrint()) { //if(m_pWellSceneManager->GetIsColorPrint()) {
m_GuiJiPen=QPen(m_GuijiColor,m_GuijiWidth*(int)(fbl/2.+0.5)); m_GuiJiPen=QPen(m_GuijiColor,m_GuijiWidth*(int)(fbl/2.+0.5));
m_FramePen=QPen(m_FrameColor,m_FrameWidth*(int)(fbl/2.+0.5));; m_FramePen=QPen(m_FrameColor,m_FrameWidth*(int)(fbl/2.+0.5));;

4
logPlus/DrawTvd.h
View File

@ -17,7 +17,9 @@
//BEGIN_OSGGRAPHICS_NAMESPACE; //BEGIN_OSGGRAPHICS_NAMESPACE;
#define GetClassID_ObjDrawTvd() "{98EB165F-1371-4D9F-9476-E4F5C19869B7}" #pragma execution_character_set("utf-8")
//#define GetClassID_ObjDrawTvd() "{98EB165F-1371-4D9F-9476-E4F5C19869B7}"
typedef struct BxPointMessage typedef struct BxPointMessage
{ {
int Style; int Style;

1
logPlus/ViewInfo.h
View File

@ -11,6 +11,7 @@
#include <QColor> #include <QColor>
#include <QFont> #include <QFont>
#pragma execution_character_set("utf-8")
class CViewInfo : public QObject class CViewInfo : public QObject
{ {
Q_OBJECT Q_OBJECT

2
logPlus/formdraw.cpp
View File

@ -1310,7 +1310,7 @@ void FormDraw::s_addSantuyibiao(QString strUuid, QString strSlfName, QString str
{ {
dHight = 32767; dHight = 32767;
} }
curv->setGeometry(0, 0, g_iOneWidth, (int)dHight); curv->setGeometry(0, 0, g_iOneWidth*4, (int)dHight);
curv->show(); curv->show();
//斜井三图一表 //斜井三图一表

26
logPlus/formline.cpp
View File

@ -18,15 +18,15 @@ FormLine::FormLine(QWidget *parent, QString strSlfName, QString strWellName, QSt
void FormLine::DrawTvd() void FormLine::DrawTvd()
{ {
// // //
QPainter painter(this); // QPainter painter(this);
QRect rect = this->rect(); // QRect rect = this->rect();
//背景透明 // //背景透明
painter.fillRect(rect.left(), rect.top(), rect.width(), rect.height(), QColor(0, 0, 0, 0)); //QColor(67, 67, 67, 100) // painter.fillRect(rect.left(), rect.top(), rect.width(), rect.height(), QColor(0, 0, 0, 0)); //QColor(67, 67, 67, 100)
CDrawTvd *drawTvd = new CDrawTvd(); // CDrawTvd *drawTvd = new CDrawTvd();
drawTvd->sFilePath = m_strSlfName; // drawTvd->sFilePath = m_strSlfName;
drawTvd->DrawTvd(&painter, rect); // drawTvd->DrawTvd(&painter, rect);
} }
FormLine::~FormLine() FormLine::~FormLine()
@ -36,6 +36,16 @@ FormLine::~FormLine()
void FormLine::paintEvent(QPaintEvent*) void FormLine::paintEvent(QPaintEvent*)
{ {
//
QPainter painter(this);
QRect rect = this->rect();
//背景透明
painter.fillRect(rect.left(), rect.top(), rect.width(), rect.height(), QColor(0, 0, 0, 0)); //QColor(67, 67, 67, 100)
CDrawTvd *drawTvd = new CDrawTvd();
drawTvd->sFilePath = m_strSlfName;
drawTvd->DrawTvd(&painter, rect);
// QPainter painter(this); // QPainter painter(this);
// QRect rect = this->rect(); // QRect rect = this->rect();
// //背景透明 // //背景透明

2
logPlus/mainwindowcurve.cpp
View File

@ -1437,7 +1437,7 @@ void MainWindowCurve::NewWellAndTrack(QString strWellName, QString strSlfName, Q
if(strType=="SantuyibiaoObject") if(strType=="SantuyibiaoObject")
{ {
//斜井三图一表 //斜井三图一表
nW = g_iOneWidth*2; nW = g_iOneWidth*4;
} }
// //