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 
# Conflicts:
#	logPlus/formdraw.cpp
This commit is contained in:
DESKTOP-450PEFP\mainc 2026-05-12 11:14:20 +08:00
commit 4eeb6fdcf6
27 changed files with 214 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BaseFun/include/BaseFun.h
View File

@ -9,6 +9,7 @@
#include "BaseFunExport.h"
#include "CStringType.h"
//#include "ObjectArchive.h"
#include "CallGlobalManage.h"
#ifndef NULL
#define NULL 0
#endif
@ -32,6 +33,7 @@ enum enumFilterType
fltUDef,
fltNone,
};
BASEFUN_EXPORT float Filt(float* b, float* Fil);
BASEFUN_EXPORT void FilterCurve(
@ -124,6 +126,7 @@ BASEFUN_EXPORT int cubspl (float x[],float y[],int nx,float c[]);
BASEFUN_EXPORT int spline(float x[],float y[], int n,float yp1, float ypn,float y2[]);
BASEFUN_EXPORT int intpol (float *x,float *y,int n,int m,float *u,float *v,int mode);
BASEFUN_EXPORT QStatusBar* GetStatusBar();
BASEFUN_EXPORT void AppendConsole(Priority priority,const QString output);
class DOUBLEPROPERTY
{
public:

25
BaseFun/include/CallGlobalManage.h
View File

@ -10,6 +10,24 @@
#include <QWheelEvent>
#include "BaseFunExport.h"
enum Priority
{
PAI_FATAL = 1 << 4,
PAI_ERROR = 1 << 3,
PAI_WARN = 1 << 2,
PAI_INFO = 1 << 1,
PAI_DEBUG = 1 << 0,
PAI_BASE = 1,
PAI_FATAL_UP = PAI_FATAL,
PAI_ERROR_UP = PAI_ERROR | PAI_FATAL_UP,
PAI_WARN_UP = PAI_WARN | PAI_ERROR_UP,
PAI_INFO_UP = PAI_INFO | PAI_WARN_UP,
PAI_DEBUG_UP = PAI_DEBUG | PAI_INFO_UP,
PAI_ALL = PAI_DEBUG_UP,
PAI_DEFAULT = PAI_INFO_UP,
};
class BASEFUN_EXPORT CallGlobalManage : public QObject
{
Q_OBJECT
@ -21,9 +39,10 @@ public:
static CallGlobalManage* getInstance();
signals:
// 添加对象通知strName：发送模块名字（如DataMgr） strSlfName：Slf文件名 mapObject：对象类型（如curveObject）和对象名列表（如AC、BS）
void sig_Notice_AddObject(QString strName, QString strSlfName, QMap<QString,QList<QString>> mapObject);
// 显示日志信息
void sig_AppendConsole(Priority priority ,const QString output);
// 添加对象通知strName：发送模块名字（如DataMgr） strSlfName：Slf文件名,对象名列表（如AC、BS）
void sig_Notice_AddObject(QString strName, QString strSlfName, QStringList listObject);
public:
Q_DISABLE_COPY(CallGlobalManage);

6
BaseFun/src/BaseFun.cpp
View File

@ -114,7 +114,7 @@ void CalTextWrap( QString &SrcText,double width,QFont font,QString &OutText,doub
#include <cmath>
#include <stdexcept>
#include <cctype>
#include "CallGlobalManage.h"
using namespace std;
/*
class FormulaParser {
@ -3163,3 +3163,7 @@ QStatusBar* GetStatusBar()
return static_cast<QStatusBar*>(pStatusBar);
}
void AppendConsole(Priority priority,const QString output)
{
emit CallGlobalManage::getInstance()->sig_AppendConsole(priority, output);
}

2
DataMgr/src/AddCompCurveDlg.h
View File

@ -2,7 +2,7 @@
#pragma warning(push,0)
#include <cassert>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_AddCompCurve.h"
#include "memrdwt.h"
#include "OSGFramework.h"

44
DataMgr/src/ConsoleOutputWidget.cpp
View File

@ -1,44 +0,0 @@
#include "ConsoleOutputWidget.h"
#include <QScrollBar>
#include <QDateTime>
//#include "geometryutils.h"
void AppendConsole(Priority priority, const QString &output);
ConsoleOutputWidget::ConsoleOutputWidget(const QString &title, QWidget *parent , Qt::WindowFlags flags )
:QDockWidget(title,parent,flags)
{
Console=new QTextEdit(this);
this->setWidget(Console);
Console->document()->setMaximumBlockCount(5000);
//Console->setEnabled(false);
}
ConsoleOutputWidget::~ConsoleOutputWidget()
{
QVector<QTextEdit*> aa;
aa.append(Console);
qDeleteAll(aa);
}
ConsoleOutputWidget* ConsoleOutService()
{
static ConsoleOutputWidget* singleInstance= new ConsoleOutputWidget("", nullptr, 0);
return singleInstance;
}
void ConsoleOutputWidget::AppendConsole(QColor c, const QString &output)
{
Console->setTextColor(c);
Console->verticalScrollBar()->setValue(Console->verticalScrollBar()->maximum());
Console->insertPlainText("["+QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")+"]"+output);
Console->insertPlainText("\n");
}
void AppendConsole(Priority priority,const QString &output)
{
ConsoleOutputWidget *Console= ConsoleOutService();
if(priority==PAI_ERROR) Console->AppendConsole(Qt::red,output);
else if(priority==PAI_WARN) Console->AppendConsole(Qt::darkYellow, output);
else if(priority==PAI_INFO) Console->AppendConsole(Qt::blue, output);
}

56
DataMgr/src/ConsoleOutputWidget.h
View File

@ -1,56 +0,0 @@
/**
* @file ConsoleOutputWidget.h
* @brief 统一输出服务，采用了singleton模式
* @date 2015-1-18
* @author: aiya
*/
#pragma once
#include <QDockWidget>
#include <QTextEdit>
enum Priority
{
PAI_FATAL = 1 << 4,
PAI_ERROR = 1 << 3,
PAI_WARN = 1 << 2,
PAI_INFO = 1 << 1,
PAI_DEBUG = 1 << 0,
PAI_BASE = 1,
PAI_FATAL_UP = PAI_FATAL,
PAI_ERROR_UP = PAI_ERROR | PAI_FATAL_UP,
PAI_WARN_UP = PAI_WARN | PAI_ERROR_UP,
PAI_INFO_UP = PAI_INFO | PAI_WARN_UP,
PAI_DEBUG_UP = PAI_DEBUG | PAI_INFO_UP,
PAI_ALL = PAI_DEBUG_UP,
PAI_DEFAULT = PAI_INFO_UP,
};
/**
* @class ConsoleOutputWidget
* @brief 统一输出服务，在界面输出的同时，调用了底层的日志写出程序
* @useage
AppendConsole(PAI_ERROR,"测试输出");
AppendConsole(PAI_INFO,"测试输出");
* @date 2015-1-18
* @author: aiya
*/
class ConsoleOutputWidget:public QDockWidget
{
Q_OBJECT
public:
ConsoleOutputWidget(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0);
~ConsoleOutputWidget();
/**
* @function AppendConsole
* @brief 输出日志
* @param priority 日志输出级别
* @param output 要输出的日志内容
*/
void AppendConsole(QColor c,const QString &output);
private:
QTextEdit * Console;
};
extern ConsoleOutputWidget* ConsoleOutService();

2
DataMgr/src/CopyObjectDlg.h
View File

@ -4,7 +4,7 @@
#pragma warning(push,0)
#include <cassert>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_CopyObject.h"
#include "memrdwt.h"
#include "OSGFramework.h"

2
DataMgr/src/CurveComputerDlg.h
View File

@ -2,7 +2,7 @@
#pragma warning(push,0)
#include <cassert>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_CurveComputer.h"
#include "OSGFramework.h"
#pragma warning(pop)

79
DataMgr/src/CurvePropertyEdit.cpp
View File

@ -10,6 +10,7 @@
#include "LogIO.h"
// #include "ObjProject.h"
#include "Well.h"
#include "geometryutils.h"
#pragma warning(pop)
using namespace pai::ios::welllog;
BEGIN_OSGGRAPHICS_NAMESPACE
@ -77,7 +78,7 @@ void CCurvePropertyEditDlg::init()
m_pUI->PropertyTab->setTabEnabled(1,0);
m_pUI->PropertyTab->setStyleSheet("QTabBar::tab:disabled {width: 0; color: transparent;}");
Slf_CURVE info;
int index=logio.OpenCurve(CurveName.toStdString().c_str());
int index=logio.OpenCurve(UTF8ToGBK(CurveName));
if(index<0) return;
logio.GetCurveInfo(index,&info);
logio.CloseCurve(index);
@ -94,18 +95,18 @@ void CCurvePropertyEditDlg::init()
QLineEdit *lineEdit_Min=tab1->findChild<QLineEdit*>("lineEdit_Min");
QLineEdit *lineEdit_Max=tab1->findChild<QLineEdit*>("lineEdit_Max");
QLineEdit *lineEdit_DefVal=tab1->findChild<QLineEdit*>("lineEdit_DefVal");
lineEdit_CurveName->setText((QLatin1String(info.Name)));
lineEdit_CurveName->setText((GBKToUTF8(info.Name)));
QRegExp regExp("[A-Z0-9]{0,100}");//正则表达式，第一位数字为a-z的数字，第二位为1-9的数字，后边是0-2位0-9的数字
lineEdit_CurveName->setValidator(new QRegExpValidator(regExp,this));
lineEdit_CurveName_2->setText(QString::fromLocal8Bit(info.AliasName));
lineEdit_CurveName_2->setText(GBKToUTF8(info.AliasName));
lineEdit_CurveName_2->setValidator(new QRegExpValidator(regExp,this));
lineEdit_CurveUnit->setText(QLatin1String(info.Unit));
lineEdit_CurveUnit->setText(GBKToUTF8(info.Unit));
lineEdit_CurveUnit->setValidator(new QRegExpValidator(regExp,this));
lineEdit_CurveUnit_2->setText(QString::fromLocal8Bit(info.AliasUnit));//(QLatin1String(info.AliasUnit));
lineEdit_CurveUnit_2->setText(GBKToUTF8(info.AliasUnit));//(QLatin1String(info.AliasUnit));
lineEdit_CurveUnit_2->setValidator(new QRegExpValidator(regExp,this));
lineEdit_DepthUnit->setText(QLatin1String(info.DepthUnit));
lineEdit_DepthUnit->setText(GBKToUTF8(info.DepthUnit));
lineEdit_DepthUnit->setValidator(new QRegExpValidator(regExp,this));
lineEdit_DepthUnit_2->setText(QString::fromLocal8Bit(info.DepthHZUnit));
lineEdit_DepthUnit_2->setText(GBKToUTF8(info.DepthHZUnit));
lineEdit_DepthUnit_2->setValidator(new QRegExpValidator(regExp,this));
lineEdit_Sdep->setText(QString("%1").arg(info.StartDepth));
lineEdit_Sdep->setValidator(new QDoubleValidator(-9999999,9999999,6,this));
@ -114,7 +115,7 @@ void CCurvePropertyEditDlg::init()
lineEdit_Rlev->setText(QString("%1").arg(info.DepLevel));
lineEdit_Rlev->setValidator(new QDoubleValidator(-9999999,9999999,6,this));
regExp=QRegExp(str);
lineEdit_DataType->setText(QLatin1String(Rep_STR[info.RepCode-1]));
lineEdit_DataType->setText(GBKToUTF8(Rep_STR[info.RepCode-1]));
lineEdit_Sdep->setValidator(new QRegExpValidator(regExp,this));
lineEdit_Min->setText(QString("%1").arg(info.MinValue));
lineEdit_Min->setValidator(new QDoubleValidator(-9999999,9999999,6,this));
@ -125,7 +126,7 @@ void CCurvePropertyEditDlg::init()
}
else
{
int index=logio.OpenWave(CurveName.toStdString().c_str());
int index=logio.OpenWave(UTF8ToGBK(CurveName));
if(index<0) return;
Slf_WAVE info;
logio.GetWaveInfo(index,&info);
@ -144,17 +145,17 @@ void CCurvePropertyEditDlg::init()
QLineEdit *lineEdit_Min=tab1->findChild<QLineEdit*>("lineEdit_Min");
QLineEdit *lineEdit_Max=tab1->findChild<QLineEdit*>("lineEdit_Max");
QLineEdit *lineEdit_DefVal=tab1->findChild<QLineEdit*>("lineEdit_DefVal");
lineEdit_CurveName->setText((QLatin1String(info.Name)));
lineEdit_CurveName->setText((GBKToUTF8(info.Name)));
lineEdit_CurveName->setValidator(new QRegExpValidator(regExp,this));
lineEdit_CurveName_2->setText(QString::fromLocal8Bit(info.AliasName));
lineEdit_CurveName_2->setText(GBKToUTF8(info.AliasName));
lineEdit_CurveName_2->setValidator(new QRegExpValidator(regExp,this));
lineEdit_CurveUnit->setText(QLatin1String(info.Unit));
lineEdit_CurveUnit->setText(GBKToUTF8(info.Unit));
lineEdit_CurveUnit->setValidator(new QRegExpValidator(regExp,this));
lineEdit_CurveUnit_2->setText(QString::fromLocal8Bit(info.AliasUnit));
lineEdit_CurveUnit_2->setText(GBKToUTF8(info.AliasUnit));
lineEdit_CurveUnit_2->setValidator(new QRegExpValidator(regExp,this));
lineEdit_DepthUnit->setText(QLatin1String(info.DepthUnit));
lineEdit_DepthUnit->setText(GBKToUTF8(info.DepthUnit));
lineEdit_DepthUnit->setValidator(new QRegExpValidator(regExp,this));
lineEdit_DepthUnit_2->setText(QString::fromLocal8Bit(info.DepthHZUnit));
lineEdit_DepthUnit_2->setText(GBKToUTF8(info.DepthHZUnit));
lineEdit_DepthUnit_2->setValidator(new QRegExpValidator(regExp,this));
lineEdit_Sdep->setText(QString("%1").arg(info.StartDepth));
lineEdit_Sdep->setValidator(new QDoubleValidator(-9999999,9999999,6,this));
@ -163,7 +164,7 @@ void CCurvePropertyEditDlg::init()
lineEdit_Rlev->setText(QString("%1").arg(info.DepLevel));
lineEdit_Rlev->setValidator(new QDoubleValidator(-9999999,9999999,6,this));
regExp=QRegExp(str);
lineEdit_DataType->setText(QLatin1String(Rep_STR[info.RepCode-1]));
lineEdit_DataType->setText(GBKToUTF8(Rep_STR[info.RepCode-1]));
lineEdit_Min->setText(QString("%1").arg(info.MinValue));
lineEdit_Min->setValidator(new QDoubleValidator(-9999999,9999999,6,this));
lineEdit_Max->setText(QString("%1").arg(info.MaxValue));
@ -188,13 +189,13 @@ void CCurvePropertyEditDlg::init()
QObject::connect(lineEdit2_ArrayNum, SIGNAL(textChanged(const QString &)), this, SLOT(sampleChanged(const QString &)));
QObject::connect(lineEdit2_Sample, SIGNAL(textChanged(const QString &)), this, SLOT(arrayChanged(const QString &)));
QRegExp regExp("[A-Za-z0-9]{0,100}");//正则表达式，第一位数字为a-z的数字，第二位为1-9的数字，后边是0-2位0-9的数字
lineEdit2_Name->setText(QLatin1String(info.TimeName));
lineEdit2_Name->setText(GBKToUTF8(info.TimeName));
lineEdit2_Name->setValidator(new QRegExpValidator(regExp,this));
lineEdit2_Name1->setText(QString::fromLocal8Bit(info.TimeHZName));
lineEdit2_Name1->setText(GBKToUTF8(info.TimeHZName));
lineEdit2_Name1->setValidator(new QRegExpValidator(regExp,this));
lineEdit2_Unit->setText(QLatin1String(info.TimeUnit));
lineEdit2_Unit->setText(GBKToUTF8(info.TimeUnit));
lineEdit2_Unit->setValidator(new QRegExpValidator(regExp,this));
lineEdit2_Unit1->setText(QString::fromLocal8Bit(info.TimeHZUnit));
lineEdit2_Unit1->setText(GBKToUTF8(info.TimeHZUnit));
lineEdit2_Unit1->setValidator(new QRegExpValidator(regExp,this));
lineEdit2_Start->setText(QString("%1").arg(info.StartTime));
@ -253,7 +254,7 @@ void CCurvePropertyEditDlg::slotSave()
CLogIO logio(FileName.toStdString().c_str(),(unsigned int)CLogIO::modeReadWrite);
if(Name!=CurveName)
{
if(logio.FindObjectIndex(Name.toStdString().c_str())>=0)
if(logio.FindObjectIndex(UTF8ToGBK(Name))>=0)
{
QMessageBox::warning(this,"警告！","名称不能重复！");
return;
@ -264,7 +265,7 @@ void CCurvePropertyEditDlg::slotSave()
if(Type==0)
{
Slf_CURVE info;
int index=logio.OpenCurve(CurveName.toStdString().c_str());
int index=logio.OpenCurve(UTF8ToGBK(CurveName));
if(index<0) {
return;
}
@ -277,20 +278,20 @@ void CCurvePropertyEditDlg::slotSave()
QLineEdit *lineEdit_DepthUnit_2=tab1->findChild<QLineEdit*>("lineEdit_DepthUnit_2");
QLineEdit *lineEdit_DefVal=tab1->findChild<QLineEdit*>("lineEdit_DefVal");
strcpy(info.Name,lineEdit_CurveName->text().toStdString().c_str());
strcpy(info.AliasName,lineEdit_CurveName_2->text().toStdString().c_str());
strcpy(info.Name,UTF8ToGBK(lineEdit_CurveName->text()));
strcpy(info.AliasName,UTF8ToGBK(lineEdit_CurveName_2->text()));
//汉字写回去不对了呀？？？？？？
strcpy(info.Unit,lineEdit_CurveUnit->text().toStdString().c_str());
strcpy(info.AliasUnit,lineEdit_CurveUnit_2->text().toStdString().c_str());
strcpy(info.DepthUnit,lineEdit_DepthUnit->text().toStdString().c_str());
strcpy(info.DepthHZUnit,lineEdit_DepthUnit_2->text().toStdString().c_str());
strcpy(info.Unit,UTF8ToGBK(lineEdit_CurveUnit->text()));
strcpy(info.AliasUnit,UTF8ToGBK(lineEdit_CurveUnit_2->text()));
strcpy(info.DepthUnit,UTF8ToGBK(lineEdit_DepthUnit->text()));
strcpy(info.DepthHZUnit,UTF8ToGBK(lineEdit_DepthUnit_2->text()));
info.DefVal=lineEdit_DefVal->text().toFloat();
logio.SetCurveInfo(index,&info);
logio.CloseCurve(index);
}
else
{
int index=logio.OpenWave(CurveName.toStdString().c_str());
int index=logio.OpenWave(UTF8ToGBK(CurveName));
if(index<0) return;
Slf_WAVE info;
logio.GetWaveInfo(index,&info);
@ -303,12 +304,12 @@ void CCurvePropertyEditDlg::slotSave()
QLineEdit *lineEdit_DepthUnit_2=tab1->findChild<QLineEdit*>("lineEdit_DepthUnit_2");
QLineEdit *lineEdit_DefVal=tab1->findChild<QLineEdit*>("lineEdit_DefVal");
strcpy(info.Name,lineEdit_CurveName->text().toStdString().c_str());
strcpy(info.AliasName,lineEdit_CurveName_2->text().toStdString().c_str());
strcpy(info.Unit,lineEdit_CurveUnit->text().toStdString().c_str());
strcpy(info.AliasUnit,lineEdit_CurveUnit_2->text().toStdString().c_str());
strcpy(info.DepthUnit,lineEdit_DepthUnit->text().toStdString().c_str());
strcpy(info.DepthHZUnit,lineEdit_DepthUnit_2->text().toStdString().c_str());
strcpy(info.Name,UTF8ToGBK(lineEdit_CurveName->text()));
strcpy(info.AliasName,UTF8ToGBK(lineEdit_CurveName_2->text()));
strcpy(info.Unit,UTF8ToGBK(lineEdit_CurveUnit->text()));
strcpy(info.AliasUnit,UTF8ToGBK(lineEdit_CurveUnit_2->text()));
strcpy(info.DepthUnit,UTF8ToGBK(lineEdit_DepthUnit->text()));
strcpy(info.DepthHZUnit,UTF8ToGBK(lineEdit_DepthUnit_2->text()));
info.DefVal=lineEdit_DefVal->text().toFloat();
QLineEdit *lineEdit2_Name=tab2->findChild<QLineEdit*>("lineEdit2_Name");
@ -322,10 +323,10 @@ void CCurvePropertyEditDlg::slotSave()
QLineEdit *lineEdit2_SampleTotal=tab2->findChild<QLineEdit*>("lineEdit2_SampleTotal");
QComboBox *comboBox2_Type=tab2->findChild<QComboBox*>("comboBox2_Type");
strcpy(info.TimeName,lineEdit2_Name->text().toStdString().c_str());
strcpy(info.TimeHZName,lineEdit2_Name1->text().toStdString().c_str());
strcpy(info.TimeUnit,lineEdit2_Unit->text().toStdString().c_str());
strcpy(info.TimeHZUnit,lineEdit2_Unit1->text().toStdString().c_str());
strcpy(info.TimeName,UTF8ToGBK(lineEdit2_Name->text()));
strcpy(info.TimeHZName,UTF8ToGBK(lineEdit2_Name1->text()));
strcpy(info.TimeUnit,UTF8ToGBK(lineEdit2_Unit->text()));
strcpy(info.TimeHZUnit,UTF8ToGBK(lineEdit2_Unit1->text()));
info.StartTime=lineEdit2_Start->text().toFloat();
info.TimeLevel=lineEdit2_Rlev2->text().toFloat();
info.ArrayNum=lineEdit2_ArrayNum->text().toInt();

2
DataMgr/src/CurvePropertyEdit.h
View File

@ -3,7 +3,7 @@
#include <cassert>
#include <QWidget>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_CurvePropertyEdit.h"
#include "OSGFramework.h"
#pragma warning(pop)

2
DataMgr/src/DataMgr.pro
View File

@ -92,7 +92,6 @@ HEADERS += \
Statistics2Dlg.h \
StatisticsDlg.h \
TiShiDlg.h\
ConsoleOutputWidget.h \
WaveComposeDlg.h \
cdialog.h \
dataslothelper.h \
@ -123,7 +122,6 @@ SOURCES += \
Statistics2Dlg.cpp \
StatisticsDlg.cpp \
TiShiDlg.cpp\
ConsoleOutputWidget.cpp \
WaveComposeDlg.cpp \
cdialog.cpp \
dataslothelper.cpp \

2
DataMgr/src/InDefTableDlg.h
View File

@ -2,7 +2,7 @@
#pragma warning(push,0)
#include <cassert>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_InDefTable.h"
#include "LogIO.h"
// #include "ObjProject.h"

2
DataMgr/src/Statistics2Dlg.h
View File

@ -2,7 +2,7 @@
#pragma warning(push,0)
#include <cassert>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_Statistics2.h"
#include "LogIO.h"
#include "view.h"//ll

2
DataMgr/src/StatisticsDlg.h
View File

@ -2,7 +2,7 @@
#pragma warning(push,0)
#include <cassert>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_Statistics.h"
#include "LogIO.h"
#include "view.h"//ll

2
DataMgr/src/TiShiDlg.h
View File

@ -2,7 +2,7 @@
#pragma warning(push,0)
#include <cassert>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_TiShi.h"
#include "OSGFramework.h"
#pragma warning(pop)

9
DataMgr/src/WaveComposeDlg.cpp
View File

@ -263,11 +263,10 @@ void CWaveComposeDlg::slotSave()
delete []value;
QMessageBox::warning(NULL,tr("提示"),"合成阵列曲线成功！");
QMap<QString,QList<QString>> mapShowObject;
QList<QString> lisObject;
lisObject.append("");
mapShowObject.insert("TDTObject",lisObject);
emit CallGlobalManage::getInstance()->sig_Notice_AddObject("DataMgr",FileName,mapShowObject);
QStringList lisObject;
lisObject.append(NewWaveInfo.Name);
emit CallGlobalManage::getInstance()->sig_Notice_AddObject("DataMgr",FileName,lisObject);
accept();
/*pai::graphics::*/CDataImport::ChangetoSlf(FileName,NULL);

2
DataMgr/src/WaveComposeDlg.h
View File

@ -2,7 +2,7 @@
#pragma warning(push,0)
#include <cassert>
#include <QDialog>
#include "ConsoleOutputWidget.h"
// #include "ConsoleOutputWidget.h"
#include "ui_WaveCompose.h"
#include "MemRdWt.h"
#include "OSGFramework.h"

6
ModuleConsole/src/LogModuleParamers.cpp
View File

@ -742,6 +742,7 @@ void CModuleParamers::onCurrentLineHighLight()
}
void CModuleParamers::slotRunCurrentZone()
{
AppendConsole(PAI_INFO,"开始执行....");
CModuleConsole*pWorkflowConsole=m_pModuleConsole;
if(!pWorkflowConsole) return;
SetWorkflowConsole(pWorkflowConsole);
@ -760,8 +761,10 @@ void CModuleParamers::slotRunCurrentZone()
std::string strName = pModuleInfo->GetName();
double dep1=-99999,dep2=-99999;
char *Zone1=NULL;
AppendConsole(PAI_INFO, QString::fromStdString(pModule->GetMetaData()->GetName())+"开始执行....");
if(!Zone.isEmpty()) Zone1=(char*)Zone.toStdString().c_str();
int i=(int)pWelllogModule->Run(sdep,edep,Zone1);
AppendConsole(PAI_INFO, QString::fromStdString(pModule->GetMetaData()->GetName())+"执行完成");
}
bool CModuleParamers::GetCurrentZone(float &sdep,float &edep)
{
@ -782,6 +785,7 @@ void CModuleParamers::slotRun()
// pWelllogModule = dynamic_cast<PELibraryModule*>(pWorkflowDataModel->m_pModule);
// }
AppendConsole(PAI_INFO,"开始执行....");
QString Zone = "";
pai::workflow::CModuleInformation * pModuleInfo = m_pCurrentModuleInfo;
pai::module::CModule* pModule = pModuleInfo->GetModule();
@ -789,8 +793,10 @@ void CModuleParamers::slotRun()
std::string strName = pModuleInfo->GetName();
double dep1=-99999,dep2=-99999;
char *Zone1=NULL;
AppendConsole(PAI_INFO, QString::fromStdString(pModule->GetMetaData()->GetName())+"开始执行....");
if(!Zone.isEmpty()) Zone1=(char*)Zone.toStdString().c_str();
int i=(int)pWelllogModule->Run(dep1,dep2,Zone1);
AppendConsole(PAI_INFO, QString::fromStdString(pModule->GetMetaData()->GetName())+"执行完成");
}
// void CModuleParamers::slotOpenParameterEditor(pai::workflow::CModuleInformation* pInfo, bool IsModuleReadOnly)
// {

4
ModuleConsole/src/WorkflowPluginControl.cpp
View File

@ -2334,7 +2334,7 @@ void WorkflowPluginControl::SlotRunWelllogModule()
// return;
// }*/
// m_pWellLogWorkflowRunner->GetRunTimeContext()->SetCurrentWellRoundPath(pWorkflowDataModel->GetCurrentWellRoundPath());
// AppendConsole(pai::log::PAI_INFO,"开始执行....");
AppendConsole(PAI_INFO,"开始执行....");
m_pWellLogWorkflowRunner->RunWorkFlow(pWorkflowDataModel);
}
}
@ -2352,7 +2352,7 @@ void WorkflowPluginControl::SlotRunWelllogModule(float sdep,float edep)
// return;
// }*/
m_pWellLogWorkflowRunner->GetRunTimeContext()->SetCurrentWellRoundPath(pWorkflowDataModel->GetCurrentWellRoundPath());
// AppendConsole(pai::log::PAI_INFO,"开始执行....");
AppendConsole(PAI_INFO,"开始执行....");
m_pWellLogWorkflowRunner->RunWorkFlow(pWorkflowDataModel,sdep,edep);
}
}

1
WellLogModule/src/PELibraryModule.cpp
View File

@ -1057,6 +1057,7 @@ UINT PELibraryModule::ProcessDLL1(LPVOID pPram,float sdep,float edep)//只用公
Names.append(name);
}
m_pMemRdWt->Close();
emit CallGlobalManage::getInstance()->sig_Notice_AddObject("WellLogModule",slf,Names);
// for(int i=0;i<Noo;i++)
// {
// GetObjectEvent().OnDeAttchData(slf,Names[i]);

2
logPlus/ConsoleOutputWidget.cpp
View File

@ -35,7 +35,7 @@ void ConsoleOutputWidget::AppendConsole(QColor c, const QString &output)
Console->insertPlainText("\n");
}
void AppendConsole(Priority priority,const QString &output)
void ConsoleOutputWidget::AppendConsole(Priority priority,const QString &output)
{
ConsoleOutputWidget *Console= ConsoleOutService();
if(priority==PAI_ERROR) Console->AppendConsole(Qt::red,output);

35
logPlus/ConsoleOutputWidget.h
View File

@ -7,23 +7,23 @@
#pragma once
#include <QDockWidget>
#include <QTextEdit>
enum Priority
{
PAI_FATAL = 1 << 4,
PAI_ERROR = 1 << 3,
PAI_WARN = 1 << 2,
PAI_INFO = 1 << 1,
PAI_DEBUG = 1 << 0,
PAI_BASE = 1,
PAI_FATAL_UP = PAI_FATAL,
PAI_ERROR_UP = PAI_ERROR | PAI_FATAL_UP,
PAI_WARN_UP = PAI_WARN | PAI_ERROR_UP,
PAI_INFO_UP = PAI_INFO | PAI_WARN_UP,
PAI_DEBUG_UP = PAI_DEBUG | PAI_INFO_UP,
PAI_ALL = PAI_DEBUG_UP,
PAI_DEFAULT = PAI_INFO_UP,
};
#include "BaseFun.h"
// enum Priority
// {
// PAI_FATAL = 1 << 4,
// PAI_ERROR = 1 << 3,
// PAI_WARN = 1 << 2,
// PAI_INFO = 1 << 1,
// PAI_DEBUG = 1 << 0,
// PAI_BASE = 1,
// PAI_FATAL_UP = PAI_FATAL,
// PAI_ERROR_UP = PAI_ERROR | PAI_FATAL_UP,
// PAI_WARN_UP = PAI_WARN | PAI_ERROR_UP,
// PAI_INFO_UP = PAI_INFO | PAI_WARN_UP,
// PAI_DEBUG_UP = PAI_DEBUG | PAI_INFO_UP,
// PAI_ALL = PAI_DEBUG_UP,
// PAI_DEFAULT = PAI_INFO_UP,
// };
/**
* @class ConsoleOutputWidget
@ -47,6 +47,7 @@ public:
* @param output 要输出的日志内容
*/
void AppendConsole(QColor c,const QString &output);
static void AppendConsole(Priority priority,const QString &output);
private:
QTextEdit * Console;

17
logPlus/formdraw.cpp
View File

@ -29,7 +29,7 @@ extern QString g_prjname;
extern int g_iSupport3D;
extern void AppendConsole(Priority priority, const QString &output);
// extern void AppendConsole(Priority priority, const QString &output);
//曲线绘制（多个）
FormDraw::FormDraw(QWidget *parent, QString strSlfName, QString strWellName, QString strTrackName) :
@ -3338,7 +3338,7 @@ void FormDraw::s_AddLine_Property(QString strUuid, QString strSlfName, QString s
AppendConsole(PAI_INFO, "FormDraw s_AddLine_Property end");
}
//#include "CylinderImagePlot.h"
void FormDraw::s_addWave(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strWaveName)
{
//井名&道名不一致
@ -4031,10 +4031,9 @@ void FormDraw::s_addDrawImage(QString strUuid, QString strSlfName, QString strWe
}
//
QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName, "DrawImageObject");
QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName);
//绑定m_formTrack，方便关联formInfo
curv->m_formTrack = m_formTrack;
curv->setScaleX(0, 264);
curv->setDepthY(m_iY1, m_iY2);
if (nW <= 0)
nW = g_iOneWidth;
@ -4046,18 +4045,8 @@ void FormDraw::s_addDrawImage(QString strUuid, QString strSlfName, QString strWe
QString strWaveName = "";
int _nSamples = 0;
curv->initImage(strSlfName, strWaveName);
//curv->initImage3D(strSlfName, strWaveName);
//DrawImageNew_NoFilter(curv, strSlfName, strWaveName, _nSamples);
//curv->m_colorMap->setVisible(false);
//CylindricalImageMap* cylinderMap = new CylindricalImageMap(curv->xAxis, curv->yAxis);
//cylinderMap->setData(curv->m_colorMap->data());
//cylinderMap->setCylinderRadius(2.0);
//cylinderMap->setSourceColorMap(curv->m_colorMap); // 共享梯度
//cylinderMap->setAzimuth(45);
//cylinderMap->setElevation(30);
//
connect(curv, SIGNAL(mouseWheel(QWheelEvent*)), this, SLOT(s_mouseWheel(QWheelEvent*)));

11
logPlus/mainwindow.cpp
View File

@ -26,6 +26,7 @@
#include "wellloginformation.h"
#include "mainwindowsplitter.h"
#include "ConvertorManager.h"
#include "CallGlobalManage.h"
using namespace pai::gui;
//
@ -109,6 +110,10 @@ MainWindow::MainWindow(QWidget *parent) :
//关联信号槽，测井信息表数据查看
connect(CallManage::getInstance(), SIGNAL(sig_WelllogInformation(QString)), this, SLOT(s_WelllogInformation(QString)));
//向左侧树图，刷新新加对象
connect(CallGlobalManage::getInstance(), SIGNAL(sig_AppendConsole(Priority, const QString)), this, SLOT(s_AppendConsole(Priority, const QString)));
ConvertorManager::GetInstance().LoadAllConvertorPlugin();
QTimer::singleShot(100, this, [=]() {
QRect geoRect = m_centerWidgets->geometry();
@ -832,3 +837,9 @@ void MainWindow::s_WelllogInformation(QString strSlfName)
return;
}
}
void MainWindow::s_AppendConsole(Priority priority ,const QString output)//日志
{
// m_consoleOutputWidget->AppendConsole(priority, output);
ConsoleOutputWidget::AppendConsole(priority, output);
}

2
logPlus/mainwindow.h
View File

@ -15,6 +15,7 @@
#include "ConsoleOutputWidget.h"
#include "PropertyWidget.h"
#include "CallManage.h"
#include "CallGlobalManage.h"
#pragma execution_character_set("utf-8")
@ -95,6 +96,7 @@ public slots:
void s_ShowTable(QString strSlfName, QString strName);//表格数据查看
void s_ShowWave(QString strSlfName, QString strName); //波列数据查看
void s_WelllogInformation(QString strSlfName);//编辑测井信息
void s_AppendConsole(Priority priority ,const QString output);//日志
void slot_PluginActionFunc();

93
logPlus/qtprojectwidgets.cpp
View File

@ -29,7 +29,7 @@
#include "CallGlobalManage.h"
extern QString g_prjname;
extern void AppendConsole(Priority priority, const QString &output);
// extern void AppendConsole(Priority priority, const QString &output);
QtProjectWidgets::QtProjectWidgets(QWidget *parent)
: QWidget(parent)
@ -69,7 +69,7 @@ QtProjectWidgets::QtProjectWidgets(QWidget *parent)
connect(CallManage::getInstance(), SIGNAL(sig_AddGujingToTree(QString,QString,QString)), this, SLOT(s_AddGujingToTree(QString,QString,QString)));
//向左侧树图，刷新新加对象
connect(CallGlobalManage::getInstance(), SIGNAL(sig_Notice_AddObject(QString, QString, QMap<QString,QList<QString>>)), this, SLOT(s_Notice_AddObject(QString, QString, QMap<QString,QList<QString>>)));
connect(CallGlobalManage::getInstance(), SIGNAL(sig_Notice_AddObject(QString, QString, QStringList)), this, SLOT(s_Notice_AddObject(QString, QString, QStringList)));
//初始化树形控件中的右键菜单
initMenu();
@ -865,6 +865,11 @@ void QtProjectWidgets::initCurveObjectTreeMenu(QMenu *menu, QTreeWidget *treeWid
connect(action_WaveCompose, SIGNAL(triggered()), this, SLOT(onWaveCompose()));
menu->addAction(action_WaveCompose);
QAction* action_InfoEdit = new QAction("属性编辑", treeWidget);
action_InfoEdit->setIcon(QIcon(GetImagePath() + "icon/AddToTrack.png"));
connect(action_InfoEdit, SIGNAL(triggered()), this, SLOT(onInfoEdit()));
menu->addAction(action_InfoEdit);
QAction* action_Copy = new QAction("复制", treeWidget);
action_Copy->setIcon(QIcon(GetImagePath() + "icon/Copy.png")); // 设置图标":/image/u174.png"
connect(action_Copy, SIGNAL(triggered()), this, SLOT(onCopySelObject()));
@ -894,6 +899,11 @@ void QtProjectWidgets::initWaveObjectTreeMenu(QMenu *menu, QTreeWidget *treeWidg
connect(action_DepthShift, SIGNAL(triggered(bool)), this, SLOT(onDepthShift(bool)));
menu->addAction(action_DepthShift);
QAction* action_InfoEdit = new QAction("属性编辑", treeWidget);
action_InfoEdit->setIcon(QIcon(GetImagePath() + "icon/AddToTrack.png"));
connect(action_InfoEdit, SIGNAL(triggered()), this, SLOT(onInfoEdit()));
menu->addAction(action_InfoEdit);
QAction* action_Copy = new QAction("复制", treeWidget);
action_Copy->setIcon(QIcon(GetImagePath() + "icon/Copy.png")); // 设置图标":/image/u174.png"
connect(action_Copy, SIGNAL(triggered()), this, SLOT(onCopySelObject()));
@ -1296,6 +1306,24 @@ void QtProjectWidgets::onWaveCompose(bool checked)
// pwelllog->SetWell(pObjWellLog->GetWelllogRound()->GetWell());
}
void QtProjectWidgets::onInfoEdit(bool checked)//whp add 2019.12.27 曲线属性编辑
{
if (ui->treeWidget->selectedItems().size()>1)
return;
QTreeWidgetItem *pItem = *(ui->treeWidget->selectedItems().begin());
QString strTreeTag = pItem->data(0, Qt::UserRole).toString();
CString TypeName = pItem->data(0, Qt::UserRole).toString();;
int Type=0;
if(TypeName=="waveObject")Type=1;
QString CurveName=pItem->text(0);
QString FileName=pItem->data(0, Qt::UserRole+1).toString();
if (NULL==magr)
{
return;
}
magr->CurvePropertyEdit(Type,FileName,CurveName);
}
void QtProjectWidgets::ApplyShiftDepth(QString strSlfName, QString strLineName, double DepthOffset)
{
@ -2536,13 +2564,62 @@ void QtProjectWidgets::s_AddGujingToTree(QString strSlfName, QString strWellName
}
}
void QtProjectWidgets::s_Notice_AddObject(QString strName, QString strSlfName, QMap<QString,QList<QString>> mapShowObject)
void QtProjectWidgets::s_Notice_AddObject(QString strName, QString strSlfName, QStringList listObject)
{
foreach(QTreeWidgetItem *pItem, ui->treeWidget->selectedItems())
int topCount = ui->treeWidget->topLevelItemCount(); // 获取顶级节点数量
if(topCount<1)
{
QTreeWidgetItem *parentItem = pItem->parent()->parent(); // 上两层目录是井次
if (parentItem && m_strSlfName == parentItem->data(0, Qt::UserRole+1).toString())
RefreshWellRoundTree(parentItem);
break;
return;
}
QTreeWidgetItem *wellCurItem = NULL;
QTreeWidgetItem *item = ui->treeWidget->topLevelItem(0);
int childCount = item->childCount(); // 获取子节点数量
for (int i = 0; i < childCount; ++i)
{
//井组，数据分析...
QTreeWidgetItem *wellGroupItem = item->child(i);
QString wellGroupname = wellGroupItem->text(0);
if (wellGroupname == "井组")
{
int wellCount = wellGroupItem->childCount(); // 获取井节点数量
for (int j = 0; j < wellCount; ++j)
{
//井组，数据分析...
QTreeWidgetItem *wellItem = wellGroupItem->child(j);
int wellItemCount = wellItem->childCount(); // 获取井次数量
for (int k = 0; k < wellItemCount; ++k)
{
if (strSlfName == wellItem->child(k)->data(0, Qt::UserRole+1).toString())
{
wellCurItem = wellItem->child(k);
break;
}
}
if (wellCurItem)
break;
}
}
}
QStringList listExistObject;
if (wellCurItem)
{
int ObjectTypeCount = wellCurItem->childCount(); // 获取井节点数量
for (int i = 0; i < ObjectTypeCount; ++i)
{
QTreeWidgetItem *wellItem = wellCurItem->child(i);
int ObjectCount = wellItem->childCount();
for (int j = 0; j < ObjectCount; ++j)
{
QString qst = "";
for (int k = 0; k<listObject.count(); k++)
{
qst = wellItem->child(j)->text(0);
if (listObject[k].toUpper() == wellItem->child(j)->text(0))
listExistObject.append(listObject[k]);
}
}
}
if (listExistObject.count()!=listObject.count())
RefreshWellRoundTree(wellCurItem);
}
}

3
logPlus/qtprojectwidgets.h
View File

@ -53,6 +53,7 @@ public slots:
void ApplyShiftDepth(QString strSlfName, QString strLineName, double DepthOffset);
void onDepthShift(bool checked = false); //深度移动
void onWaveCompose(bool checked = false); //合成阵列曲线
void onInfoEdit(bool checked = false); //属性
//TDT
void onShowTDT(bool checked = false); //数据查看
@ -86,7 +87,7 @@ public slots:
void s_AddGujingToTree(QString strSlfName, QString strWellName, QString strLineName);
//向左侧树图，通知有对象添加完成
void s_Notice_AddObject(QString strName, QString strSlfName, QMap<QString,QList<QString>> mapObject);
void s_Notice_AddObject(QString strName, QString strSlfName, QStringList listObject);
public:
//初始化树图控件