From c01e6ecfe22b950a29a119e709bc71842cdb77b6 Mon Sep 17 00:00:00 2001 From: zhaolei <353719554@qq.com> Date: Thu, 16 Apr 2026 09:57:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=9B=E5=BA=A6=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BaseFun/src/BaseFun.cpp | 7 +++++++ BaseFun/src/BaseFun.pro | 2 ++ common/geometryutils.cpp | 10 +++++----- common/geometryutils.h | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/BaseFun/src/BaseFun.cpp b/BaseFun/src/BaseFun.cpp index 4334f83..0c25e7f 100644 --- a/BaseFun/src/BaseFun.cpp +++ b/BaseFun/src/BaseFun.cpp @@ -3,6 +3,7 @@ #include "BaseFun.h" #include "math.h" #include +#include //#include "ObjectArchive.h" #include #include @@ -3156,3 +3157,9 @@ void qsort_int(char**datx,int left,int right,int idx,int len,int pos) if(i(pStatusBar); +} + diff --git a/BaseFun/src/BaseFun.pro b/BaseFun/src/BaseFun.pro index e4e995c..ca65a04 100644 --- a/BaseFun/src/BaseFun.pro +++ b/BaseFun/src/BaseFun.pro @@ -45,6 +45,7 @@ CONFIG(debug, debug|release){ } HEADERS += \ + ../../common/geometryutils.h \ ../include/BaseColor.h \ ../include/BaseFun.h \ ../include/BaseFunExport.h \ @@ -56,6 +57,7 @@ HEADERS += \ ../include/wvst.h SOURCES += \ + ../../common/geometryutils.cpp \ BaseColor.cpp \ BaseFun.cpp \ CStringType.cpp \ diff --git a/common/geometryutils.cpp b/common/geometryutils.cpp index 8ab20fd..75339f2 100644 --- a/common/geometryutils.cpp +++ b/common/geometryutils.cpp @@ -530,11 +530,11 @@ bool IsInvalidString(QString filename) } return isInvalid; } -QStatusBar* GetStatusBar() -{ - static QStatusBar * pStatusBar = new QStatusBar; - return static_cast(pStatusBar); -} +// QStatusBar* GetStatusBar() +// { +// static QStatusBar * pStatusBar = new QStatusBar; +// return static_cast(pStatusBar); +// } QString GetOutDataPath() { QString strProjectDir = QCoreApplication::applicationDirPath()+ QDir::separator() + "../Outdata"; diff --git a/common/geometryutils.h b/common/geometryutils.h index ca69ae9..3b1f6d6 100644 --- a/common/geometryutils.h +++ b/common/geometryutils.h @@ -198,7 +198,7 @@ QString GetDate(time_t mDate); QString GetConfPath(); bool RenameWellName(QString filename, QString strNewName); void ComboxFromConfigFile( QComboBox *aCombox ,QString configCategory); -QStatusBar * GetStatusBar(); +// QStatusBar * GetStatusBar(); QString GetDataPath(); QString DoubleToString(double dValue, int nDecimal,int *pReallyDecimal);