From: akaftasev Date: Thu, 6 May 2021 09:32:54 +0000 (+0300) Subject: Updating BRepAlgoAPI... X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=8ca4193a8925138be3e601993883bc817cc42d6b;p=occt-copy.git Updating BRepAlgoAPI... --- diff --git a/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx b/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx index 3cc64283c9..3789c5b202 100644 --- a/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx +++ b/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx @@ -167,7 +167,7 @@ void BRepAlgoAPI_BooleanOperation::Build(const Message_ProgressRange& theRange) } } - Message_ProgressScope aPS(theRange, NULL, myIsIntersectionNeeded ? 10 : 1); + Message_ProgressScope aPS(theRange, NULL, myIsIntersectionNeeded ? 100 : 30); // If necessary perform intersection of the argument shapes if (myIsIntersectionNeeded) { @@ -177,7 +177,7 @@ void BRepAlgoAPI_BooleanOperation::Build(const Message_ProgressRange& theRange) aLArgs.Append(it.Value()); // Perform intersection - IntersectShapes(aLArgs, aPS.Next(9)); + IntersectShapes(aLArgs, aPS.Next(70)); if (HasErrors()) { if (aDumpOper.IsDump()) @@ -204,7 +204,7 @@ void BRepAlgoAPI_BooleanOperation::Build(const Message_ProgressRange& theRange) } // Build the result - BuildResult(aPS.Next(1)); + BuildResult(aPS.Next(30)); if (HasErrors()) { return; diff --git a/src/BRepAlgoAPI/BRepAlgoAPI_BuilderAlgo.cxx b/src/BRepAlgoAPI/BRepAlgoAPI_BuilderAlgo.cxx index 824bcddc26..b87c69720e 100644 --- a/src/BRepAlgoAPI/BRepAlgoAPI_BuilderAlgo.cxx +++ b/src/BRepAlgoAPI/BRepAlgoAPI_BuilderAlgo.cxx @@ -93,9 +93,9 @@ void BRepAlgoAPI_BuilderAlgo::Build(const Message_ProgressRange& theRange) NotDone(); // Destroy the tools if necessary Clear(); - Message_ProgressScope aPS(theRange, NULL, 2); + Message_ProgressScope aPS(theRange, "Performing General Fuse operation", 100); // If necessary perform intersection of the argument shapes - IntersectShapes(myArguments, aPS.Next()); + IntersectShapes(myArguments, aPS.Next(70)); if (HasErrors()) return; @@ -104,7 +104,7 @@ void BRepAlgoAPI_BuilderAlgo::Build(const Message_ProgressRange& theRange) // Set arguments to builder myBuilder->SetArguments(myArguments); // Build the result basing on intersection results - BuildResult(aPS.Next()); + BuildResult(aPS.Next(30)); } //======================================================================= diff --git a/src/BRepAlgoAPI/BRepAlgoAPI_Splitter.cxx b/src/BRepAlgoAPI/BRepAlgoAPI_Splitter.cxx index 3ccfbfd2b9..bd5a978792 100644 --- a/src/BRepAlgoAPI/BRepAlgoAPI_Splitter.cxx +++ b/src/BRepAlgoAPI/BRepAlgoAPI_Splitter.cxx @@ -50,7 +50,7 @@ void BRepAlgoAPI_Splitter::Build(const Message_ProgressRange& theRange) } // If necessary perform intersection of the argument shapes - Message_ProgressScope aPS(theRange, "Performing Split operation", myIsIntersectionNeeded ? 10 : 1); + Message_ProgressScope aPS(theRange, "Performing Split operation", myIsIntersectionNeeded ? 100 : 30); if (myIsIntersectionNeeded) { // Combine Arguments and Tools for intersection into a single list @@ -59,7 +59,7 @@ void BRepAlgoAPI_Splitter::Build(const Message_ProgressRange& theRange) aLArgs.Append(it.Value()); // Perform intersection - IntersectShapes(aLArgs, aPS.Next(9)); + IntersectShapes(aLArgs, aPS.Next(70)); if (HasErrors()) return; } @@ -70,5 +70,5 @@ void BRepAlgoAPI_Splitter::Build(const Message_ProgressRange& theRange) ((BOPAlgo_Splitter*)myBuilder)->SetTools(myTools); // Build result shape basing on the intersection results - BuildResult(aPS.Next(1)); + BuildResult(aPS.Next(30)); }