mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-10 18:51:21 +03:00
0024180: Eliminate CLang / GCC compiler warning -Wswitch
Eliminated warnings -Wswitch shown by gcc Eliminated two new warnings about wrong initialization order Eliminated warnings about unused functions. A few more ICC warnings (type conversions) fixed
This commit is contained in:
parent
ebeff0a2bc
commit
566f84411f
@ -32,6 +32,8 @@ Standard_Integer Adaptor3d_HSurfaceTool::NbSamplesU(const Handle(Adaptor3d_HSurf
|
|||||||
return (nbs < 2 ? 2 : nbs);
|
return (nbs < 2 ? 2 : nbs);
|
||||||
}
|
}
|
||||||
case GeomAbs_Torus: return 20;
|
case GeomAbs_Torus: return 20;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return 10;
|
return 10;
|
||||||
}
|
}
|
||||||
@ -53,6 +55,8 @@ Standard_Integer Adaptor3d_HSurfaceTool::NbSamplesV(const Handle(Adaptor3d_HSurf
|
|||||||
case GeomAbs_Torus:
|
case GeomAbs_Torus:
|
||||||
case GeomAbs_SurfaceOfRevolution:
|
case GeomAbs_SurfaceOfRevolution:
|
||||||
case GeomAbs_SurfaceOfExtrusion: return 15;
|
case GeomAbs_SurfaceOfExtrusion: return 15;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return 10;
|
return 10;
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ static void GetConeApexParam(const gp_Cone& C, Standard_Real& U, Standard_Real&
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Adaptor3d_TopolTool::Adaptor3d_TopolTool () : nbRestr(0),idRestr(0),myNbSamplesU(-1)
|
Adaptor3d_TopolTool::Adaptor3d_TopolTool () : myNbSamplesU(-1),nbRestr(0),idRestr(0)
|
||||||
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -461,6 +461,8 @@ void BRepExtrema_DistShapeShape::Dump(Standard_OStream& o) const
|
|||||||
|
|
||||||
switch (SupportTypeShape1(i))
|
switch (SupportTypeShape1(i))
|
||||||
{
|
{
|
||||||
|
case BRepExtrema_IsVertex:
|
||||||
|
break;
|
||||||
case BRepExtrema_IsOnEdge:
|
case BRepExtrema_IsOnEdge:
|
||||||
ParOnEdgeS1(i,r1);
|
ParOnEdgeS1(i,r1);
|
||||||
o << "parameter on the first edge : t= " << r1 << endl;
|
o << "parameter on the first edge : t= " << r1 << endl;
|
||||||
@ -472,6 +474,8 @@ void BRepExtrema_DistShapeShape::Dump(Standard_OStream& o) const
|
|||||||
}
|
}
|
||||||
switch (SupportTypeShape2(i))
|
switch (SupportTypeShape2(i))
|
||||||
{
|
{
|
||||||
|
case BRepExtrema_IsVertex:
|
||||||
|
break;
|
||||||
case BRepExtrema_IsOnEdge:
|
case BRepExtrema_IsOnEdge:
|
||||||
ParOnEdgeS2(i,r1);
|
ParOnEdgeS2(i,r1);
|
||||||
o << "parameter on the second edge : t=" << r1 << endl;
|
o << "parameter on the second edge : t=" << r1 << endl;
|
||||||
|
@ -545,6 +545,8 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Shape& S1, const TopoDS_Shape&
|
|||||||
Perform( V1, F2, B1, B2 );
|
Perform( V1, F2, B1, B2 );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -585,6 +587,8 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Shape& S1, const TopoDS_Shape&
|
|||||||
Perform( E1, F2, B1, B2 );
|
Perform( E1, F2, B1, B2 );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -617,9 +621,13 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Shape& S1, const TopoDS_Shape&
|
|||||||
Perform( F1, F2, B1, B2 );
|
Perform( F1, F2, B1, B2 );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -142,6 +142,8 @@ void BRepFill_Pipe::Perform(const TopoDS_Wire& Spine,
|
|||||||
case GeomFill_IsDiscreteTrihedron:
|
case GeomFill_IsDiscreteTrihedron:
|
||||||
TLaw = new GeomFill_DiscreteTrihedron();
|
TLaw = new GeomFill_DiscreteTrihedron();
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
Handle(GeomFill_CurveAndTrihedron) Loc =
|
Handle(GeomFill_CurveAndTrihedron) Loc =
|
||||||
new (GeomFill_CurveAndTrihedron) (TLaw);
|
new (GeomFill_CurveAndTrihedron) (TLaw);
|
||||||
|
@ -180,7 +180,7 @@ void BinLDrivers_DocumentStorageDriver::Write
|
|||||||
WriteMessage (aStr + theFileName);
|
WriteMessage (aStr + theFileName);
|
||||||
#endif
|
#endif
|
||||||
SetIsError(Standard_True);
|
SetIsError(Standard_True);
|
||||||
SetStoreStatus(PCDM_SS_DiskWritingFailure);
|
SetStoreStatus(PCDM_SS_WriteFailure);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ static Standard_Character EvolutionToChar(const TNaming_Evolution theEvol)
|
|||||||
case TNaming_MODIFY : return 'M';
|
case TNaming_MODIFY : return 'M';
|
||||||
case TNaming_DELETE : return 'D';
|
case TNaming_DELETE : return 'D';
|
||||||
case TNaming_SELECTED : return 'S';
|
case TNaming_SELECTED : return 'S';
|
||||||
// case TNaming_REPLACE : return 'R';
|
case TNaming_REPLACE : return 'M'; // for compatibility case TNaming_REPLACE : return 'R';
|
||||||
default:
|
default:
|
||||||
Standard_DomainError::Raise("TNaming_Evolution:: Evolution Unknown");
|
Standard_DomainError::Raise("TNaming_Evolution:: Evolution Unknown");
|
||||||
}
|
}
|
||||||
@ -211,9 +211,9 @@ Standard_Boolean BinMNaming_NamedShapeDriver::Paste
|
|||||||
case TNaming_SELECTED :
|
case TNaming_SELECTED :
|
||||||
aBuilder.Select(aNewShape, anOldShape);
|
aBuilder.Select(aNewShape, anOldShape);
|
||||||
break;
|
break;
|
||||||
// case TNaming_REPLACE :
|
case TNaming_REPLACE :
|
||||||
// aBuilder.Replace(anOldShape, aNewShape);
|
aBuilder.Modify(anOldShape, aNewShape); // for compatibility aBuilder.Replace(anOldShape, aNewShape);
|
||||||
// break;
|
break;
|
||||||
default :
|
default :
|
||||||
Standard_DomainError::Raise("TNaming_Evolution:: Evolution Unknown");
|
Standard_DomainError::Raise("TNaming_Evolution:: Evolution Unknown");
|
||||||
}
|
}
|
||||||
|
@ -38,8 +38,10 @@
|
|||||||
#include <BinMNaming.hxx>
|
#include <BinMNaming.hxx>
|
||||||
#include <TCollection_AsciiString.hxx>
|
#include <TCollection_AsciiString.hxx>
|
||||||
#include <TDF_Tool.hxx>
|
#include <TDF_Tool.hxx>
|
||||||
|
|
||||||
#define NULL_ENTRY "0:0"
|
#define NULL_ENTRY "0:0"
|
||||||
#define OBSOLETE_NUM sizeof(Standard_Integer)
|
#define OBSOLETE_NUM (int)sizeof(Standard_Integer)
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
// 'Z' - is reserved for: forfidden to use
|
// 'Z' - is reserved for: forfidden to use
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
|
@ -1765,6 +1765,8 @@ TopAbs_Orientation ChFi3d_TrsfTrans(const IntSurf_TypeTrans T1)
|
|||||||
switch (T1) {
|
switch (T1) {
|
||||||
case IntSurf_In: return TopAbs_FORWARD;
|
case IntSurf_In: return TopAbs_FORWARD;
|
||||||
case IntSurf_Out: return TopAbs_REVERSED;
|
case IntSurf_Out: return TopAbs_REVERSED;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return TopAbs_INTERNAL;
|
return TopAbs_INTERNAL;
|
||||||
}
|
}
|
||||||
|
@ -48,6 +48,8 @@ Standard_Integer Contap_HCurve2dToolGen::NbSamples (const CurveGen& C,
|
|||||||
nbs/= U1-U0;
|
nbs/= U1-U0;
|
||||||
if(nbs < 2.0) nbs = 2.;
|
if(nbs < 2.0) nbs = 2.;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if (nbs>50.)
|
if (nbs>50.)
|
||||||
nbs = 50.;
|
nbs = 50.;
|
||||||
|
@ -262,16 +262,31 @@ static Standard_Integer DDocStd_SaveAs (Draw_Interpretor& di,
|
|||||||
if (theStatus != PCDM_SS_OK ) {
|
if (theStatus != PCDM_SS_OK ) {
|
||||||
switch ( theStatus ) {
|
switch ( theStatus ) {
|
||||||
case PCDM_SS_DriverFailure: {
|
case PCDM_SS_DriverFailure: {
|
||||||
di << " could not store , no driver found to make it " <<"\n" ;
|
di << "Error saving document: Could not store , no driver found to make it" << "\n";
|
||||||
break ;
|
break ;
|
||||||
}
|
}
|
||||||
case PCDM_SS_WriteFailure: {
|
case PCDM_SS_WriteFailure: {
|
||||||
di << " Write access failure " << "\n" ;
|
di << "Error saving document: Write access failure" << "\n";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PCDM_SS_Failure: {
|
case PCDM_SS_Failure: {
|
||||||
di << " Write failure " << "\n" ;
|
di << "Error saving document: Write failure" << "\n" ;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
case PCDM_SS_Doc_IsNull: {
|
||||||
|
di << "Error saving document: No document to save" << "\n";
|
||||||
|
break ;
|
||||||
|
}
|
||||||
|
case PCDM_SS_No_Obj: {
|
||||||
|
di << "Error saving document: No objects written" << "\n";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case PCDM_SS_Info_Section_Error: {
|
||||||
|
di << "Error saving document: Write info section failure" << "\n" ;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -320,6 +320,7 @@ static void CollectShapes(const TopoDS_Shape& SSh, TopoDS_Compound& C,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case TopAbs_VERTEX:
|
case TopAbs_VERTEX:
|
||||||
|
{
|
||||||
const Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(SSh, theLab);
|
const Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(SSh, theLab);
|
||||||
if(!aNS.IsNull())
|
if(!aNS.IsNull())
|
||||||
if(SMap.Add(SSh)) {
|
if(SMap.Add(SSh)) {
|
||||||
@ -327,6 +328,9 @@ static void CollectShapes(const TopoDS_Shape& SSh, TopoDS_Compound& C,
|
|||||||
// if(isPrimitive)
|
// if(isPrimitive)
|
||||||
// TagMap.Bind(SSh, aNS->Label().Tag());
|
// TagMap.Bind(SSh, aNS->Label().Tag());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ static const Font_FontMgr_FontAliasMapNode Font_FontMgr_MapOfFontsAliases[] =
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define NUM_FONT_ENTRIES (sizeof(Font_FontMgr_MapOfFontsAliases)/sizeof(Font_FontMgr_FontAliasMapNode))
|
#define NUM_FONT_ENTRIES (int)(sizeof(Font_FontMgr_MapOfFontsAliases)/sizeof(Font_FontMgr_FontAliasMapNode))
|
||||||
|
|
||||||
#if (defined(_WIN32) || defined(__WIN32__))
|
#if (defined(_WIN32) || defined(__WIN32__))
|
||||||
|
|
||||||
|
@ -191,9 +191,13 @@ GeomAbs_Shape GeomAdaptor_Surface::UContinuity() const
|
|||||||
{
|
{
|
||||||
switch(BasisSurface()->UContinuity())
|
switch(BasisSurface()->UContinuity())
|
||||||
{
|
{
|
||||||
case GeomAbs_CN : return GeomAbs_CN;
|
case GeomAbs_CN :
|
||||||
|
case GeomAbs_C3 : return GeomAbs_CN;
|
||||||
|
case GeomAbs_G2 :
|
||||||
case GeomAbs_C2 : return GeomAbs_C1;
|
case GeomAbs_C2 : return GeomAbs_C1;
|
||||||
|
case GeomAbs_G1 :
|
||||||
case GeomAbs_C1 : return GeomAbs_C0;
|
case GeomAbs_C1 : return GeomAbs_C0;
|
||||||
|
case GeomAbs_C0 : break;
|
||||||
}
|
}
|
||||||
Standard_NoSuchObject::Raise("GeomAdaptor_Surface::UContinuity");
|
Standard_NoSuchObject::Raise("GeomAdaptor_Surface::UContinuity");
|
||||||
break;
|
break;
|
||||||
@ -204,7 +208,15 @@ GeomAbs_Shape GeomAdaptor_Surface::UContinuity() const
|
|||||||
((*((Handle(Geom_SurfaceOfLinearExtrusion)*)&mySurface))->BasisCurve(),myUFirst,myULast);
|
((*((Handle(Geom_SurfaceOfLinearExtrusion)*)&mySurface))->BasisCurve(),myUFirst,myULast);
|
||||||
return GC.Continuity();
|
return GC.Continuity();
|
||||||
}
|
}
|
||||||
case GeomAbs_OtherSurface: Standard_NoSuchObject::Raise("GeomAdaptor_Surface::UContinuity");
|
case GeomAbs_OtherSurface:
|
||||||
|
Standard_NoSuchObject::Raise("GeomAdaptor_Surface::UContinuity");
|
||||||
|
case GeomAbs_Plane:
|
||||||
|
case GeomAbs_Cylinder:
|
||||||
|
case GeomAbs_Cone:
|
||||||
|
case GeomAbs_Sphere:
|
||||||
|
case GeomAbs_Torus:
|
||||||
|
case GeomAbs_BezierSurface:
|
||||||
|
case GeomAbs_SurfaceOfRevolution: break;
|
||||||
}
|
}
|
||||||
return GeomAbs_CN;
|
return GeomAbs_CN;
|
||||||
}
|
}
|
||||||
@ -232,9 +244,13 @@ GeomAbs_Shape GeomAdaptor_Surface::VContinuity() const
|
|||||||
{
|
{
|
||||||
switch(BasisSurface()->VContinuity())
|
switch(BasisSurface()->VContinuity())
|
||||||
{
|
{
|
||||||
case GeomAbs_CN : return GeomAbs_CN;
|
case GeomAbs_CN :
|
||||||
|
case GeomAbs_C3 : return GeomAbs_CN;
|
||||||
|
case GeomAbs_G2 :
|
||||||
case GeomAbs_C2 : return GeomAbs_C1;
|
case GeomAbs_C2 : return GeomAbs_C1;
|
||||||
|
case GeomAbs_G1 :
|
||||||
case GeomAbs_C1 : return GeomAbs_C0;
|
case GeomAbs_C1 : return GeomAbs_C0;
|
||||||
|
case GeomAbs_C0 : break;
|
||||||
}
|
}
|
||||||
Standard_NoSuchObject::Raise("GeomAdaptor_Surface::VContinuity");
|
Standard_NoSuchObject::Raise("GeomAdaptor_Surface::VContinuity");
|
||||||
break;
|
break;
|
||||||
@ -245,7 +261,15 @@ GeomAbs_Shape GeomAdaptor_Surface::VContinuity() const
|
|||||||
((*((Handle(Geom_SurfaceOfRevolution)*)&mySurface))->BasisCurve(),myVFirst,myVLast);
|
((*((Handle(Geom_SurfaceOfRevolution)*)&mySurface))->BasisCurve(),myVFirst,myVLast);
|
||||||
return GC.Continuity();
|
return GC.Continuity();
|
||||||
}
|
}
|
||||||
case GeomAbs_OtherSurface: Standard_NoSuchObject::Raise("GeomAdaptor_Surface::VContinuity");
|
case GeomAbs_OtherSurface:
|
||||||
|
Standard_NoSuchObject::Raise("GeomAdaptor_Surface::VContinuity");
|
||||||
|
case GeomAbs_Plane:
|
||||||
|
case GeomAbs_Cylinder:
|
||||||
|
case GeomAbs_Cone:
|
||||||
|
case GeomAbs_Sphere:
|
||||||
|
case GeomAbs_Torus:
|
||||||
|
case GeomAbs_BezierSurface:
|
||||||
|
case GeomAbs_SurfaceOfExtrusion: break;
|
||||||
}
|
}
|
||||||
return GeomAbs_CN;
|
return GeomAbs_CN;
|
||||||
}
|
}
|
||||||
@ -283,10 +307,20 @@ Standard_Integer GeomAdaptor_Surface::NbUIntervals(const GeomAbs_Shape S) const
|
|||||||
case GeomAbs_C0: BaseS = GeomAbs_C1; break;
|
case GeomAbs_C0: BaseS = GeomAbs_C1; break;
|
||||||
case GeomAbs_C1: BaseS = GeomAbs_C2; break;
|
case GeomAbs_C1: BaseS = GeomAbs_C2; break;
|
||||||
case GeomAbs_C2: BaseS = GeomAbs_C3; break;
|
case GeomAbs_C2: BaseS = GeomAbs_C3; break;
|
||||||
|
case GeomAbs_C3:
|
||||||
|
case GeomAbs_CN: break;
|
||||||
}
|
}
|
||||||
GeomAdaptor_Surface Sur((*((Handle(Geom_OffsetSurface)*)&mySurface))->BasisSurface());
|
GeomAdaptor_Surface Sur((*((Handle(Geom_OffsetSurface)*)&mySurface))->BasisSurface());
|
||||||
return Sur.NbUIntervals(BaseS);
|
return Sur.NbUIntervals(BaseS);
|
||||||
}
|
}
|
||||||
|
case GeomAbs_Plane:
|
||||||
|
case GeomAbs_Cylinder:
|
||||||
|
case GeomAbs_Cone:
|
||||||
|
case GeomAbs_Sphere:
|
||||||
|
case GeomAbs_Torus:
|
||||||
|
case GeomAbs_BezierSurface:
|
||||||
|
case GeomAbs_OtherSurface:
|
||||||
|
case GeomAbs_SurfaceOfRevolution: break;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -324,10 +358,20 @@ Standard_Integer GeomAdaptor_Surface::NbVIntervals(const GeomAbs_Shape S) const
|
|||||||
case GeomAbs_C0: BaseS = GeomAbs_C1; break;
|
case GeomAbs_C0: BaseS = GeomAbs_C1; break;
|
||||||
case GeomAbs_C1: BaseS = GeomAbs_C2; break;
|
case GeomAbs_C1: BaseS = GeomAbs_C2; break;
|
||||||
case GeomAbs_C2: BaseS = GeomAbs_C3; break;
|
case GeomAbs_C2: BaseS = GeomAbs_C3; break;
|
||||||
|
case GeomAbs_C3:
|
||||||
|
case GeomAbs_CN: break;
|
||||||
}
|
}
|
||||||
GeomAdaptor_Surface Sur((*((Handle(Geom_OffsetSurface)*)&mySurface))->BasisSurface());
|
GeomAdaptor_Surface Sur((*((Handle(Geom_OffsetSurface)*)&mySurface))->BasisSurface());
|
||||||
return Sur.NbVIntervals(BaseS);
|
return Sur.NbVIntervals(BaseS);
|
||||||
}
|
}
|
||||||
|
case GeomAbs_Plane:
|
||||||
|
case GeomAbs_Cylinder:
|
||||||
|
case GeomAbs_Cone:
|
||||||
|
case GeomAbs_Sphere:
|
||||||
|
case GeomAbs_Torus:
|
||||||
|
case GeomAbs_BezierSurface:
|
||||||
|
case GeomAbs_OtherSurface:
|
||||||
|
case GeomAbs_SurfaceOfExtrusion: break;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -372,11 +416,21 @@ void GeomAdaptor_Surface::UIntervals(TColStd_Array1OfReal& T, const GeomAbs_Shap
|
|||||||
case GeomAbs_C0: BaseS = GeomAbs_C1; break;
|
case GeomAbs_C0: BaseS = GeomAbs_C1; break;
|
||||||
case GeomAbs_C1: BaseS = GeomAbs_C2; break;
|
case GeomAbs_C1: BaseS = GeomAbs_C2; break;
|
||||||
case GeomAbs_C2: BaseS = GeomAbs_C3; break;
|
case GeomAbs_C2: BaseS = GeomAbs_C3; break;
|
||||||
|
case GeomAbs_C3:
|
||||||
|
case GeomAbs_CN: break;
|
||||||
}
|
}
|
||||||
GeomAdaptor_Surface Sur((*((Handle(Geom_OffsetSurface)*)&mySurface))->BasisSurface());
|
GeomAdaptor_Surface Sur((*((Handle(Geom_OffsetSurface)*)&mySurface))->BasisSurface());
|
||||||
myNbUIntervals = Sur.NbUIntervals(BaseS);
|
myNbUIntervals = Sur.NbUIntervals(BaseS);
|
||||||
Sur.UIntervals(T, BaseS);
|
Sur.UIntervals(T, BaseS);
|
||||||
}
|
}
|
||||||
|
case GeomAbs_Plane:
|
||||||
|
case GeomAbs_Cylinder:
|
||||||
|
case GeomAbs_Cone:
|
||||||
|
case GeomAbs_Sphere:
|
||||||
|
case GeomAbs_Torus:
|
||||||
|
case GeomAbs_BezierSurface:
|
||||||
|
case GeomAbs_OtherSurface:
|
||||||
|
case GeomAbs_SurfaceOfRevolution: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
T(T.Lower()) = myUFirst;
|
T(T.Lower()) = myUFirst;
|
||||||
@ -423,11 +477,21 @@ void GeomAdaptor_Surface::VIntervals(TColStd_Array1OfReal& T, const GeomAbs_Shap
|
|||||||
case GeomAbs_C0: BaseS = GeomAbs_C1; break;
|
case GeomAbs_C0: BaseS = GeomAbs_C1; break;
|
||||||
case GeomAbs_C1: BaseS = GeomAbs_C2; break;
|
case GeomAbs_C1: BaseS = GeomAbs_C2; break;
|
||||||
case GeomAbs_C2: BaseS = GeomAbs_C3; break;
|
case GeomAbs_C2: BaseS = GeomAbs_C3; break;
|
||||||
|
case GeomAbs_C3:
|
||||||
|
case GeomAbs_CN: break;
|
||||||
}
|
}
|
||||||
GeomAdaptor_Surface Sur((*((Handle(Geom_OffsetSurface)*)&mySurface))->BasisSurface());
|
GeomAdaptor_Surface Sur((*((Handle(Geom_OffsetSurface)*)&mySurface))->BasisSurface());
|
||||||
myNbVIntervals = Sur.NbVIntervals(BaseS);
|
myNbVIntervals = Sur.NbVIntervals(BaseS);
|
||||||
Sur.VIntervals(T, BaseS);
|
Sur.VIntervals(T, BaseS);
|
||||||
}
|
}
|
||||||
|
case GeomAbs_Plane:
|
||||||
|
case GeomAbs_Cylinder:
|
||||||
|
case GeomAbs_Cone:
|
||||||
|
case GeomAbs_Sphere:
|
||||||
|
case GeomAbs_Torus:
|
||||||
|
case GeomAbs_BezierSurface:
|
||||||
|
case GeomAbs_OtherSurface:
|
||||||
|
case GeomAbs_SurfaceOfExtrusion: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
T(T.Lower()) = myVFirst;
|
T(T.Lower()) = myVFirst;
|
||||||
|
@ -260,6 +260,9 @@ void GeomInt_LineConstructor::Perform(const Handle(IntPatch_Line)& L)
|
|||||||
case IntPatch_Ellipse: Pmid = ElCLib::Value(pmid,GLine->Ellipse()); break;
|
case IntPatch_Ellipse: Pmid = ElCLib::Value(pmid,GLine->Ellipse()); break;
|
||||||
case IntPatch_Hyperbola: Pmid = ElCLib::Value(pmid,GLine->Hyperbola()); break;
|
case IntPatch_Hyperbola: Pmid = ElCLib::Value(pmid,GLine->Hyperbola()); break;
|
||||||
case IntPatch_Parabola: Pmid = ElCLib::Value(pmid,GLine->Parabola()); break;
|
case IntPatch_Parabola: Pmid = ElCLib::Value(pmid,GLine->Parabola()); break;
|
||||||
|
case IntPatch_Analytic:
|
||||||
|
case IntPatch_Walking:
|
||||||
|
case IntPatch_Restriction: break; // cases Analytic, Walking and Restriction are handled above
|
||||||
}
|
}
|
||||||
Parameters(myHS1,myHS2,Pmid,u1,v1,u2,v2);
|
Parameters(myHS1,myHS2,Pmid,u1,v1,u2,v2);
|
||||||
Recadre(myHS1,myHS2,u1,v1,u2,v2);
|
Recadre(myHS1,myHS2,u1,v1,u2,v2);
|
||||||
|
@ -64,6 +64,9 @@ Standard_Integer IntPatch_HInterTool::NbSamplesV (const Handle(Adaptor3d_HSurfac
|
|||||||
case GeomAbs_Torus:
|
case GeomAbs_Torus:
|
||||||
case GeomAbs_SurfaceOfRevolution:
|
case GeomAbs_SurfaceOfRevolution:
|
||||||
case GeomAbs_SurfaceOfExtrusion: return 15;
|
case GeomAbs_SurfaceOfExtrusion: return 15;
|
||||||
|
|
||||||
|
case GeomAbs_OffsetSurface:
|
||||||
|
case GeomAbs_OtherSurface: return 10;
|
||||||
}
|
}
|
||||||
return 10;
|
return 10;
|
||||||
}
|
}
|
||||||
@ -84,11 +87,14 @@ Standard_Integer IntPatch_HInterTool::NbSamplesU (const Handle(Adaptor3d_HSurfac
|
|||||||
return nbs;
|
return nbs;
|
||||||
}
|
}
|
||||||
case GeomAbs_Torus: return 20;
|
case GeomAbs_Torus: return 20;
|
||||||
//case GeomAbs_Cylinder:
|
|
||||||
//case GeomAbs_Cone:
|
case GeomAbs_Cylinder:
|
||||||
//case GeomAbs_Sphere:
|
case GeomAbs_Cone:
|
||||||
//case GeomAbs_SurfaceOfRevolution:
|
case GeomAbs_Sphere:
|
||||||
//case GeomAbs_SurfaceOfExtrusion: return 10;
|
case GeomAbs_SurfaceOfRevolution:
|
||||||
|
case GeomAbs_SurfaceOfExtrusion:
|
||||||
|
case GeomAbs_OffsetSurface:
|
||||||
|
case GeomAbs_OtherSurface: return 10;
|
||||||
}
|
}
|
||||||
return 10;
|
return 10;
|
||||||
}
|
}
|
||||||
|
@ -376,6 +376,8 @@ void Recadre(const Standard_Boolean ,
|
|||||||
case GeomAbs_Sphere:
|
case GeomAbs_Sphere:
|
||||||
while(U1<(U1p-1.5*M_PI)) U1+=M_PI+M_PI;
|
while(U1<(U1p-1.5*M_PI)) U1+=M_PI+M_PI;
|
||||||
while(U1>(U1p+1.5*M_PI)) U1-=M_PI+M_PI;
|
while(U1>(U1p+1.5*M_PI)) U1-=M_PI+M_PI;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
switch(typeS2)
|
switch(typeS2)
|
||||||
{
|
{
|
||||||
@ -387,6 +389,8 @@ void Recadre(const Standard_Boolean ,
|
|||||||
case GeomAbs_Sphere:
|
case GeomAbs_Sphere:
|
||||||
while(U2<(U2p-1.5*M_PI)) U2+=M_PI+M_PI;
|
while(U2<(U2p-1.5*M_PI)) U2+=M_PI+M_PI;
|
||||||
while(U2>(U2p+1.5*M_PI)) U2-=M_PI+M_PI;
|
while(U2>(U2p+1.5*M_PI)) U2-=M_PI+M_PI;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
pt.SetParameters(U1,V1,U2,V2);
|
pt.SetParameters(U1,V1,U2,V2);
|
||||||
}
|
}
|
||||||
|
@ -628,6 +628,8 @@ static void FUN_NewFirstLast(const GeomAbs_CurveType& ga_ct,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//================================================================================
|
//================================================================================
|
||||||
@ -1477,7 +1479,7 @@ void IntPatch_Intersection::Dump(const Standard_Integer ,
|
|||||||
nbR2++;
|
nbR2++;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("\nDUMP_INT: ----empt:%2d tgte:%2d oppo:%2d ---------------------------------",empt,tgte,empt);
|
printf("\nDUMP_INT: ----empt:%2ud tgte:%2ud oppo:%2ud ---------------------------------",empt,tgte,empt);
|
||||||
Standard_Integer i,j,nbr1,nbr2,nbgl,nbgc,nbge,nbgp,nbgh,nbl,nbr,nbg,nbw,nba;
|
Standard_Integer i,j,nbr1,nbr2,nbgl,nbgc,nbge,nbgp,nbgh,nbl,nbr,nbg,nbw,nba;
|
||||||
nbl=nbr=nbg=nbw=nba=nbgl=nbge=nbr1=nbr2=nbgc=nbgp=nbgh=0;
|
nbl=nbr=nbg=nbw=nba=nbgl=nbge=nbr1=nbr2=nbgc=nbgp=nbgh=0;
|
||||||
nbl=NbLines();
|
nbl=NbLines();
|
||||||
|
@ -84,6 +84,8 @@ void IntPatch_Point::ReverseTransition()
|
|||||||
{
|
{
|
||||||
case IntSurf_In: TLine.SetValue(Standard_False,IntSurf_Out); break;
|
case IntSurf_In: TLine.SetValue(Standard_False,IntSurf_Out); break;
|
||||||
case IntSurf_Out: TLine.SetValue(Standard_False,IntSurf_In); break;
|
case IntSurf_Out: TLine.SetValue(Standard_False,IntSurf_In); break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
traline1=TLine;
|
traline1=TLine;
|
||||||
IntSurf_Transition TArc;
|
IntSurf_Transition TArc;
|
||||||
@ -91,6 +93,8 @@ void IntPatch_Point::ReverseTransition()
|
|||||||
{
|
{
|
||||||
case IntSurf_In: TArc.SetValue(Standard_False,IntSurf_Out); break;
|
case IntSurf_In: TArc.SetValue(Standard_False,IntSurf_Out); break;
|
||||||
case IntSurf_Out: TArc.SetValue(Standard_False,IntSurf_In); break;
|
case IntSurf_Out: TArc.SetValue(Standard_False,IntSurf_In); break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
tra1=TArc;
|
tra1=TArc;
|
||||||
}
|
}
|
||||||
@ -101,6 +105,8 @@ void IntPatch_Point::ReverseTransition()
|
|||||||
{
|
{
|
||||||
case IntSurf_In: TLine.SetValue(Standard_False,IntSurf_Out); break;
|
case IntSurf_In: TLine.SetValue(Standard_False,IntSurf_Out); break;
|
||||||
case IntSurf_Out: TLine.SetValue(Standard_False,IntSurf_In); break;
|
case IntSurf_Out: TLine.SetValue(Standard_False,IntSurf_In); break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
traline2=TLine;
|
traline2=TLine;
|
||||||
IntSurf_Transition TArc;
|
IntSurf_Transition TArc;
|
||||||
@ -108,6 +114,8 @@ void IntPatch_Point::ReverseTransition()
|
|||||||
{
|
{
|
||||||
case IntSurf_In: TArc.SetValue(Standard_False,IntSurf_Out); break;
|
case IntSurf_In: TArc.SetValue(Standard_False,IntSurf_Out); break;
|
||||||
case IntSurf_Out: TArc.SetValue(Standard_False,IntSurf_In); break;
|
case IntSurf_Out: TArc.SetValue(Standard_False,IntSurf_In); break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
tra2=TArc;
|
tra2=TArc;
|
||||||
}
|
}
|
||||||
|
@ -158,7 +158,7 @@ Standard_Integer EvolutionInt(const TNaming_Evolution i)
|
|||||||
case TNaming_MODIFY : return 2;
|
case TNaming_MODIFY : return 2;
|
||||||
case TNaming_DELETE : return 3;
|
case TNaming_DELETE : return 3;
|
||||||
case TNaming_SELECTED : return 4;
|
case TNaming_SELECTED : return 4;
|
||||||
//case TNaming_REPLACE : return 5;
|
case TNaming_REPLACE : return 2; //case TNaming_REPLACE : return 5; for compatibility
|
||||||
default:
|
default:
|
||||||
Standard_DomainError::Raise("TNaming_Evolution; enum term unknown");
|
Standard_DomainError::Raise("TNaming_Evolution; enum term unknown");
|
||||||
}
|
}
|
||||||
|
@ -604,7 +604,7 @@ static ERROR_TABLE fileErrorTable[] = {
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define FILE_ERR_TABLE_SIZE ( sizeof ( fileErrorTable ) / sizeof ( fileErrorTable[ 0 ] ) )
|
#define FILE_ERR_TABLE_SIZE (int)(sizeof(fileErrorTable) / sizeof(fileErrorTable[0]))
|
||||||
|
|
||||||
static ERROR_TABLE fileNodeErrorTable[] = {
|
static ERROR_TABLE fileNodeErrorTable[] = {
|
||||||
|
|
||||||
|
@ -207,6 +207,8 @@ void OpenGl_PrimitiveArray::DrawArray (Tint theLightingModel,
|
|||||||
case TelTriangleFansArrayType:
|
case TelTriangleFansArrayType:
|
||||||
glColor3fv (theInteriorColour->rgb);
|
glColor3fv (theInteriorColour->rgb);
|
||||||
break;
|
break;
|
||||||
|
case TelUnknownArrayType:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Temporarily disable environment mapping
|
// Temporarily disable environment mapping
|
||||||
@ -687,6 +689,8 @@ OpenGl_PrimitiveArray::OpenGl_PrimitiveArray (CALL_DEF_PARRAY* thePArray)
|
|||||||
case TelTriangleFansArrayType:
|
case TelTriangleFansArrayType:
|
||||||
myDrawMode = GL_TRIANGLE_FAN;
|
myDrawMode = GL_TRIANGLE_FAN;
|
||||||
break;
|
break;
|
||||||
|
case TelUnknownArrayType:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,8 +58,6 @@ is
|
|||||||
SS_DriverFailure,
|
SS_DriverFailure,
|
||||||
SS_WriteFailure,
|
SS_WriteFailure,
|
||||||
SS_Failure,
|
SS_Failure,
|
||||||
SS_DiskWritingFailure,
|
|
||||||
SS_UserRightsFailure,
|
|
||||||
SS_Doc_IsNull,
|
SS_Doc_IsNull,
|
||||||
SS_No_Obj,
|
SS_No_Obj,
|
||||||
SS_Info_Section_Error
|
SS_Info_Section_Error
|
||||||
|
@ -780,16 +780,31 @@ static Standard_Integer OCC381_Save (Draw_Interpretor& di, Standard_Integer nb,
|
|||||||
if (theStatus != PCDM_SS_OK ) {
|
if (theStatus != PCDM_SS_OK ) {
|
||||||
switch ( theStatus ) {
|
switch ( theStatus ) {
|
||||||
case PCDM_SS_DriverFailure: {
|
case PCDM_SS_DriverFailure: {
|
||||||
di << " Could not store , no driver found to make it " <<"\n" ;
|
di << "Error saving document: Could not store , no driver found to make it" << "\n";
|
||||||
break ;
|
break ;
|
||||||
}
|
}
|
||||||
case PCDM_SS_WriteFailure: {
|
case PCDM_SS_WriteFailure: {
|
||||||
di << " Write access failure " << "\n" ;
|
di << "Error saving document: Write access failure" << "\n";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PCDM_SS_Failure: {
|
case PCDM_SS_Failure: {
|
||||||
di << " Write failure " << "\n" ;
|
di << "Error saving document: Write failure" << "\n" ;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
case PCDM_SS_Doc_IsNull: {
|
||||||
|
di << "Error saving document: No document to save" << "\n";
|
||||||
|
break ;
|
||||||
|
}
|
||||||
|
case PCDM_SS_No_Obj: {
|
||||||
|
di << "Error saving document: No objects written" << "\n";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case PCDM_SS_Info_Section_Error: {
|
||||||
|
di << "Error saving document: Write info section failure" << "\n" ;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -815,16 +830,31 @@ static Standard_Integer OCC381_SaveAs (Draw_Interpretor& di, Standard_Integer nb
|
|||||||
if (theStatus != PCDM_SS_OK ) {
|
if (theStatus != PCDM_SS_OK ) {
|
||||||
switch ( theStatus ) {
|
switch ( theStatus ) {
|
||||||
case PCDM_SS_DriverFailure: {
|
case PCDM_SS_DriverFailure: {
|
||||||
di << " Could not store , no driver found to make it " <<"\n" ;
|
di << "Error saving document: Could not store , no driver found to make it" << "\n";
|
||||||
break ;
|
break ;
|
||||||
}
|
}
|
||||||
case PCDM_SS_WriteFailure: {
|
case PCDM_SS_WriteFailure: {
|
||||||
di << " Write access failure " << "\n" ;
|
di << "Error saving document: Write access failure" << "\n";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PCDM_SS_Failure: {
|
case PCDM_SS_Failure: {
|
||||||
di << " Write failure " << "\n" ;
|
di << "Error saving document: Write failure" << "\n" ;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
case PCDM_SS_Doc_IsNull: {
|
||||||
|
di << "Error saving document: No document to save" << "\n";
|
||||||
|
break ;
|
||||||
|
}
|
||||||
|
case PCDM_SS_No_Obj: {
|
||||||
|
di << "Error saving document: No objects written" << "\n";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case PCDM_SS_Info_Section_Error: {
|
||||||
|
di << "Error saving document: Write info section failure" << "\n" ;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -50,8 +50,8 @@ static const char* EvolutionString(TNaming_Evolution theEvolution) {
|
|||||||
return "DELETE";
|
return "DELETE";
|
||||||
case TNaming_SELECTED :
|
case TNaming_SELECTED :
|
||||||
return "SELECTED";
|
return "SELECTED";
|
||||||
// case TNaming_REPLACE :
|
case TNaming_REPLACE :
|
||||||
// return "REPLACE";
|
return "MODIFY";
|
||||||
}
|
}
|
||||||
return "UNKNOWN_Evolution";
|
return "UNKNOWN_Evolution";
|
||||||
}
|
}
|
||||||
|
@ -88,6 +88,11 @@ void QANewBRepNaming::LoadNamedShape (TNaming_Builder& theBuilder,
|
|||||||
theBuilder.Modify(theOS, theNS);
|
theBuilder.Modify(theOS, theNS);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case TNaming_REPLACE :
|
||||||
|
{
|
||||||
|
theBuilder.Modify(theOS, theNS);
|
||||||
|
break;
|
||||||
|
} // for compatibility
|
||||||
// case TNaming_REPLACE :
|
// case TNaming_REPLACE :
|
||||||
// {
|
// {
|
||||||
// theBuilder.Replace(theOS, theNS);
|
// theBuilder.Replace(theOS, theNS);
|
||||||
|
@ -50,6 +50,11 @@ void rec_typarg(int argtype);
|
|||||||
#pragma warning(disable:4131 4244 4273 4267 4127)
|
#pragma warning(disable:4131 4244 4273 4267 4127)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// disable GCC warnings in flex code
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
|
#endif
|
||||||
|
|
||||||
%}
|
%}
|
||||||
%%
|
%%
|
||||||
" " {;}
|
" " {;}
|
||||||
|
@ -56,9 +56,6 @@
|
|||||||
.TObj_Appl_SFailure
|
.TObj_Appl_SFailure
|
||||||
Error saving document %s : general failure of persistence driver
|
Error saving document %s : general failure of persistence driver
|
||||||
|
|
||||||
.TObj_Appl_SDiskWritingFailure
|
|
||||||
Error saving document %s : possibly the disk is full or other disk write problem occurred
|
|
||||||
|
|
||||||
.TObj_Appl_SDocIsNull
|
.TObj_Appl_SDocIsNull
|
||||||
Error saving document %s : No document to save
|
Error saving document %s : No document to save
|
||||||
|
|
||||||
|
@ -103,9 +103,6 @@ Standard_Boolean TObj_Application::SaveDocument
|
|||||||
case PCDM_SS_Failure:
|
case PCDM_SS_Failure:
|
||||||
ErrorMessage (Message_Msg("TObj_Appl_SFailure") << aPath);
|
ErrorMessage (Message_Msg("TObj_Appl_SFailure") << aPath);
|
||||||
break;
|
break;
|
||||||
case PCDM_SS_DiskWritingFailure:
|
|
||||||
ErrorMessage (Message_Msg("TObj_Appl_SDiskWritingFailure") << aPath);
|
|
||||||
break;
|
|
||||||
case PCDM_SS_Doc_IsNull:
|
case PCDM_SS_Doc_IsNull:
|
||||||
ErrorMessage (Message_Msg("TObj_Appl_SDocIsNull") << aPath);
|
ErrorMessage (Message_Msg("TObj_Appl_SDocIsNull") << aPath);
|
||||||
break;
|
break;
|
||||||
|
@ -345,6 +345,8 @@ Standard_Boolean TopOpeBRep_LineInter::IsPeriodic() const
|
|||||||
{
|
{
|
||||||
case TopOpeBRep_CIRCLE :
|
case TopOpeBRep_CIRCLE :
|
||||||
case TopOpeBRep_ELLIPSE : return Standard_True;
|
case TopOpeBRep_ELLIPSE : return Standard_True;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return Standard_False;
|
return Standard_False;
|
||||||
}
|
}
|
||||||
@ -410,6 +412,8 @@ Standard_Integer TopOpeBRep_LineInter::NbWPoint() const
|
|||||||
switch (myTypeLineCurve)
|
switch (myTypeLineCurve)
|
||||||
{
|
{
|
||||||
case TopOpeBRep_WALKING : return myILW->NbPnts();
|
case TopOpeBRep_WALKING : return myILW->NbPnts();
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -141,7 +141,7 @@ TopOpeBRepBuild_VertexInfo::TopOpeBRepBuild_VertexInfo()
|
|||||||
void TopOpeBRepBuild_VertexInfo::Dump() const
|
void TopOpeBRepBuild_VertexInfo::Dump() const
|
||||||
{
|
{
|
||||||
printf(" *** Dump the Vertex Info ***\n");
|
printf(" *** Dump the Vertex Info ***\n");
|
||||||
printf(" mySmart : %d\n", mySmart);
|
printf(" mySmart : %ud\n", mySmart);
|
||||||
printf(" Edges : %d In, %d Out\n", myEdgesIn.Extent(), myEdgesOut.Extent());
|
printf(" Edges : %d In, %d Out\n", myEdgesIn.Extent(), myEdgesOut.Extent());
|
||||||
|
|
||||||
|
|
||||||
|
@ -266,12 +266,12 @@ static Graphic3d_Vertex& _MyProjReferencePoint() {
|
|||||||
|
|
||||||
V3d_View::V3d_View(const Handle(V3d_Viewer)& VM, const V3d_TypeOfView Type ) :
|
V3d_View::V3d_View(const Handle(V3d_Viewer)& VM, const V3d_TypeOfView Type ) :
|
||||||
MyType ( Type ),
|
MyType ( Type ),
|
||||||
|
MyProjModel(V3d_TPM_SCREEN),
|
||||||
MyViewer(VM.operator->()),
|
MyViewer(VM.operator->()),
|
||||||
MyActiveLights(),
|
MyActiveLights(),
|
||||||
MyViewContext (),
|
MyViewContext (),
|
||||||
myActiveLightsIterator(),
|
myActiveLightsIterator(),
|
||||||
SwitchSetFront(Standard_False),
|
SwitchSetFront(Standard_False),
|
||||||
MyProjModel(V3d_TPM_SCREEN),
|
|
||||||
MyTrsf (1, 4, 1, 4) // S3892
|
MyTrsf (1, 4, 1, 4) // S3892
|
||||||
{
|
{
|
||||||
myImmediateUpdate = Standard_False;
|
myImmediateUpdate = Standard_False;
|
||||||
@ -367,13 +367,13 @@ MyTrsf (1, 4, 1, 4) // S3892
|
|||||||
|
|
||||||
V3d_View::V3d_View(const Handle(V3d_Viewer)& VM,const Handle(V3d_View)& V, const V3d_TypeOfView Type ) :
|
V3d_View::V3d_View(const Handle(V3d_Viewer)& VM,const Handle(V3d_View)& V, const V3d_TypeOfView Type ) :
|
||||||
MyType ( Type ),
|
MyType ( Type ),
|
||||||
|
MyProjModel(V3d_TPM_SCREEN),
|
||||||
MyViewer(VM.operator->()),
|
MyViewer(VM.operator->()),
|
||||||
MyActiveLights(),
|
MyActiveLights(),
|
||||||
MyViewContext (),
|
MyViewContext (),
|
||||||
myActiveLightsIterator(),
|
myActiveLightsIterator(),
|
||||||
SwitchSetFront(Standard_False),
|
SwitchSetFront(Standard_False),
|
||||||
MyTrsf (1, 4, 1, 4), // S3892
|
MyTrsf (1, 4, 1, 4) // S3892
|
||||||
MyProjModel(V3d_TPM_SCREEN)
|
|
||||||
{
|
{
|
||||||
Handle(Visual3d_View) FromView = V->View() ;
|
Handle(Visual3d_View) FromView = V->View() ;
|
||||||
|
|
||||||
|
@ -957,7 +957,7 @@ Standard_Boolean Exist = Standard_False;
|
|||||||
|
|
||||||
#if defined(_WIN32) || defined(__WIN32__)
|
#if defined(_WIN32) || defined(__WIN32__)
|
||||||
const Handle(WNT_Window) THEWindow = Handle(WNT_Window)::DownCast (AWindow);
|
const Handle(WNT_Window) THEWindow = Handle(WNT_Window)::DownCast (AWindow);
|
||||||
int TheSpecifiedWindowId = int (THEWindow->HWindow ());
|
Aspect_Handle TheSpecifiedWindowId = THEWindow->HWindow ();
|
||||||
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
|
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
|
||||||
const Handle(Cocoa_Window) THEWindow = Handle(Cocoa_Window)::DownCast (AWindow);
|
const Handle(Cocoa_Window) THEWindow = Handle(Cocoa_Window)::DownCast (AWindow);
|
||||||
NSView* TheSpecifiedWindowId = THEWindow->HView();
|
NSView* TheSpecifiedWindowId = THEWindow->HView();
|
||||||
@ -974,7 +974,7 @@ Standard_Boolean Exist = Standard_False;
|
|||||||
const Handle(Aspect_Window) AspectWindow = (MyIterator.Value ())->Window ();
|
const Handle(Aspect_Window) AspectWindow = (MyIterator.Value ())->Window ();
|
||||||
#if defined(_WIN32) || defined(__WIN32__)
|
#if defined(_WIN32) || defined(__WIN32__)
|
||||||
const Handle(WNT_Window) theWindow = Handle(WNT_Window)::DownCast (AspectWindow);
|
const Handle(WNT_Window) theWindow = Handle(WNT_Window)::DownCast (AspectWindow);
|
||||||
int TheWindowIdOfView = int (theWindow->HWindow ());
|
Aspect_Handle TheWindowIdOfView = theWindow->HWindow ();
|
||||||
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
|
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
|
||||||
const Handle(Cocoa_Window) theWindow = Handle(Cocoa_Window)::DownCast (AspectWindow);
|
const Handle(Cocoa_Window) theWindow = Handle(Cocoa_Window)::DownCast (AspectWindow);
|
||||||
NSView* TheWindowIdOfView = theWindow->HView();
|
NSView* TheWindowIdOfView = theWindow->HView();
|
||||||
|
@ -294,6 +294,8 @@ void VrmlData_ShapeConvert::Convert (const Standard_Boolean theExtractFaces,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aTShapeNode.IsNull() == Standard_False) {
|
if (aTShapeNode.IsNull() == Standard_False) {
|
||||||
|
@ -202,6 +202,10 @@ static Standard_Integer loadvrml
|
|||||||
case VrmlData_NonPositiveSize: aStr = "NonPositiveSize"; break;
|
case VrmlData_NonPositiveSize: aStr = "NonPositiveSize"; break;
|
||||||
case VrmlData_ReadUnknownNode: aStr = "ReadUnknownNode"; break;
|
case VrmlData_ReadUnknownNode: aStr = "ReadUnknownNode"; break;
|
||||||
case VrmlData_NonSupportedFeature: aStr = "NonSupportedFeature"; break;
|
case VrmlData_NonSupportedFeature: aStr = "NonSupportedFeature"; break;
|
||||||
|
case VrmlData_OutputStreamUndefined:aStr = "OutputStreamUndefined"; break;
|
||||||
|
case VrmlData_NotImplemented: aStr = "NotImplemented"; break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if (aStr) {
|
if (aStr) {
|
||||||
di << " ++ VRML Error: " << aStr << " in line "
|
di << " ++ VRML Error: " << aStr << " in line "
|
||||||
|
@ -160,6 +160,9 @@ Standard_Boolean XmlMNaming_NamedShapeDriver::Paste
|
|||||||
case TNaming_SELECTED:
|
case TNaming_SELECTED:
|
||||||
aBld.Select(aNewShape, anOldShape);
|
aBld.Select(aNewShape, anOldShape);
|
||||||
break;
|
break;
|
||||||
|
case TNaming_REPLACE:
|
||||||
|
aBld.Modify(anOldShape,aNewShape);
|
||||||
|
break; // for compatibility
|
||||||
// case TNaming_REPLACE:
|
// case TNaming_REPLACE:
|
||||||
// aBld.Replace(anOldShape,aNewShape);
|
// aBld.Replace(anOldShape,aNewShape);
|
||||||
// break;
|
// break;
|
||||||
@ -248,7 +251,7 @@ static const XmlObjMgt_DOMString& EvolutionString(const TNaming_Evolution i)
|
|||||||
case TNaming_MODIFY : return ::EvolModifyString();
|
case TNaming_MODIFY : return ::EvolModifyString();
|
||||||
case TNaming_DELETE : return ::EvolDeleteString();
|
case TNaming_DELETE : return ::EvolDeleteString();
|
||||||
case TNaming_SELECTED : return ::EvolSelectedString();
|
case TNaming_SELECTED : return ::EvolSelectedString();
|
||||||
// case TNaming_REPLACE : return ::EvolReplaceString();
|
case TNaming_REPLACE : return ::EvolModifyString(); // case TNaming_REPLACE : return ::EvolReplaceString(); for compatibility
|
||||||
default:
|
default:
|
||||||
Standard_DomainError::Raise("TNaming_Evolution; enum term unknown");
|
Standard_DomainError::Raise("TNaming_Evolution; enum term unknown");
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include <Standard_Integer.hxx>
|
#include <Standard_Integer.hxx>
|
||||||
|
|
||||||
// macro to get size of C array
|
// macro to get size of C array
|
||||||
#define CARRAY_LENGTH(arr) (sizeof(arr)/sizeof(arr[0]))
|
#define CARRAY_LENGTH(arr) (int)(sizeof(arr)/sizeof(arr[0]))
|
||||||
|
|
||||||
void math_DoubleTab::Allocate()
|
void math_DoubleTab::Allocate()
|
||||||
{
|
{
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include <Standard_Failure.hxx>
|
#include <Standard_Failure.hxx>
|
||||||
|
|
||||||
// macro to get size of C array
|
// macro to get size of C array
|
||||||
#define CARRAY_LENGTH(arr) (sizeof(arr)/sizeof(arr[0]))
|
#define CARRAY_LENGTH(arr) (int)(sizeof(arr)/sizeof(arr[0]))
|
||||||
|
|
||||||
math_SingleTab::math_SingleTab(const Standard_Integer LowerIndex,
|
math_SingleTab::math_SingleTab(const Standard_Integer LowerIndex,
|
||||||
const Standard_Integer UpperIndex) :
|
const Standard_Integer UpperIndex) :
|
||||||
|
Loading…
x
Reference in New Issue
Block a user