OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0026245: Unable to write SAT file by default

Browse Source 
XSAlgo_AlgoContainer is corrected to return original shape if Shape Processing fails.
Handling of situation of absence of defined operator sequence is corrected to apply DirectFaces operator by default on writing, regardless of target format.
ShapeProcess is corrected to output warning if operator sequence is not defined in resource file, and to continue if one operator in sequence has failed.
Message names are made more meaningful.
This commit is contained in:
abv 2015-08-31 07:00:57 +03:00 committed by bugmaster
parent 00de4faf11
commit 881536e20e
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SHMessage/SHAPE.fr
View File

@ -25,19 +25,19 @@
! ------------------------------------------------------------------------------ ! ------------------------------------------------------------------------------
! Messages for sequence of operators ! Messages for sequence of operators
! !
.Sequence.MSG0 .SP.Sequence.Info.Seq
Sequence d'operateurs: %s Sequence d'operateurs: %s
! !
.Sequence.MSG5 .SP.Sequence.Info.Operator
Operateur %d/%d: %s Operateur %d/%d: %s
! !
.Sequence.MSG1 .SP.Sequence.Error.NoOp
Error: Operator %s is not found Error: Operator %s is not found
! !
.Sequence.MSG2 .SP.Sequence.Error.Except
Error: Operator %s failed with exception %s Error: Operator %s failed with exception %s
! !
.Sequence.MSG3 .SP.Sequence.Warn.NoSeq
Warning: Shape Processing: sequence not defined for %s Warning: Shape Processing: sequence not defined for %s
! !
! ------------------------------------------------------------------------------ ! ------------------------------------------------------------------------------

20
src/SHMessage/SHAPE.us
View File

@ -26,20 +26,20 @@
! ------------------------------------------------------------------------------ ! ------------------------------------------------------------------------------
! Messages for sequence of operators ! Messages for sequence of operators
! !
.Sequence.MSG0 .SP.Sequence.Info.Seq
Info: Sequence of operators: %s Info: Shape Processing: Sequence of operators: %s
! !
.Sequence.MSG5 .SP.Sequence.Info.Operator
Error: Operator %d/%d: %s Info: Shape Processing: Operator %d/%d: %s
! !
.Sequence.MSG1 .SP.Sequence.Error.NoOp
Error: Operator %s is not found Error: Shape Processing: Operator %s is not found
! !
.Sequence.MSG2 .SP.Sequence.Error.Except
Error: Operator %s failed with exception %s Error: Shape Processing: Operator %s failed with exception %s
! !
.Sequence.MSG3 .SP.Sequence.Warn.NoSeq
Warning: Shape Processing: sequence not defined for %s Warning: Shape Processing: Sequence not defined for %s, nothing to do
! !
! ------------------------------------------------------------------------------ ! ------------------------------------------------------------------------------
! Messages for printing results of shape processing ! Messages for printing results of shape processing

19
src/ShapeProcess/ShapeProcess.cxx
View File

