chore
把非utf8-bom编码的cpp/h文件改为 utf8 bom 编码, msvc识别utf8编码时,如果不是bom格式的,会使用当前cp_oem来解码.
This commit is contained in:
gjm committed
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 "HandRailDlg.h"
|
||||
#include "RailDlg.h"
|
||||
#include "CurveMeshDlg.h"
|
||||
@@ -91,13 +91,13 @@ void MakeStairHand(Entity ent, XPoint pickPt, double nRailWidth, double nRailHei
|
||||
UpdateGraphic(ss);
|
||||
}
|
||||
|
||||
// Command: 扶手
|
||||
// Command: 扶手
|
||||
void Poly2Rail()
|
||||
{
|
||||
Entity ent;
|
||||
RBList rbMask(RTDXF0, _T("LINE,ARC,CIRCLE,POLYLINE,LWPOLYLINE,TCH_LINESTAIR,TCH_ARCSTAIR,TCH_CURVESTAIR"), NULL);
|
||||
XPoint ptPick;
|
||||
if (SelectEntity1(_T("\n请选择梯段或作为路径的曲线(线/弧/圆/多段线):"), ent, ptPick, rbMask)==RTNORM) {
|
||||
if (SelectEntity1(_T("\n请选择梯段或作为路径的曲线(线/弧/圆/多段线):"), ent, ptPick, rbMask)==RTNORM) {
|
||||
XVector3D vtNormal=XVector3D(0,0,1);
|
||||
AcDbObjectId idBind;
|
||||
ptPick=Ucs2Wcs(ptPick);
|
||||
@@ -107,7 +107,7 @@ void Poly2Rail()
|
||||
bStair=TRUE;
|
||||
/*
|
||||
if (vtNormal.AsAcGeVector3d()!=pPathEnt->GetNormal().AsAcGeVector3d()) {
|
||||
adsout << _T("\n当前构造平面不在WCS的XY平行的平面上!");
|
||||
adsout << _T("\n当前构造平面不在WCS的XY平行的平面上!");
|
||||
return;
|
||||
}
|
||||
idBind=pPathEnt->objectId();
|
||||
@@ -117,7 +117,7 @@ void Poly2Rail()
|
||||
if (ent.GetData(210, &vtPoly)!=RTNORM)
|
||||
vtPoly=XVector3D(0,0,1);
|
||||
if (vtPoly.AsAcGeVector3d()!=vtNormal.AsAcGeVector3d()) {
|
||||
adsout << _T("\n所选对象的构造平面与当前构造平面不平行!");
|
||||
adsout << _T("\n所选对象的构造平面与当前构造平面不平行!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -125,15 +125,15 @@ void Poly2Rail()
|
||||
ent.Redraw(3);
|
||||
static double nRailWidth=60;
|
||||
static double nRailHeight=900;
|
||||
if (GetDist(_T("\n扶手宽度"), nRailWidth, RSG_NOZERO|RSG_NONEG)==RTCAN ||
|
||||
GetDist(_T("\n扶手顶面高度"), nRailHeight, RSG_NOZERO|RSG_NONEG)==RTCAN) {
|
||||
if (GetDist(_T("\n扶手宽度"), nRailWidth, RSG_NOZERO|RSG_NONEG)==RTCAN ||
|
||||
GetDist(_T("\n扶手顶面高度"), nRailHeight, RSG_NOZERO|RSG_NONEG)==RTCAN) {
|
||||
ent.Redraw(4);
|
||||
return;
|
||||
}
|
||||
|
||||
if (bStair) {
|
||||
static double nOffset=0.0;
|
||||
if (GetReal(_T("\n扶手距边"), nOffset, 0)!=RTCAN) {
|
||||
if (GetReal(_T("\n扶手距边"), nOffset, 0)!=RTCAN) {
|
||||
MakeStairHand(ent, ptPick, nRailWidth, nRailHeight, nOffset);
|
||||
}
|
||||
} else {
|
||||
@@ -157,7 +157,7 @@ void Poly2Rail()
|
||||
XString sKeyword;
|
||||
int nRetCode;
|
||||
INITGET_BEG(0, _T("M L R"));
|
||||
nRetCode=ads_getkword(_T("\n输入对齐方式[中间对齐(M)/左边对齐(L)/右边对齐(R)]<M>:"), sKeyword);
|
||||
nRetCode=ads_getkword(_T("\n输入对齐方式[中间对齐(M)/左边对齐(L)/右边对齐(R)]<M>:"), sKeyword);
|
||||
INITGET_END();
|
||||
ent.Redraw(4);
|
||||
if (nRetCode==RTCAN)
|
||||
@@ -196,8 +196,8 @@ void Poly2Rail()
|
||||
}
|
||||
}
|
||||
|
||||
// Command: 栏杆
|
||||
// 必须在WCS
|
||||
// Command: 栏杆
|
||||
// 必须在WCS
|
||||
void Rail()
|
||||
{
|
||||
CAcModuleResourceOverride vTemp;
|
||||
@@ -207,7 +207,7 @@ void Rail()
|
||||
AsureWCS();
|
||||
RBList rbMask1(RTDXF0, _T("LINE,ARC,CIRCLE,POLYLINE,LWPOLYLINE,TCH_*"), NULL);
|
||||
Entity ent1;
|
||||
if (SelectEntity(_T("\n请选择作为路径的曲线(线/弧/圆/多段线)或可绑定对象(路径曲面/扶手/坡屋顶):"), ent1, rbMask1)==RTNORM) {
|
||||
if (SelectEntity(_T("\n请选择作为路径的曲线(线/弧/圆/多段线)或可绑定对象(路径曲面/扶手/坡屋顶):"), ent1, rbMask1)==RTNORM) {
|
||||
XVector3D vtNormal=XVector3D(0,0,1);
|
||||
AcDbObjectId idBind;
|
||||
|
||||
@@ -224,7 +224,7 @@ void Rail()
|
||||
pPathEnt->GetPathPoly(poly,vt);
|
||||
if (vtNormal.AsAcGeVector3d()!=vt)
|
||||
{
|
||||
adsout << _T("\n当前构造平面不在WCS的XY平行的平面上!");
|
||||
adsout << _T("\n当前构造平面不在WCS的XY平行的平面上!");
|
||||
return;
|
||||
}
|
||||
idBind=pEnt->objectId();
|
||||
@@ -236,7 +236,7 @@ void Rail()
|
||||
vtPoly=XVector3D(0,0,1);
|
||||
if (vtPoly.AsAcGeVector3d()!=vtNormal.AsAcGeVector3d())
|
||||
{
|
||||
adsout << _T("\n所选对象的构造平面与当前构造平面不平行!");
|
||||
adsout << _T("\n所选对象的构造平面与当前构造平面不平行!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -244,7 +244,7 @@ void Rail()
|
||||
//OPENOBJ_BEGIN(ent1, AcDb::kForRead, TDbPolyPathEnt, pPathEnt);
|
||||
//if (pPathEnt) {
|
||||
// if (vtNormal.AsAcGeVector3d()!=pPathEnt->GetNormal().AsAcGeVector3d()) {
|
||||
// adsout << _T("\n当前构造平面不在WCS的XY平行的平面上!");
|
||||
// adsout << _T("\n当前构造平面不在WCS的XY平行的平面上!");
|
||||
// return;
|
||||
// }
|
||||
// idBind=pPathEnt->objectId();
|
||||
@@ -253,7 +253,7 @@ void Rail()
|
||||
// if (ent1.GetData(210, &vtPoly)!=RTNORM)
|
||||
// vtPoly=XVector3D(0,0,1);
|
||||
// if (vtPoly.AsAcGeVector3d()!=vtNormal.AsAcGeVector3d()) {
|
||||
// adsout << _T("\n所选对象的构造平面与当前构造平面不平行!");
|
||||
// adsout << _T("\n所选对象的构造平面与当前构造平面不平行!");
|
||||
// return;
|
||||
// }
|
||||
//}
|
||||
@@ -281,7 +281,7 @@ void Rail()
|
||||
}
|
||||
}
|
||||
/////////////////////////////////////////////
|
||||
// Command: 构造路径曲面
|
||||
// Command: 构造路径曲面
|
||||
void CurveMesh()
|
||||
{
|
||||
CAcModuleResourceOverride vTemp;
|
||||
@@ -294,7 +294,7 @@ void CurveMesh()
|
||||
bDelCell = dlg.m_bDelCell;
|
||||
bDelCurve = dlg.m_bDelCurve;
|
||||
}
|
||||
// 编辑扶手
|
||||
// 编辑扶手
|
||||
int EditHandRail(AcDbObjectId id)
|
||||
{
|
||||
OPENOBJ_BEGIN(id, AcDb::kForRead, TDbHandRail, pStep);
|
||||
|
||||
Reference in new issue
Block a user