mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-03 14:10:33 +03:00
Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ee9138a859 |
@@ -2708,14 +2708,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
|
||||
TopoDS_Edge aLocalEdge = edgesau;
|
||||
if (edgesau.Orientation() != orient)
|
||||
aLocalEdge.Reverse();
|
||||
C2dint1 = BRep_Tool::CurveOnSurface(aLocalEdge, Face[0], ubid, vbid);
|
||||
|
||||
if (C2dint1.IsNull())
|
||||
{
|
||||
//std::swap(Face[0], facesau);
|
||||
C2dint1 = BRep_Tool::CurveOnSurface(aLocalEdge, facesau, ubid, vbid);
|
||||
|
||||
}
|
||||
C2dint1 = BRep_Tool::CurveOnSurface(aLocalEdge,Face[0],ubid,vbid);
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -2725,7 +2718,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
|
||||
//// for periodic 3d curves ////
|
||||
if (cad.IsPeriodic())
|
||||
{
|
||||
gp_Pnt2d P2d = BRep_Tool::Parameters(Vtx, facesau);
|
||||
gp_Pnt2d P2d = BRep_Tool::Parameters( Vtx, Face[0] );
|
||||
Geom2dAPI_ProjectPointOnCurve Projector( P2d, C2dint1 );
|
||||
par = Projector.LowerDistanceParameter();
|
||||
Standard_Real shift = par-ParVtx;
|
||||
|
@@ -18,7 +18,6 @@
|
||||
#include <Standard_OutOfMemory.hxx>
|
||||
#include <Standard_OutOfRange.hxx>
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
|
||||
//! Defines an array of values of configurable size.
|
||||
//! For instance, this class allows defining an array of 32-bit or 64-bit integer values with bitness determined in runtime.
|
||||
@@ -64,7 +63,7 @@ public:
|
||||
}
|
||||
|
||||
//! Move constructor
|
||||
NCollection_AliasedArray (NCollection_AliasedArray&& theOther) Standard_Noexcept
|
||||
NCollection_AliasedArray (NCollection_AliasedArray&& theOther) noexcept
|
||||
: myData (theOther.myData), myStride (theOther.myStride), mySize (theOther.mySize), myDeletable (theOther.myDeletable)
|
||||
{
|
||||
theOther.myDeletable = false;
|
||||
|
@@ -17,7 +17,6 @@
|
||||
#include <NCollection_AliasedArray.hxx>
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <gp_Vec3f.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
|
||||
//! Defines an array of 3D nodes of single/double precision configurable at construction time.
|
||||
class Poly_ArrayOfNodes : public NCollection_AliasedArray<>
|
||||
@@ -86,14 +85,14 @@ public:
|
||||
Poly_ArrayOfNodes& operator= (const Poly_ArrayOfNodes& theOther) { return Assign (theOther); }
|
||||
|
||||
//! Move constructor
|
||||
Poly_ArrayOfNodes (Poly_ArrayOfNodes&& theOther) Standard_Noexcept
|
||||
Poly_ArrayOfNodes (Poly_ArrayOfNodes&& theOther) noexcept
|
||||
: NCollection_AliasedArray (std::move (theOther))
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
//! Move assignment operator; @sa Move()
|
||||
Poly_ArrayOfNodes& operator= (Poly_ArrayOfNodes&& theOther) Standard_Noexcept
|
||||
Poly_ArrayOfNodes& operator= (Poly_ArrayOfNodes&& theOther) noexcept
|
||||
{
|
||||
return Move (theOther);
|
||||
}
|
||||
|
@@ -17,7 +17,6 @@
|
||||
#include <NCollection_AliasedArray.hxx>
|
||||
#include <gp_Pnt2d.hxx>
|
||||
#include <gp_Vec2f.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
|
||||
//! Defines an array of 2D nodes of single/double precision configurable at construction time.
|
||||
class Poly_ArrayOfUVNodes : public NCollection_AliasedArray<>
|
||||
@@ -86,14 +85,14 @@ public:
|
||||
Poly_ArrayOfUVNodes& operator= (const Poly_ArrayOfUVNodes& theOther) { return Assign (theOther); }
|
||||
|
||||
//! Move constructor
|
||||
Poly_ArrayOfUVNodes (Poly_ArrayOfUVNodes&& theOther) Standard_Noexcept
|
||||
Poly_ArrayOfUVNodes (Poly_ArrayOfUVNodes&& theOther) noexcept
|
||||
: NCollection_AliasedArray (std::move (theOther))
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
//! Move assignment operator; @sa Move()
|
||||
Poly_ArrayOfUVNodes& operator= (Poly_ArrayOfUVNodes&& theOther) Standard_Noexcept
|
||||
Poly_ArrayOfUVNodes& operator= (Poly_ArrayOfUVNodes&& theOther) noexcept
|
||||
{
|
||||
return Move (theOther);
|
||||
}
|
||||
|
@@ -18,7 +18,6 @@
|
||||
#include <Standard_Std.hxx>
|
||||
#include <Standard_Stream.hxx>
|
||||
#include <Standard_Transient.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
|
||||
class Standard_Transient;
|
||||
|
||||
@@ -72,7 +71,7 @@ namespace opencascade {
|
||||
}
|
||||
|
||||
//! Move constructor
|
||||
handle (handle&& theHandle) Standard_Noexcept : entity(theHandle.entity)
|
||||
handle (handle&& theHandle) noexcept : entity(theHandle.entity)
|
||||
{
|
||||
theHandle.entity = 0;
|
||||
}
|
||||
@@ -113,7 +112,7 @@ namespace opencascade {
|
||||
}
|
||||
|
||||
//! Move operator
|
||||
handle& operator= (handle&& theHandle) Standard_Noexcept
|
||||
handle& operator= (handle&& theHandle) noexcept
|
||||
{
|
||||
std::swap (this->entity, theHandle.entity);
|
||||
return *this;
|
||||
|
@@ -315,21 +315,5 @@
|
||||
#define Standard_ATOMIC(theType) theType
|
||||
#endif
|
||||
|
||||
//! @def Standard_Noexcept
|
||||
//! Definition of Standard_Noexcept:
|
||||
//! if noexcept is accessible, Standard_Noexcept is "noexcept" and "throw()" otherwise.
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER >= 1900
|
||||
#define Standard_Noexcept noexcept
|
||||
#else
|
||||
#define Standard_Noexcept throw()
|
||||
#endif
|
||||
#else
|
||||
#if __cplusplus >= 201103L
|
||||
#define Standard_Noexcept noexcept
|
||||
#else
|
||||
#define Standard_Noexcept throw()
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@@ -26,7 +26,6 @@
|
||||
#include <Standard_Real.hxx>
|
||||
#include <Standard_OStream.hxx>
|
||||
#include <Standard_IStream.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
class TCollection_ExtendedString;
|
||||
|
||||
//! Class defines a variable-length sequence of 8-bit characters.
|
||||
@@ -75,7 +74,7 @@ public:
|
||||
Standard_EXPORT TCollection_AsciiString(const TCollection_AsciiString& astring);
|
||||
|
||||
//! Move constructor
|
||||
TCollection_AsciiString (TCollection_AsciiString&& theOther) Standard_Noexcept
|
||||
TCollection_AsciiString (TCollection_AsciiString&& theOther) noexcept
|
||||
: mystring (theOther.mystring),
|
||||
mylength (theOther.mylength)
|
||||
{
|
||||
@@ -277,7 +276,7 @@ void operator = (const TCollection_AsciiString& fromwhere)
|
||||
Standard_EXPORT void Swap (TCollection_AsciiString& theOther);
|
||||
|
||||
//! Move assignment operator
|
||||
TCollection_AsciiString& operator= (TCollection_AsciiString&& theOther) Standard_Noexcept { Swap (theOther); return *this; }
|
||||
TCollection_AsciiString& operator= (TCollection_AsciiString&& theOther) noexcept { Swap (theOther); return *this; }
|
||||
|
||||
//! Frees memory allocated by AsciiString.
|
||||
Standard_EXPORT ~TCollection_AsciiString();
|
||||
|
@@ -31,7 +31,6 @@
|
||||
#include <Standard_Real.hxx>
|
||||
#include <Standard_OStream.hxx>
|
||||
#include <Standard_PCharacter.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
class TCollection_AsciiString;
|
||||
|
||||
|
||||
@@ -99,7 +98,7 @@ public:
|
||||
Standard_EXPORT TCollection_ExtendedString(const TCollection_ExtendedString& astring);
|
||||
|
||||
//! Move constructor
|
||||
TCollection_ExtendedString (TCollection_ExtendedString&& theOther) Standard_Noexcept
|
||||
TCollection_ExtendedString (TCollection_ExtendedString&& theOther) noexcept
|
||||
: mystring (theOther.mystring),
|
||||
mylength (theOther.mylength)
|
||||
{
|
||||
@@ -154,7 +153,7 @@ void operator = (const TCollection_ExtendedString& fromwhere)
|
||||
Standard_EXPORT void Swap (TCollection_ExtendedString& theOther);
|
||||
|
||||
//! Move assignment operator
|
||||
TCollection_ExtendedString& operator= (TCollection_ExtendedString&& theOther) Standard_Noexcept { Swap (theOther); return *this; }
|
||||
TCollection_ExtendedString& operator= (TCollection_ExtendedString&& theOther) noexcept { Swap (theOther); return *this; }
|
||||
|
||||
//! Frees memory allocated by ExtendedString.
|
||||
Standard_EXPORT ~TCollection_ExtendedString();
|
||||
|
@@ -21,7 +21,6 @@
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Standard_Macro.hxx>
|
||||
class TopLoc_SListNodeOfItemLocation;
|
||||
class TopLoc_ItemLocation;
|
||||
|
||||
@@ -70,13 +69,13 @@ public:
|
||||
}
|
||||
|
||||
//! Move constructor
|
||||
TopLoc_SListOfItemLocation (TopLoc_SListOfItemLocation&& theOther) Standard_Noexcept
|
||||
TopLoc_SListOfItemLocation (TopLoc_SListOfItemLocation&& theOther) noexcept
|
||||
: myNode(std::move (theOther.myNode))
|
||||
{
|
||||
}
|
||||
|
||||
//! Move operator
|
||||
TopLoc_SListOfItemLocation& operator= (TopLoc_SListOfItemLocation&& theOther) Standard_Noexcept
|
||||
TopLoc_SListOfItemLocation& operator= (TopLoc_SListOfItemLocation&& theOther) noexcept
|
||||
{
|
||||
myNode = std::move (theOther.myNode);
|
||||
return *this;
|
||||
|
@@ -1,13 +0,0 @@
|
||||
puts "========"
|
||||
puts "0026920: BRepBuidlerAPI_MakeFillet crash 2"
|
||||
puts "========"
|
||||
|
||||
restore C:/WORK/opencascade/bugs/CR26920/bug26920.brep b1
|
||||
explode b1 e
|
||||
fillet result b1 0.25 b1_15
|
||||
|
||||
checkprops result -s 1653.78
|
||||
checkshape result
|
||||
|
||||
checknbshapes result -vertex 20 -edge 31 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 80
|
||||
checkview -display result -2d -path ${imagedir}/${test_image}.png
|
30
tests/bugs/modalg_8/bug32670
Normal file
30
tests/bugs/modalg_8/bug32670
Normal file
@@ -0,0 +1,30 @@
|
||||
puts "=================================="
|
||||
puts "OCC32670: BOP fuse unstable result"
|
||||
puts "=================================="
|
||||
puts ""
|
||||
|
||||
restore [locate_data_file bug32670.brep] Curve_parabolic
|
||||
ellipse ell 0 0 0 0 0 1 1.6285714285714286 1.6285714285714286
|
||||
mkedge ee ell
|
||||
wire ww ee
|
||||
pipe Pipe_1 ww Curve_parabolic
|
||||
ssolid Pipe_1 a
|
||||
pcylinder b 7 10
|
||||
explode a f
|
||||
explode b f
|
||||
donly a_7 b_1
|
||||
|
||||
bop a_7 b_1
|
||||
bopsection result
|
||||
|
||||
checknbshapes result -t -vertex 10 -edge 7
|
||||
|
||||
set tolres [checkmaxtol result]
|
||||
|
||||
if { ${tolres} > 0.0016} {
|
||||
puts "Error: bad tolerance of result"
|
||||
}
|
||||
|
||||
checkprops result -l 26.7184
|
||||
|
||||
checkview -display result -2d -path ${imagedir}/${test_image}.png
|
Reference in New Issue
Block a user