@ -81,6 +81,10 @@ Standard_Boolean ShapeProcess::Perform (const Handle(ShapeProcess_Context)& cont
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
cout << "Error: ShapeProcess_Performer::Perform: sequence not defined for " << seq << endl; cout << "Error: ShapeProcess_Performer::Perform: sequence not defined for " << seq << endl;
#endif #endif
if ( context->TraceLevel() >0 ) {
Message_Msg SMSG3 ("SP.Sequence.Warn.NoSeq"); // Sequence %s not found
context->Messenger()->Send (SMSG3 << seq, Message_Warning);
}
context->UnSetScope(); context->UnSetScope();
return Standard_False; return Standard_False;
} }
@ -95,7 +99,7 @@ Standard_Boolean ShapeProcess::Perform (const Handle(ShapeProcess_Context)& cont
// put a message // put a message
if ( context->TraceLevel() >=2 ) { if ( context->TraceLevel() >=2 ) {
Message_Msg SMSG0 ("Sequence.MSG0"); //Sequence of operators: %s Message_Msg SMSG0 ("SP.Sequence.Info.Seq"); //Sequence of operators: %s
TCollection_AsciiString Seq; TCollection_AsciiString Seq;
for ( Standard_Integer i1=1; i1 <= sequenceOfOperators.Length(); i1++ ) { for ( Standard_Integer i1=1; i1 <= sequenceOfOperators.Length(); i1++ ) {
if (i1 > 1) Seq += ","; if (i1 > 1) Seq += ",";
@ -106,11 +110,12 @@ Standard_Boolean ShapeProcess::Perform (const Handle(ShapeProcess_Context)& cont
} }
// iterate on operators in the sequence // iterate on operators in the sequence
Standard_Boolean isDone = Standard_False;
for (i=1; i<=sequenceOfOperators.Length(); i++) { for (i=1; i<=sequenceOfOperators.Length(); i++) {
oper = sequenceOfOperators.Value(i); oper = sequenceOfOperators.Value(i);
if ( context->TraceLevel() >=2 ) { if ( context->TraceLevel() >=2 ) {
Message_Msg SMSG5 ("Sequence.MSG5"); //Operator %d/%d: %s Message_Msg SMSG5 ("SP.Sequence.Info.Operator"); //Operator %d/%d: %s
SMSG5 << i << sequenceOfOperators.Length() << oper.ToCString(); SMSG5 << i << sequenceOfOperators.Length() << oper.ToCString();
context->Messenger()->Send (SMSG5, Message_Alarm); context->Messenger()->Send (SMSG5, Message_Alarm);
} }
@ -118,7 +123,7 @@ Standard_Boolean ShapeProcess::Perform (const Handle(ShapeProcess_Context)& cont
Handle(ShapeProcess_Operator) op; Handle(ShapeProcess_Operator) op;
if ( ! ShapeProcess::FindOperator ( oper.ToCString(), op ) ) { if ( ! ShapeProcess::FindOperator ( oper.ToCString(), op ) ) {
if ( context->TraceLevel() >0 ) { if ( context->TraceLevel() >0 ) {
Message_Msg SMSG1 ("Sequence.MSG1"); //Operator %s not found Message_Msg SMSG1 ("SP.Sequence.Error.NoOp"); //Operator %s not found
context->Messenger()->Send (SMSG1 << oper, Message_Alarm); context->Messenger()->Send (SMSG1 << oper, Message_Alarm);
} }
continue; continue;
@ -127,11 +132,11 @@ Standard_Boolean ShapeProcess::Perform (const Handle(ShapeProcess_Context)& cont
context->SetScope ( oper.ToCString() ); context->SetScope ( oper.ToCString() );
try { try {
OCC_CATCH_SIGNALS OCC_CATCH_SIGNALS
if ( !op->Perform(context) ) if ( op->Perform(context) )
return Standard_False; isDone = Standard_True;
} }
catch (Standard_Failure) { catch (Standard_Failure) {
Message_Msg SMSG2 ("Sequence.MSG2"); //Operator %s failed with exception %s Message_Msg SMSG2 ("SP.Sequence.Error.Except"); //Operator %s failed with exception %s
SMSG2 << oper << Standard_Failure::Caught()->GetMessageString(); SMSG2 << oper << Standard_Failure::Caught()->GetMessageString();
context->Messenger()->Send (SMSG2, Message_Alarm); context->Messenger()->Send (SMSG2, Message_Alarm);
} }
@ -139,5 +144,5 @@ Standard_Boolean ShapeProcess::Perform (const Handle(ShapeProcess_Context)& cont
} }
context->UnSetScope(); context->UnSetScope();
return Standard_True; return isDone;
} }

11
src/XSAlgo/XSAlgo_AlgoContainer.cxx
View File

@ -129,7 +129,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape,
time++; time++;
} }
#endif #endif
// if FromSTEP or FromIGES, do default ShapeFix // if reading, do default ShapeFix
if ( ! strncmp ( pseq, "read.", 5 ) ) { if ( ! strncmp ( pseq, "read.", 5 ) ) {
try { try {
OCC_CATCH_SIGNALS OCC_CATCH_SIGNALS
@ -157,11 +157,8 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape,
} }
return context->Result(); return context->Result();
} }
// if ToSTEP or ToIGES, define sequence of DirectFaces // for writing, define default sequence of DirectFaces
else if ( ! strcmp ( pseq, "write.step.sequence" ) ) { else if ( ! strncmp ( pseq, "write.", 6 ) ) {
rsc->SetResource ( str.ToCString(), "DirectFaces" );
}
else if ( ! strcmp ( pseq, "write.iges.sequence" ) ) {
rsc->SetResource ( str.ToCString(), "DirectFaces" ); rsc->SetResource ( str.ToCString(), "DirectFaces" );
} }
} }
@ -171,7 +168,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape,
rsc->SetResource ( "Runtime.MaxTolerance", maxTol ); rsc->SetResource ( "Runtime.MaxTolerance", maxTol );
if ( !ShapeProcess::Perform(context, seq) ) if ( !ShapeProcess::Perform(context, seq) )
return TopoDS_Shape(); // Null shape return shape; // return original shape
return context->Result(); return context->Result();
} }