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

新波列实现，适配linux

Browse Source 
DataMgr，新功能适配linux
This commit is contained in:
jinyuan 2026-05-27 11:04:24 +08:00
parent 660ae14c57
commit a9a432a6d2
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
DataMgr/src/UnitConvertDlg.cpp
View File

@ -4,7 +4,7 @@
#include "UnitConvertDlg.h" #include "UnitConvertDlg.h"
#include "ui_UnitConvert.h" #include "ui_UnitConvert.h"
#include "CStringType.h" #include "CStringType.h"
#include "GeometryUtils.h" #include "geometryutils.h"
#include <QTextStream> #include <QTextStream>
#include "DataImport.h" #include "DataImport.h"
// #include "ObjProject.h" // #include "ObjProject.h"
@ -126,9 +126,14 @@ void CUnitConvertDlg::slotSave()
Slf_WAVE waveInfo; Slf_WAVE waveInfo;
mrw->GetWaveInfo(index , &waveInfo ); mrw->GetWaveInfo(index , &waveInfo );
if (iConvertFlag == CONVERT_CURVE_UNIT) if (iConvertFlag == CONVERT_CURVE_UNIT)
{ {
#ifdef WIN32
strcpy_s( waveInfo.Unit , 32 , strUnit.toStdString().c_str() ); strcpy_s( waveInfo.Unit , 32 , strUnit.toStdString().c_str() );
strcpy_s( waveInfo.AliasUnit , 32 , strUnitAlias.toStdString().c_str() ); strcpy_s( waveInfo.AliasUnit , 32 , strUnitAlias.toStdString().c_str() );
#else
strncpy(waveInfo.Unit, strUnit.toStdString().c_str(), 32);
strncpy( waveInfo.AliasUnit , strUnitAlias.toStdString().c_str(), 32);
#endif
mrw->SetWaveInfo( index ,&waveInfo ) ; mrw->SetWaveInfo( index ,&waveInfo ) ;
//float **oldValue,**newValue; //float **oldValue,**newValue;
//whp change 2018.10.15 保证读写一致 //whp change 2018.10.15 保证读写一致
@ -178,8 +183,14 @@ void CUnitConvertDlg::slotSave()
} }
else//Depth unit convert else//Depth unit convert
{ {
strcpy_s( waveInfo.DepthUnit , 32 , strUnit.toStdString().c_str() );//reset depth unit #ifdef WIN32
strcpy_s( waveInfo.DepthHZUnit , 32 , strUnitAlias.toStdString().c_str() );//reset depth unit strcpy_s( waveInfo.DepthUnit , 32 , strUnit.toStdString().c_str() );//reset depth unit
strcpy_s( waveInfo.DepthHZUnit , 32 , strUnitAlias.toStdString().c_str() );//reset depth unit
#else
strncpy(waveInfo.DepthUnit, strUnit.toStdString().c_str(), 32);
strncpy( waveInfo.DepthHZUnit , strUnitAlias.toStdString().c_str(), 32);
#endif
mrw->SetWaveInfo( index ,&waveInfo ) ; mrw->SetWaveInfo( index ,&waveInfo ) ;
//whp change 2018.10.15 保证读写一致 //whp change 2018.10.15 保证读写一致
int iPointNum = ( waveInfo.EndDepth - waveInfo.StartDepth ) / waveInfo.DepLevel + 1.5;//0.5 ; int iPointNum = ( waveInfo.EndDepth - waveInfo.StartDepth ) / waveInfo.DepLevel + 1.5;//0.5 ;

4
DataMgr/src/UnitConvertDlg.h
View File

@ -5,8 +5,8 @@
// #include "ConsoleOutputWidget.h" // #include "ConsoleOutputWidget.h"
#include "OSGFramework.h" #include "OSGFramework.h"
#include "ui_UnitConvert.h" #include "ui_UnitConvert.h"
#include "objwelllogRound.h" #include "ObjWelllogRound.h"
#include "memrdwt.h" #include "MemRdWt.h"
#pragma warning(pop) #pragma warning(pop)
BEGIN_OSGGRAPHICS_NAMESPACE BEGIN_OSGGRAPHICS_NAMESPACE

6
logPlus/formimage.cpp
View File

@ -1,5 +1,5 @@
#include "FormImage.h" #include "formimage.h"
#include "ui_FormImage.h" #include "ui_formimage.h"
#include <QPainter> #include <QPainter>
#include "CallManage.h" #include "CallManage.h"
#include "forminfo.h" #include "forminfo.h"
@ -227,7 +227,7 @@ bool FormImage::LoadFromSLF_wave()
{ {
val = GetData(i, j, buf); val = GetData(i, j, buf);
if (val == 0 || val == -9999 || val == -999.25 || val == -99999 || val == -32767 || val == 32767) continue; if (val == 0 || val == -9999 || val == -999.25 || val == -99999 || val == -32767 || val == 32767) continue;
if (_isnan(val) || !_finite(val)) continue; if (qIsNaN(val) || !qIsFinite(val)) continue;
if (valMax[j] < val)valMax[j] = val; if (valMax[j] < val)valMax[j] = val;
if (valMin[j] > val)valMin[j] = val; if (valMin[j] > val)valMin[j] = val;
} }

8
logPlus/formwave.cpp
View File

@ -1,5 +1,5 @@
#include "FormWave.h" #include "formwave.h"
#include "ui_FormWave.h" #include "ui_formwave.h"
#include <QPainter> #include <QPainter>
#include "CallManage.h" #include "CallManage.h"
#include "forminfo.h" #include "forminfo.h"
@ -256,7 +256,7 @@ bool FormWave::LoadFromSLF_wave()
{ {
val = GetData(i, j, buf); val = GetData(i, j, buf);
if (val == 0 || val == -9999 || val == -999.25 || val == -99999 || val == -32767 || val == 32767) continue; if (val == 0 || val == -9999 || val == -999.25 || val == -99999 || val == -32767 || val == 32767) continue;
if (_isnan(val) || !_finite(val)) continue; if (qIsNaN(val) || !qIsFinite(val)) continue;
if (valMax[j] < val)valMax[j] = val; if (valMax[j] < val)valMax[j] = val;
if (valMin[j] > val)valMin[j] = val; if (valMin[j] > val)valMin[j] = val;
} }
@ -678,7 +678,7 @@ void FormWave::DrawWave(QPainter* pdc, QRectF mrt1)
if (fabs(DifBase) <= 1e-6) DifBase = 1; if (fabs(DifBase) <= 1e-6) DifBase = 1;
yscale = yscale / DifBase; yscale = yscale / DifBase;
} }
if (_isnan(m_MaxRange) || !_finite(m_MaxRange)) yscale = 1; if (qIsNaN(m_MaxRange) || !qIsFinite(m_MaxRange)) yscale = 1;
int mOffset = m_MoveDep / m_Rlev; int mOffset = m_MoveDep / m_Rlev;
float detp = sdepc; float detp = sdepc;