5c33aacecb
Rewire AssemblyObject to call through KCSolve::IKCSolver instead of directly manipulating OndselSolver ASMT types. Key changes: - Remove all 30+ #include <OndselSolver/*> from AssemblyObject.cpp - Remove MbDPartData, objectPartMap, mbdAssembly members - Add solver_ (IKCSolver), lastResult_ (SolveResult), partIdToObjs_ maps - New buildSolveContext() builds SolveContext from FreeCAD document objects with JointType/DistanceType -> BaseJointKind decomposition - New computeMarkerTransform() replaces handleOneSideOfJoint() - New computeRackPinionMarkers() replaces getRackPinionMarkers() - Rewrite solve/preDrag/doDragStep/postDrag/generateSimulation to call through IKCSolver interface - Rewrite setNewPlacements/validateNewPlacements to use SolveResult - Rewrite updateSolveStatus to use ConstraintDiagnostic - Add export_native() to IKCSolver for ASMT export support - Register OndselAdapter at Assembly module init in AppAssembly.cpp - Remove OndselSolver from Assembly_LIBS (linked transitively via KCSolve) Assembly module now has zero OndselSolver includes. All solver coupling is confined to KCSolve/OndselAdapter.cpp.
81 lines
3.1 KiB
C++
81 lines
3.1 KiB
C++
// SPDX-License-Identifier: LGPL-2.1-or-later
|
|
/****************************************************************************
|
|
* *
|
|
* Copyright (c) 2023 Ondsel <development@ondsel.com> *
|
|
* *
|
|
* This file is part of FreeCAD. *
|
|
* *
|
|
* FreeCAD is free software: you can redistribute it and/or modify it *
|
|
* under the terms of the GNU Lesser General Public License as *
|
|
* published by the Free Software Foundation, either version 2.1 of the *
|
|
* License, or (at your option) any later version. *
|
|
* *
|
|
* FreeCAD is distributed in the hope that it will be useful, but *
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
|
|
* Lesser General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU Lesser General Public *
|
|
* License along with FreeCAD. If not, see *
|
|
* <https://www.gnu.org/licenses/>. *
|
|
* *
|
|
***************************************************************************/
|
|
|
|
|
|
#include <Base/Console.h>
|
|
#include <Base/Interpreter.h>
|
|
#include <Base/PyObjectBase.h>
|
|
|
|
#include <Mod/Assembly/Solver/OndselAdapter.h>
|
|
|
|
#include "AssemblyObject.h"
|
|
#include "AssemblyLink.h"
|
|
#include "BomObject.h"
|
|
#include "BomGroup.h"
|
|
#include "JointGroup.h"
|
|
#include "ViewGroup.h"
|
|
#include "SimulationGroup.h"
|
|
|
|
|
|
namespace Assembly
|
|
{
|
|
extern PyObject* initModule();
|
|
}
|
|
|
|
/* Python entry */
|
|
PyMOD_INIT_FUNC(AssemblyApp)
|
|
{
|
|
// load dependent module
|
|
try {
|
|
Base::Interpreter().runString("import Part");
|
|
Base::Interpreter().runString("import Spreadsheet");
|
|
}
|
|
catch (const Base::Exception& e) {
|
|
PyErr_SetString(PyExc_ImportError, e.what());
|
|
PyMOD_Return(nullptr);
|
|
}
|
|
|
|
PyObject* mod = Assembly::initModule();
|
|
|
|
// Register the built-in OndselSolver adapter with the solver registry.
|
|
KCSolve::OndselAdapter::register_solver();
|
|
|
|
Base::Console().log("Loading Assembly module... done\n");
|
|
|
|
|
|
// NOTE: To finish the initialization of our own type objects we must
|
|
// call PyType_Ready, otherwise we run into a segmentation fault, later on.
|
|
// This function is responsible for adding inherited slots from a type's base class.
|
|
|
|
Assembly::AssemblyObject ::init();
|
|
Assembly::AssemblyLink ::init();
|
|
Assembly::BomObject ::init();
|
|
|
|
Assembly::BomGroup ::init();
|
|
Assembly::JointGroup ::init();
|
|
Assembly::ViewGroup ::init();
|
|
Assembly::SimulationGroup ::init();
|
|
|
|
PyMOD_Return(mod);
|
|
}
|