Cmake gtest (#79)
* Check rackpin and gear for zero radii * rebase zero-radii-check (#69) * contributing * Update push-freecad.yml updated actions/checkout to v4 * dragging log for debugging * fix calcdxNorm crash * setDebug and remove MBDyn* * Update cmakelists.txt * fix includes for gcc-14 gcc-14 is more disciplined about not including <algorithm> transitively. * fix runDragStep * backhoe files (#65) * Mark unused variables to silence compiler warnings. (#64) * Backhoe issues (#67) * backhoe issues * runDragStep edit * backhoe issues * runDragStep edit * Reduce large drag step progressively until convergence. * Switch to using built-in M_PI, even on MSVC (#68) --------- Co-authored-by: Brad Collette <bradcollette@pop-os.localdomain> Co-authored-by: mosfet80 <realeandrea@yahoo.it> Co-authored-by: PaddleStroke <pierrelouis.boyer@gmail.com> Co-authored-by: Jed Brown <jed@jedbrown.org> Co-authored-by: sliptonic <shopinthewoods@gmail.com> Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org> * in progress * Gtest added * With changes from Assembly * WinMerge main and this branch * Add flag for GTest * Flag to suppress OndselSolverMain * rebase zero-radii-check (#69) * contributing * Update push-freecad.yml updated actions/checkout to v4 * dragging log for debugging * fix calcdxNorm crash * setDebug and remove MBDyn* * Update cmakelists.txt * fix includes for gcc-14 gcc-14 is more disciplined about not including <algorithm> transitively. * fix runDragStep * backhoe files (#65) * Mark unused variables to silence compiler warnings. (#64) * Backhoe issues (#67) * backhoe issues * runDragStep edit * backhoe issues * runDragStep edit * Reduce large drag step progressively until convergence. * Switch to using built-in M_PI, even on MSVC (#68) --------- Co-authored-by: Brad Collette <bradcollette@pop-os.localdomain> Co-authored-by: mosfet80 <realeandrea@yahoo.it> Co-authored-by: PaddleStroke <pierrelouis.boyer@gmail.com> Co-authored-by: Jed Brown <jed@jedbrown.org> Co-authored-by: sliptonic <shopinthewoods@gmail.com> Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org> * in progress * Gtest added * With changes from Assembly * Add flag for GTest * Flag to suppress OndselSolverMain --------- Co-authored-by: Brad Collette <bradcollette@pop-os.localdomain> Co-authored-by: mosfet80 <realeandrea@yahoo.it> Co-authored-by: PaddleStroke <pierrelouis.boyer@gmail.com> Co-authored-by: Jed Brown <jed@jedbrown.org> Co-authored-by: sliptonic <shopinthewoods@gmail.com> Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
#include "ExternalSystem.h"
|
||||
#include "CADSystem.h"
|
||||
#include "ASMTAssembly.h"
|
||||
//#include <Mod/Assembly/App/AssemblyObject.h>
|
||||
#include "System.h"
|
||||
|
||||
using namespace MbD;
|
||||
@@ -18,10 +19,14 @@ void MbD::ExternalSystem::preMbDrun(std::shared_ptr<System> mbdSys)
|
||||
if (cadSystem) {
|
||||
cadSystem->preMbDrun(mbdSys);
|
||||
}
|
||||
else if (asmtAssembly) {
|
||||
asmtAssembly->preMbDrun(mbdSys);
|
||||
}
|
||||
else {
|
||||
else if (asmtAssembly) {
|
||||
asmtAssembly->preMbDrun(mbdSys);
|
||||
//asmtAssembly->externalSystem->preMbDrun(mbdSys);
|
||||
}
|
||||
else if (freecadAssemblyObject) {
|
||||
//freecadAssemblyObject->preMbDrun();
|
||||
}
|
||||
else {
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
@@ -39,7 +44,10 @@ void MbD::ExternalSystem::updateFromMbD()
|
||||
else if (asmtAssembly) {
|
||||
asmtAssembly->updateFromMbD();
|
||||
}
|
||||
else {
|
||||
else if (freecadAssemblyObject) {
|
||||
//freecadAssemblyObject->updateFromMbD();
|
||||
}
|
||||
else {
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
@@ -53,8 +61,12 @@ void MbD::ExternalSystem::outputFor(AnalysisType type)
|
||||
asmtAssembly->updateFromMbD();
|
||||
asmtAssembly->compareResults(type);
|
||||
asmtAssembly->outputResults(type);
|
||||
}
|
||||
else {
|
||||
//asmtAssembly->externalSystem->outputFor(type);
|
||||
}
|
||||
else if (freecadAssemblyObject) {
|
||||
//freecadAssemblyObject->outputResults(type);
|
||||
}
|
||||
else {
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user