diff --git a/DataMgr/src/UnitConvertDlg.cpp b/DataMgr/src/UnitConvertDlg.cpp
index 7d94754..e7d4c81 100644
--- a/DataMgr/src/UnitConvertDlg.cpp
+++ b/DataMgr/src/UnitConvertDlg.cpp
@@ -4,7 +4,7 @@
 #include "UnitConvertDlg.h"
 #include "ui_UnitConvert.h"
 #include "CStringType.h"
-#include "GeometryUtils.h"
+#include "geometryutils.h"
 #include <QTextStream>
 #include "DataImport.h"
 // #include "ObjProject.h"
@@ -126,9 +126,14 @@ void CUnitConvertDlg::slotSave()
 			Slf_WAVE waveInfo;
 			mrw->GetWaveInfo(index , &waveInfo );
 			if (iConvertFlag == CONVERT_CURVE_UNIT)
-			{
+            {
+#ifdef WIN32
 				strcpy_s( waveInfo.Unit , 32 , strUnit.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 ) ;
 				//float **oldValue,**newValue;
 				//whp change 2018.10.15 保证读写一致
@@ -178,8 +183,14 @@ void CUnitConvertDlg::slotSave()
 			}
 			else//Depth unit convert
 			{
-				strcpy_s( waveInfo.DepthUnit , 32 , strUnit.toStdString().c_str() );//reset depth unit
-				strcpy_s( waveInfo.DepthHZUnit , 32 , strUnitAlias.toStdString().c_str() );//reset depth unit
+#ifdef WIN32
+                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 ) ;
 				//whp change 2018.10.15 保证读写一致
 				int iPointNum = ( waveInfo.EndDepth - waveInfo.StartDepth ) / waveInfo.DepLevel + 1.5;//0.5 ;
diff --git a/DataMgr/src/UnitConvertDlg.h b/DataMgr/src/UnitConvertDlg.h
index 1dbf6e3..10ff05f 100644
--- a/DataMgr/src/UnitConvertDlg.h
+++ b/DataMgr/src/UnitConvertDlg.h
@@ -5,8 +5,8 @@
 // #include "ConsoleOutputWidget.h"
 #include "OSGFramework.h"
 #include "ui_UnitConvert.h"
-#include "objwelllogRound.h"
-#include "memrdwt.h"
+#include "ObjWelllogRound.h"
+#include "MemRdWt.h"
 #pragma  warning(pop)
 
 BEGIN_OSGGRAPHICS_NAMESPACE
diff --git a/logPlus/formimage.cpp b/logPlus/formimage.cpp
index dcc9d50..2f63e52 100644
--- a/logPlus/formimage.cpp
+++ b/logPlus/formimage.cpp
@@ -1,5 +1,5 @@
-#include "FormImage.h"
-#include "ui_FormImage.h"
+#include "formimage.h"
+#include "ui_formimage.h"
 #include <QPainter>
 #include "CallManage.h"
 #include "forminfo.h"
@@ -227,7 +227,7 @@ bool FormImage::LoadFromSLF_wave()
 		{
 			val = GetData(i, j, buf);
 			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 (valMin[j] > val)valMin[j] = val;
 		}
diff --git a/logPlus/formwave.cpp b/logPlus/formwave.cpp
index 90303b7..aad5174 100644
--- a/logPlus/formwave.cpp
+++ b/logPlus/formwave.cpp
@@ -1,5 +1,5 @@
-#include "FormWave.h"
-#include "ui_FormWave.h"
+#include "formwave.h"
+#include "ui_formwave.h"
 #include <QPainter>
 #include "CallManage.h"
 #include "forminfo.h"
@@ -256,7 +256,7 @@ bool FormWave::LoadFromSLF_wave()
 		{
 			val = GetData(i, j, buf);
 			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 (valMin[j] > val)valMin[j] = val;
 		}
@@ -678,7 +678,7 @@ void FormWave::DrawWave(QPainter* pdc, QRectF mrt1)
 		if (fabs(DifBase) <= 1e-6) DifBase = 1;
 		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;
 	float detp = sdepc;