chore
把非utf8-bom编码的cpp/h文件改为 utf8 bom 编码, msvc识别utf8编码时,如果不是bom格式的,会使用当前cp_oem来解码.
This commit is contained in:
1 parent
2b0c2055ff
commit
164968b62e
6171 files changed
+191244
-191243
No files matched your search
@@ -1,4 +1,4 @@
|
||||
#include "stdafx.h"
|
||||
#include "stdafx.h"
|
||||
#include "PipeSettingChild3Dlg.h"
|
||||
#include <PipeTools.h>
|
||||
//#include <cbclass.h>
|
||||
@@ -297,7 +297,7 @@ BOOL CPipeSettingChild3Dlg::OnInitDialog()
|
||||
void CPipeSettingChild3Dlg::DrawStatic()
|
||||
{
|
||||
int Color[24];
|
||||
//绘制图片框
|
||||
//绘制图片框
|
||||
UINT id[] = {
|
||||
IDC_STATIC_COLOR_FEED2,
|
||||
IDC_STATIC_COLOR_FEED3,
|
||||
@@ -874,7 +874,7 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
g_csTwtLineType[27] = m_csLineTypeUsed2;
|
||||
g_csTwtLineType[28] = m_csLineTypeUsed3;
|
||||
|
||||
/* cet 2011.12.1 modify 将图层线型写入文件
|
||||
/* cet 2011.12.1 modify 将图层线型写入文件
|
||||
regProp.SetValue(_T("PipeLineType18"), g_csTwtLineType[17]);
|
||||
regProp.SetValue(_T("PipeLineType19"), g_csTwtLineType[18]);
|
||||
regProp.SetValue(_T("PipeLineType20"), g_csTwtLineType[19]);
|
||||
@@ -940,7 +940,7 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
if(m_csLineTypeUsed3 != GetLayerLineType(LAY_PIPE_USED3) && GetLayerLineType(LAY_PIPE_USED3) != _T(""))
|
||||
SetLayerLineType(LAY_PIPE_USED3, m_csLineTypeUsed3);
|
||||
|
||||
if(m_bModify){//对本图强制进行修改以下属性: 颜色, 线宽, 线形, 管材, 立管半径
|
||||
if(m_bModify){//对本图强制进行修改以下属性: 颜色, 线宽, 线形, 管材, 立管半径
|
||||
PickSet ssAll(SS_FREE);
|
||||
RBList rbMask(RTDXF0, _T("ATS_PIPE"), NULL);
|
||||
ssAll.Get(_T("X"), NULL, NULL, rbMask);
|
||||
@@ -953,8 +953,8 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
OPENOBJ_BEGIN(ent, AcDb::kForWrite, TDbPipe, pPipe);
|
||||
if(pPipe){
|
||||
if(pPipe->GetSysType() == TPipeSys::kFeedWater
|
||||
|| pPipe->GetSysType() == TPipeSys::kFeedWater2 // cet 2011.12.6 add 给水中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kFeedWater3 // cet 2011.12.6 add 给水高区
|
||||
|| pPipe->GetSysType() == TPipeSys::kFeedWater2 // cet 2011.12.6 add 给水中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kFeedWater3 // cet 2011.12.6 add 给水高区
|
||||
){
|
||||
TCHAR* szLay = pPipe->layer();
|
||||
if(_tcsicmp(szLay, LAY_PIPE_FEED2) == 0 || _tcsicmp(szLay, LAY_VPIPE_FEED2) == 0){
|
||||
@@ -981,8 +981,8 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
delete [] szLay;
|
||||
}
|
||||
else if(pPipe->GetSysType() == TPipeSys::kHeatFeedWater
|
||||
|| pPipe->GetSysType() == TPipeSys::kHeatFeedWater2 // cet 2011.12.6 add 热给水中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kHeatFeedWater3 // cet 2011.12.6 add 热给水高区
|
||||
|| pPipe->GetSysType() == TPipeSys::kHeatFeedWater2 // cet 2011.12.6 add 热给水中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kHeatFeedWater3 // cet 2011.12.6 add 热给水高区
|
||||
){
|
||||
CString csLay = pPipe->GetLayer();
|
||||
if(_tcsicmp(csLay, LAY_PIPE_HEADFEED2) == 0 || _tcsicmp(csLay, LAY_VPIPE_HEADFEED2) == 0){
|
||||
@@ -991,7 +991,7 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeHeatFeed2);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeHeatFeed2);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthHeatFeed2);
|
||||
pPipe->SetMaterial(m_iMaterialHeatFeed2);
|
||||
}
|
||||
@@ -1001,14 +1001,14 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeHeatFeed3);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeHeatFeed3);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthHeatFeed3);
|
||||
pPipe->SetMaterial(m_iMaterialHeatFeed3);
|
||||
}
|
||||
}
|
||||
else if(pPipe->GetSysType() == TPipeSys::kHeatBackWater
|
||||
|| pPipe->GetSysType() == TPipeSys::kHeatBackWater2 // cet 2011.12.6 add 热回水中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kHeatBackWater3 // cet 2011.12.6 add 热回水高区
|
||||
|| pPipe->GetSysType() == TPipeSys::kHeatBackWater2 // cet 2011.12.6 add 热回水中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kHeatBackWater3 // cet 2011.12.6 add 热回水高区
|
||||
){
|
||||
CString csLay = pPipe->GetLayer();
|
||||
if(_tcsicmp(csLay, LAY_PIPE_HEADBACK2) == 0 || _tcsicmp(csLay, LAY_VPIPE_HEADBACK2) == 0){
|
||||
@@ -1017,7 +1017,7 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeHeatBack2);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeHeatBack2);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthHeatBack2);
|
||||
pPipe->SetMaterial(m_iMaterialHeatBack2);
|
||||
}
|
||||
@@ -1027,15 +1027,15 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeHeatBack3);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeHeatBack3);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthHeatBack3);
|
||||
pPipe->SetMaterial(m_iMaterialHeatBack3);
|
||||
}
|
||||
|
||||
}
|
||||
else if(pPipe->GetSysType() == TPipeSys::kFireFighting
|
||||
|| pPipe->GetSysType() == TPipeSys::kFireFighting2 // cet 2011.12.6 add 消防中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kFireFighting3 // cet 2011.12.6 add 消防高区
|
||||
|| pPipe->GetSysType() == TPipeSys::kFireFighting2 // cet 2011.12.6 add 消防中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kFireFighting3 // cet 2011.12.6 add 消防高区
|
||||
){
|
||||
CString csLay = pPipe->GetLayer();
|
||||
if(_tcsicmp(csLay, LAY_PIPE_FIRE2) == 0 || _tcsicmp(csLay, LAY_VPIPE_FIRE2) == 0){
|
||||
@@ -1044,7 +1044,7 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeFire2);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeFire2);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthFire2);
|
||||
pPipe->SetMaterial(m_iMaterialFire2);
|
||||
}
|
||||
@@ -1054,15 +1054,15 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeFire3);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeFire3);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthFire3);
|
||||
pPipe->SetMaterial(m_iMaterialFire3);
|
||||
}
|
||||
|
||||
}
|
||||
else if(pPipe->GetSysType() == TPipeSys::kSprinkle
|
||||
|| pPipe->GetSysType() == TPipeSys::kSprinkle2 // cet 2011.12.6 add 消防中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kSprinkle3 // cet 2011.12.6 add 消防高区
|
||||
|| pPipe->GetSysType() == TPipeSys::kSprinkle2 // cet 2011.12.6 add 消防中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kSprinkle3 // cet 2011.12.6 add 消防高区
|
||||
){
|
||||
CString csLay = pPipe->GetLayer();
|
||||
if(_tcsicmp(csLay, LAY_PIPE_SPRINKLE2) == 0 || _tcsicmp(csLay, LAY_VPIPE_SPRINKLE2) == 0){
|
||||
@@ -1071,7 +1071,7 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeSprink2);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeSprink2);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthSprink2);
|
||||
pPipe->SetMaterial(m_iMaterialSprink2);
|
||||
}
|
||||
@@ -1081,14 +1081,14 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeSprink3);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeSprink3);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthSprink3);
|
||||
pPipe->SetMaterial(m_iMaterialSprink3);
|
||||
}
|
||||
}
|
||||
else if(pPipe->GetSysType() == TPipeSys::kUsedWater
|
||||
|| pPipe->GetSysType() == TPipeSys::kUsedWater2 // cet 2011.12.6 add 中水中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kUsedWater3 // cet 2011.12.6 add 中水高区
|
||||
|| pPipe->GetSysType() == TPipeSys::kUsedWater2 // cet 2011.12.6 add 中水中区
|
||||
|| pPipe->GetSysType() == TPipeSys::kUsedWater3 // cet 2011.12.6 add 中水高区
|
||||
){
|
||||
CString csLay = pPipe->GetLayer();
|
||||
if(_tcsicmp(csLay, LAY_PIPE_USED2) == 0 || _tcsicmp(csLay, LAY_VPIPE_USED2) == 0){
|
||||
@@ -1097,7 +1097,7 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeUsed2);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeUsed2);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthUsed2);
|
||||
pPipe->SetMaterial(m_iMaterialUsed2);
|
||||
}
|
||||
@@ -1107,7 +1107,7 @@ void CPipeSettingChild3Dlg::UpdateDlgData(BOOL bIsRead)
|
||||
bChangleRadius = TRUE;
|
||||
}
|
||||
else
|
||||
pPipe->setLinetype(m_csLineTypeUsed3);//立管线形不能随横管走
|
||||
pPipe->setLinetype(m_csLineTypeUsed3);//立管线形不能随横管走
|
||||
pPipe->SetPipeWeight(m_dWidthUsed3);
|
||||
pPipe->SetMaterial(m_iMaterialUsed3);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user