Assembly: Solver messages (#24623)
* Assembly: Solver messages * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update ViewProviderAssembly.cpp * Update src/Mod/Assembly/App/AssemblyUtils.cpp Co-authored-by: Kacper Donat <kadet1090@gmail.com> * Update src/Mod/Assembly/App/AssemblyUtils.cpp Co-authored-by: Kacper Donat <kadet1090@gmail.com> * Update src/Mod/Assembly/App/AssemblyUtils.cpp Co-authored-by: Kacper Donat <kadet1090@gmail.com> * Update src/Mod/Assembly/Gui/Commands.cpp Co-authored-by: Kacper Donat <kadet1090@gmail.com> * Update ViewProviderAssembly.cpp * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update src/Mod/Assembly/Gui/TaskAssemblyMessages.cpp Co-authored-by: Kacper Donat <kadet1090@gmail.com> * Update AssemblyObject.h * Update AssemblyObject.cpp * Update Commands.cpp * Update ViewProviderAssembly.cpp * Update AssemblyObject.cpp * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Thank you --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Kacper Donat <kadet1090@gmail.com>
This commit is contained in:
@@ -88,7 +88,7 @@ public:
|
||||
}
|
||||
|
||||
App::DocumentObjectExecReturn* execute() override;
|
||||
|
||||
void onChanged(const App::Property* prop) override;
|
||||
/* Solve the assembly. It will update first the joints, solve, update placements of the parts
|
||||
and redraw the joints Args : enableRedo : This store initial positions to enable undo while
|
||||
being in an active transaction (joint creation).*/
|
||||
@@ -216,6 +216,7 @@ public:
|
||||
bool isEmpty() const;
|
||||
int numberOfComponents() const;
|
||||
|
||||
void updateSolveStatus();
|
||||
inline int getLastDoF() const
|
||||
{
|
||||
return lastDoF;
|
||||
@@ -240,21 +241,21 @@ public:
|
||||
{
|
||||
return lastSolverStatus;
|
||||
}
|
||||
inline const std::vector<int>& getLastConflicting() const
|
||||
inline const std::vector<std::string>& getLastConflicting() const
|
||||
{
|
||||
return lastConflicting;
|
||||
return lastConflictingJoints;
|
||||
}
|
||||
inline const std::vector<int>& getLastRedundant() const
|
||||
inline const std::vector<std::string>& getLastRedundant() const
|
||||
{
|
||||
return lastRedundant;
|
||||
return lastRedundantJoints;
|
||||
}
|
||||
inline const std::vector<int>& getLastPartiallyRedundant() const
|
||||
inline const std::vector<std::string>& getLastPartiallyRedundant() const
|
||||
{
|
||||
return lastPartiallyRedundant;
|
||||
return lastPartialRedundantJoints;
|
||||
}
|
||||
inline const std::vector<int>& getLastMalformedConstraints() const
|
||||
inline const std::vector<std::string>& getLastMalformed() const
|
||||
{
|
||||
return lastMalformedConstraints;
|
||||
return lastMalformedJoints;
|
||||
}
|
||||
fastsignals::signal<void()> signalSolverUpdate;
|
||||
|
||||
@@ -277,10 +278,10 @@ private:
|
||||
bool lastHasMalformedConstraints;
|
||||
int lastSolverStatus;
|
||||
|
||||
std::vector<int> lastConflicting;
|
||||
std::vector<int> lastRedundant;
|
||||
std::vector<int> lastPartiallyRedundant;
|
||||
std::vector<int> lastMalformedConstraints;
|
||||
std::vector<std::string> lastRedundantJoints;
|
||||
std::vector<std::string> lastConflictingJoints;
|
||||
std::vector<std::string> lastPartialRedundantJoints;
|
||||
std::vector<std::string> lastMalformedJoints;
|
||||
};
|
||||
|
||||
} // namespace Assembly
|
||||
|
||||
Reference in New Issue
Block a user