ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 01:10:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation error and some warnings

Browse Source
This commit is contained in:
eap 2017-12-22 13:35:52 +03:00
parent 939f3cca95
commit 693e5f65fe
30 changed files with 132 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AdvancedEngine/AdvancedEngine_IOperations.cxx
View File

@ -284,8 +284,6 @@ bool AdvancedEngine_IOperations::MakeGroups(Handle(GEOM_Object) theShape, int sh
return false;
}
gp_Trsf aTrsfInv = aTrsf.Inverted();
// int expectedGroups = 0;
// if (shapeType == TSHAPE_BASIC)
// if (Abs(theR2+theW2-theR1-theW1) <= Precision::Approximation())
@ -620,6 +618,7 @@ bool AdvancedEngine_IOperations::MakeGroups(Handle(GEOM_Object) theShape, int sh
if (aGroup.IsNull())
continue;
gp_Trsf aTrsfInv = aTrsf.Inverted();
TopoDS_Shape aGroupShape = aGroup->GetValue();
BRepBuilderAPI_Transform aTransformationShapeInv (aGroupShape, aTrsfInv, Standard_False);
TopoDS_Shape aGroupShapeTrsfInv = aTransformationShapeInv.Shape();

2
src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx
View File

@ -312,7 +312,7 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakePipeTShape (const double r1, c
gp_Pnt aP0 (0, 0, 0);
gp_Pnt aP1 (-l1, 0, 0);
gp_Vec aVX = gp::DX(), aVY = gp::DY(), aVZ = gp::DZ();
gp_Vec aVX = gp::DX(), aVZ = gp::DZ();
gp_Ax2 anAxes1 (aP1, aVX, aVZ);
gp_Ax2 anAxes2 (aP0, aVZ, aVX);

4
src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx
View File

@ -254,10 +254,6 @@ GetCreationInformation(std::string& theOperationName,
for ( int i = 1, nb = aCI.GetLength(); i <= nb; ++i )
theParams[0] << aCI.GetPntOrComp( i ) << " ";
const Standard_Integer aNbMax = aCI.GetNbMax();
const Standard_Integer aDegMax = aCI.GetDegMax();
const Standard_Real aDMax = aCI.GetDMax();
AddParam(theParams, "Max nbr of Bezier pieces", aCI.GetNbMax());
AddParam(theParams, "Max BSpline surface degree", aCI.GetDegMax());
AddParam(theParams, "3D tolerance of initial approximation", aCI.GetDMax());

14
src/GEOMAlgo/GEOMAlgo_Extractor.cxx
View File

@ -546,15 +546,15 @@ void GEOMAlgo_Extractor::processFOrSo(const TopoDS_Shape &theFOrSo)
TopTools_ListOfShape aClosedSubShapes;
TopTools_ListOfShape aNewShapes;
TopoDS_Shape anOuterSubShape;
TopAbs_ShapeEnum aShapeType;
//TopAbs_ShapeEnum aShapeType;
TopAbs_ShapeEnum aSubShapeType;
if (theFOrSo.ShapeType() == TopAbs_FACE) {
aShapeType = TopAbs_FACE;
//aShapeType = TopAbs_FACE;
aSubShapeType = TopAbs_WIRE;
anOuterSubShape = BRepTools::OuterWire(TopoDS::Face(theFOrSo));
} else {
aShapeType = TopAbs_SOLID;
//aShapeType = TopAbs_SOLID;
aSubShapeType = TopAbs_SHELL;
anOuterSubShape = BRepClass3d::OuterShell(TopoDS::Solid(theFOrSo));
}
@ -675,14 +675,14 @@ void GEOMAlgo_Extractor::processShOrCS(const TopoDS_Shape &theShOrCS)
TopTools_ListOfShape aNewSubShapes;
TopTools_ListOfShape aNewOtherShapes;
TopAbs_ShapeEnum aSubShapeType;
TopAbs_ShapeEnum aSubSubShapeType;
//TopAbs_ShapeEnum aSubSubShapeType;
if (theShOrCS.ShapeType() == TopAbs_SHELL) {
aSubShapeType = TopAbs_FACE;
aSubSubShapeType = TopAbs_EDGE;
//aSubSubShapeType = TopAbs_EDGE;
} else { // comp-solid
aSubShapeType = TopAbs_SOLID;
aSubSubShapeType = TopAbs_FACE;
//aSubSubShapeType = TopAbs_FACE;
}
for (; anIter.More(); anIter.Next()) {
@ -1098,7 +1098,7 @@ void GEOMAlgo_Extractor::makeHistory(const TopoDS_Shape &theShape,
getModified(theShape, aListModif, theShape.ShapeType());
Standard_Boolean isModif = !aListModif.IsEmpty();
const TopAbs_ShapeEnum aType = theShape.ShapeType();
//const TopAbs_ShapeEnum aType = theShape.ShapeType();
if (isModif) {
// Add the new shapes.

3
src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
View File

@ -594,7 +594,7 @@ void GEOMAlgo_FinderShapeOn2::ProcessSolids()
void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Face& aF,
GEOMAlgo_ListOfPnt& aLP)
{
Standard_Integer j, j1, j2, k, n[4], aNbLinks, aNx, aNb, iCnt;//, aNbMax, *pIds;
Standard_Integer j, j1, j2, k, n[4], aNx, aNb, iCnt;//, aNbLinks, aNbMax, *pIds;
TopLoc_Location aLoc;
Handle(Poly_Triangulation) aTRF;
TColStd_MapOfInteger aMBN;
@ -641,7 +641,6 @@ void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Face& aF,
}
//
// boundary nodes aMBN
aNbLinks=aMPKI.Extent();
aIt.Initialize(aMPKI);
for (; aIt.More(); aIt.Next()) {
iCnt=aIt.Value();

2
src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx
View File

@ -321,7 +321,7 @@ Standard_Boolean GEOMAlgo_GetInPlaceAPI::GetInPlaceByHistory
}
// try to find in history
TDF_Label aHistoryLabel = theWhereFunction->GetHistoryEntry(Standard_False);
//TDF_Label aHistoryLabel = theWhereFunction->GetHistoryEntry(Standard_False);
// search in history for all argument shapes
Standard_Boolean isFound = Standard_False;

4
src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx
View File

@ -92,7 +92,7 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1,
{
Standard_Boolean bOk;
Standard_Integer iErr;
Standard_Real aTol2;
//Standard_Real aTol2;
TopAbs_ShapeEnum aType1, aType2;
TopAbs_State aState;
gp_Pnt aP1, aP2;
@ -101,7 +101,7 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1,
//
iErr=0;
bOk=Standard_False;
aTol2=myTolerance*myTolerance;
//aTol2=myTolerance*myTolerance;
aType1=aS1.ShapeType();
aType2=aS2.ShapeType();
//

4
src/GEOMAlgo/GEOMAlgo_Gluer.cxx
View File

@ -908,9 +908,9 @@ void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE,
Standard_Real aTol;
BRep_Builder aBB;
TopoDS_Edge E;
TopAbs_Orientation anOrE;
//TopAbs_Orientation anOrE;
//
anOrE=aE.Orientation();
//anOrE=aE.Orientation();
aTol=BRep_Tool::Tolerance(aE);
//
E=aEx;

3
src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx
View File

@ -65,7 +65,7 @@ static
void GEOMAlgo_Gluer2::Detect()
{
Standard_Boolean bCheckGeometry;
Standard_Integer iErr, aNbSD;
Standard_Integer iErr;
TopTools_ListIteratorOfListOfShape aItLS;
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape aItDMSLS;
//GEOMAlgo_GlueDetector aDetector;
@ -106,7 +106,6 @@ void GEOMAlgo_Gluer2::Detect()
for (; aItDMSLS.More(); aItDMSLS.Next()) {
const TopoDS_Shape& aSkey=aItDMSLS.Key();
const TopTools_ListOfShape& aLSD=aItDMSLS.Value();
aNbSD=aLSD.Extent();
myImagesDetected.Bind(aSkey, aLSD);
}
//

6
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
View File

@ -559,7 +559,7 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Face& aF,
const gp_Cylinder& aCyl)
{
Standard_Integer i, aNbV, aNbE, aNbCE, aNbSE;
Standard_Integer aNbV, aNbE, aNbCE, aNbSE;
Standard_Real aT0, aT1, aHeight;
gp_Pnt aPC[3], aPc;
TopoDS_Edge aE;
@ -578,7 +578,6 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Face& aF,
const gp_Dir& aDir=aAx1.Direction();
const gp_Pnt& aPLoc=aAx1.Location();
//
i=0;
aNbCE=0;
aNbSE=0;
aExp.Init(aF, TopAbs_EDGE);
@ -795,7 +794,7 @@ Standard_Boolean GEOMAlgo_ShapeInfoFiller::TreatStepSphere
{
Standard_Boolean bRet, bIsAllowedType, bOnlyClosed, bIsEqual;
Standard_Integer j;
Standard_Real aTolAng, aTol;
Standard_Real aTol;
Standard_Real aVolume, aVolumeS, dV, aArea, aAreaS, dA;
gp_Sphere aSphere[2];
GeomAbs_SurfaceType aST;
@ -805,7 +804,6 @@ Standard_Boolean GEOMAlgo_ShapeInfoFiller::TreatStepSphere
//
bRet=Standard_False;
aTol=Precision::Confusion();
aTolAng=Precision::Angular();
//
aExp.Init(aSd, TopAbs_FACE);
for (j=0; aExp.More(); aExp.Next(), ++j) {

2
src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx
View File

@ -163,7 +163,7 @@ Standard_Boolean GEOMAlgo_SurfaceTools::IsCoaxial
if (fabs(aRadius1 - aRadius2) <= aTol) {
// Check the deflection of the middle point.
gp_XYZ aMidP = 0.5*(aDP1 + aDP2);
//gp_XYZ aMidP = 0.5*(aDP1 + aDP2);
//Standard_Real aMidRadius1 = aMidP.Modulus();
if (fabs(aRadius1 - aRadius2) <= aTol) {

4
src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
View File

@ -119,7 +119,7 @@ void GEOMAlgo_VertexSolid::Perform()
//=======================================================================
void GEOMAlgo_VertexSolid::BuildResult()
{
Standard_Integer i, iBeg, iEnd, aNbVV, aNbVE, aNbVF, j, iFound, aNbRanges;
Standard_Integer i, iBeg, iEnd, aNbVV, aNbVE, aNbVF, j, iFound;//, aNbRanges;
Standard_Real aTol;
TopAbs_State aSt;
TopAbs_ShapeEnum aType;
@ -145,7 +145,7 @@ void GEOMAlgo_VertexSolid::BuildResult()
Handle(IntTools_Context) aCtx=myDSFiller->Context();
BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid);
//
aNbRanges=aDS.NbRanges();
//aNbRanges=aDS.NbRanges();
const BOPDS_IndexRange& aRange=aDS.Range(myRank);
aRange.Indices(iBeg, iEnd);
//

2
src/GEOMGUI/GEOMGUI_DimensionProperty.cxx
View File

@ -727,7 +727,7 @@ GEOMGUI_DimensionProperty::operator QString() const
aStringValues.remove("\\");
int it = 0;
size_t it = 0;
for ( ; it < aPacked.size(); ++it )
{
int aNextPos = aStringValues.indexOf("(.*)");

2
src/GEOMGUI/GeometryGUI.cxx
View File

@ -2815,7 +2815,7 @@ void GeometryGUI::preferencesChanged( const QString& section, const QString& par
param == QString("scalar_bar_height") ||
param == QString("scalar_bar_text_height") ||
param == QString("scalar_bar_nb_intervals")) {
if( SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) )
if( /*SalomeApp_Study* aStudy = */dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) )
{
updateFieldColorScale();
}

2
src/GEOMImpl/GEOMImpl_FillingDriver.cxx
View File

@ -317,7 +317,7 @@ Standard_Integer GEOMImpl_FillingDriver::Execute(Handle(TFunction_Logbook)& log)
Handle(TColStd_HSequenceOfTransient) aConstraints = IF.GetShapes();
for ( unsigned int ind = 1; ind <= aConstraints->Length(); ind++ ) {
for ( int ind = 1; ind <= aConstraints->Length(); ind++ ) {
TopoDS_Edge E;
TopoDS_Face F;
Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast( aConstraints->Value(ind) );

4
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -281,8 +281,8 @@ int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTe
std::list<std::string>::const_iterator it;
for (it = lines.begin(); it != lines.end(); ++it) {
std::string line = *it;
int lenline = (line.size()/8 + (line.size()%8 ? 1 : 0)) * 8;
for (int i = 0; i < lenline/8; i++) {
size_t lenline = (line.size()/8 + (line.size()%8 ? 1 : 0)) * 8;
for (size_t i = 0; i < lenline/8; i++) {
unsigned char byte = 0;
for (int j = 0; j < 8; j++)
byte = (byte << 1) + ( i*8+j < line.size() && line[i*8+j] != '0' ? 1 : 0 );

1
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -736,6 +736,7 @@ GEOMImpl_IMeasureOperations::ShapeKind GEOMImpl_IMeasureOperations::KindOfShape
theDoubles->Append(aP.Z());
}
break;
default:;
}
SetErrorCode(OK);

8
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -1451,12 +1451,11 @@ GEOMImpl_IShapesOperations::GetExistingSubObjects(Handle(GEOM_Object) theShap
bool isGroup = anObj->IsKind(STANDARD_TYPE(GEOM_Object)) && anObj->GetType() == GEOM_GROUP;
bool isSubShape = anObj->IsKind(STANDARD_TYPE(GEOM_Object)) && anObj->GetType() != GEOM_GROUP;
bool isField = anObj->IsKind(STANDARD_TYPE(GEOM_Field));
if (theTypes & Groups && isGroup ||
theTypes & SubShapes && isSubShape ||
theTypes & Fields && isField) {
if ((theTypes & Groups && isGroup ) ||
(theTypes & SubShapes && isSubShape ) ||
(theTypes & Fields && isField ))
aSeq->Append(anObj);
}
}
delete [] anEntryStr;
}
@ -4464,7 +4463,6 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace (Handle(GEOM_Object)
if (aShapeResult.IsNull() == Standard_False) {
TopoDS_Iterator anIt(aShapeResult);
Standard_Boolean isFirst = Standard_True;
for (; anIt.More(); anIt.Next()) {
const TopoDS_Shape &aPart = anIt.Value();

4
src/GEOMImpl/GEOMImpl_OffsetDriver.cxx
View File

@ -175,8 +175,8 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(Handle(TFunction_Logbook)& log)
}
// Create a hollowed solid.
BRepOffsetAPI_MakeThickSolid aMkSolid
(aShapeBase, aFacesToRm, anOffset, aTol, BRepOffset_Skin,
BRepOffsetAPI_MakeThickSolid aMkSolid;
aMkSolid.MakeThickSolidByJoin (aShapeBase, aFacesToRm, anOffset, aTol, BRepOffset_Skin,
Standard_False, Standard_False, GeomAbs_Intersection);
if (aMkSolid.IsDone()) {

2
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
View File

@ -1288,7 +1288,7 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections
}
// Fill the groups.
Handle(TColStd_HArray1OfInteger) aGroupIds[5];
//Handle(TColStd_HArray1OfInteger) aGroupIds[5];
TopTools_IndexedMapOfShape anIndices;
const TopoDS_Shape aResult = aBuilder.Shape();

10
src/GEOMImpl/GEOMImpl_SplineDriver.cxx
View File

@ -374,11 +374,11 @@ GetCreationInformation(std::string& theOperationName,
{
Handle(TColStd_HArray1OfReal) coords = aCI.GetCoordinates();
GEOM_Param& pntParam = AddParam( theParams, "Points");
pntParam << ( coords->Length() ) / 3 << " points: ";
for ( int i = coords->Lower(), nb = coords->Upper(); i <= nb; )
pntParam << "( " << coords->Value( i++ )
<< ", " << coords->Value( i++ )
<< ", " << coords->Value( i++ ) << " ) ";
pntParam << ( coords->Length() / 3 ) << " points: ";
for ( int i = coords->Lower(), nb = coords->Upper(); i <= nb; i += 3 )
pntParam << "( " << coords->Value( i+0 )
<< ", " << coords->Value( i+1 )
<< ", " << coords->Value( i+2 ) << " ) ";
}
else
{

2
src/GEOM_I/GEOM_IInsertOperations_i.cc
View File

@ -210,7 +210,7 @@ CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Lo
if ( theTexture.length() > 0 ) {
aTexture = new TColStd_HArray1OfByte (1, theTexture.length());
for ( int i = 0; i < theTexture.length(); i++ )
for ( CORBA::ULong i = 0; i < theTexture.length(); i++ )
aTexture->SetValue( i+1, (Standard_Byte)theTexture[i] );
}
return GetOperations()->AddTexture( theWidth, theHeight, aTexture );

6
src/GEOM_I/GEOM_IMeasureOperations_i.cc
View File

@ -936,7 +936,7 @@ GEOM::ListOfBool* GEOM_IMeasureOperations_i::AreCoordsInside (GEOM::GEOM_Object_
//Set a not done flag
GetOperations()->SetNotDone();
unsigned int nb_points = theCoords.length()/3;
int nb_points = theCoords.length()/3;
GEOM::ListOfBool_var aResults = new GEOM::ListOfBool;
aResults->length(nb_points);
@ -947,8 +947,8 @@ GEOM::ListOfBool* GEOM_IMeasureOperations_i::AreCoordsInside (GEOM::GEOM_Object_
for (int i = 0; i < 3*nb_points; i++)
tmp[i] = theCoords[i];
std::vector<bool> res = GetOperations()->AreCoordsInside(aShape, tmp, tolerance);
for (int i = 0; i < nb_points; i++)
aResults[i] = i < res.size() ? res[i] : false;
for (int i = 0, resSize = res.size(); i < nb_points; i++)
aResults[i] = i < resSize ? res[i] : false;
return aResults._retn();
}

7
src/GEOM_I/GEOM_IShapesOperations_i.cc
View File

@ -323,7 +323,7 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceWithConstraints
//Get the shapes
std::list<Handle(::GEOM_Object)> aConstraints;
for( int ind = 0; ind < theConstraints.length(); ind++ ) {
for( CORBA::ULong ind = 0; ind < theConstraints.length(); ind++ ) {
Handle(::GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] );
aConstraints.push_back(anObject);
}
@ -906,7 +906,6 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t
const GEOM::ListOfLong& theIndices)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
Standard_Integer i;
//Set a not done flag
GetOperations()->SetNotDone();
@ -918,7 +917,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger (1, theIndices.length());
for (i = 0; i < theIndices.length(); i++)
for (CORBA::ULong i = 0; i < theIndices.length(); i++)
anArray->SetValue(i+1, theIndices[i]);
Handle(TColStd_HSequenceOfTransient) aHSeq = GetOperations()->MakeSubShapes(aShape, anArray);
@ -927,7 +926,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (i = 0; i < aLength; i++)
for (int i = 0; i < aLength; i++)
aSeq[i] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i+1)));
return aSeq._retn();

4
src/GEOM_I_Superv/GEOM_Superv_i.cc
View File

@ -2064,7 +2064,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShape (GEOM::GEOM_Object_ptr theObjec
beginService( " GEOM_Superv_i::OffsetShape" );
MESSAGE("GEOM_Superv_i::OffsetShape");
getTransfOp();
GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShape(theObject, theOffset);
GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShape(theObject, theOffset, true);
endService( " GEOM_Superv_i::OffsetShape" );
return anObj;
}
@ -2078,7 +2078,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShapeCopy (GEOM::GEOM_Object_ptr theO
beginService( " GEOM_Superv_i::OffsetShapeCopy" );
MESSAGE("GEOM_Superv_i::OffsetShapeCopy");
getTransfOp();
GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShapeCopy(theObject, theOffset);
GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShapeCopy(theObject, theOffset, true);
endService( " GEOM_Superv_i::OffsetShapeCopy" );
return anObj;
}

2
src/IGESPlugin/IGESPlugin_GUI.cxx
View File

@ -96,7 +96,7 @@ bool IGESPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* pare
getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) );
}
return true;
return true; // ?????????????
}
//=======================================================================

17
src/OBJECT/GEOM_Actor.cxx
View File

@ -111,20 +111,21 @@ GEOM_Actor::GEOM_Actor():
myShadingFaceSource(GEOM_ShadingFace::New(),true),
myHighlightActor(GEOM_DeviceActor::New(),true),
myAppendFilter(vtkAppendPolyData::New(),true),
// Use mapper as an instance of GEOM_PainterPolyDataMapper class
// to prevent drawing of mappers' content (due to an empty definition
// of GEOM_PainterPolyDataMapper::RenderPiece(...)).
// !!! Presentation of GEOM_Actor is drawing only with help of actors
// defined in this class !!!
myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true),
myTextActor( vtkTextActor::New() ),
myHighlightProp(vtkProperty::New()),
myPreHighlightProp(vtkProperty::New()),
myShadingFaceProp(vtkProperty::New()),
myShadingBackFaceProp(vtkProperty::New())
myShadingBackFaceProp(vtkProperty::New()),
myAppendFilter(vtkAppendPolyData::New(),true),
// Use mapper as an instance of GEOM_PainterPolyDataMapper class
// to prevent drawing of mappers' content (due to an empty definition
// of GEOM_PainterPolyDataMapper::RenderPiece(...)).
// !!! Presentation of GEOM_Actor is drawing only with help of actors
// defined in this class !!!
myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true)
{
#ifdef MYDEBUG
MESSAGE (this<< " GEOM_Actor::GEOM_Actor");

13
src/OBJECT/GEOM_OCCReader.cxx
View File

@ -484,6 +484,7 @@ void GEOM_OCCReader::DrawIso(GeomAbs_IsoType T,
case GeomAbs_Hyperbola :
case GeomAbs_BezierCurve :
case GeomAbs_BSplineCurve :
case GeomAbs_OffsetCurve:
case GeomAbs_OtherCurve :
for (j = 1; j <= myDiscret/2; j++) {
@ -558,9 +559,8 @@ void GEOM_OCCReader::PlotIso (BRepAdaptor_Surface& S,
void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
vtkPoints* Pts,
vtkCellArray* Cells) {
vtkCellArray* Cells)
{
Handle(Poly_PolygonOnTriangulation) aEdgePoly;
Standard_Integer i = 1;
Handle(Poly_Triangulation) T;
@ -787,10 +787,11 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& aVertex,
vtkPoints* Pts,
vtkCellArray* Cells) {
#define ZERO_COORD coord[0] = 0.0; coord[1] = 0.0; coord[2] = 0.0
vtkCellArray* Cells)
{
#define ZERO_COORD coord[0] = coord[1] = coord[2] = 0.0
gp_Pnt P = BRep_Tool::Pnt( aVertex );
// gp_Pnt P = BRep_Tool::Pnt( aVertex ); ??????????????????????????
float delta = 1, coord[3];
vtkIdType pts[2];
// insert pt

2
src/STLPlugin/STLPlugin_GUI.cxx
View File

@ -96,7 +96,7 @@ bool STLPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* paren
getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) );
}
return true;
return true; // ?????????
}
//=======================================================================

2
src/VTKPlugin/VTKPlugin_GUI.cxx
View File

@ -89,7 +89,7 @@ bool VTKPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* paren
getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) );
}
return true;
return true; // ???????????
}
//=======================================================================