Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot] 5c92be77a9 Bump actions/setup-dotnet from 5.1.0 to 5.2.0
Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](https://github.com/actions/setup-dotnet/compare/baa11fbfe1d6520db94683bd5c7a3818018e4309...c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-version: 5.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-19 11:54:43 +00:00
10 changed files with 35 additions and 17 deletions
+1 -1
View File
@@ -194,7 +194,7 @@ jobs:
- name: Setup .NET 10 SDK
if: runner.os == 'Windows'
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
with:
dotnet-version: '10.0.103'
+5 -1
View File
@@ -310,7 +310,11 @@ public:
* @return The new transaction ID.
*/
int setActiveTransaction(TransactionName name);
int setActiveTransaction(TransactionName name);
/// Return the current global transaction name and ID if such a global transaction is
/// setup (uncommon)
std::string getActiveTransaction(int *tid=nullptr) const;
int openGlobalTransaction(TransactionName name);
int getGlobalTransaction() const;
+3 -4
View File
@@ -1221,10 +1221,9 @@ PyObject* ApplicationPy::sGetActiveTransaction(PyObject* /*self*/, PyObject* arg
PY_TRY
{
int id = 0;
std::string name = "";
if (Document* doc = GetApplication().getActiveDocument()) {
id = doc->getBookedTransactionID();
name = GetApplication().getTransactionName(id);
std::string name = GetApplication().getActiveTransaction(&id);
if (name.empty() || id <= 0) {
Py_Return;
}
Py::Tuple ret(2);
ret.setItem(0, Py::String(name));
+7
View File
@@ -71,6 +71,13 @@ int Application::setActiveTransaction(TransactionName name)
return openGlobalTransaction(name);
}
std::string Application::getActiveTransaction(int* id) const
{
if (id != nullptr) {
*id = _globalTransactionID;
}
return _globalTransactionID != 0 ? getTransactionName(_globalTransactionID) : "";
}
int Application::openGlobalTransaction(TransactionName name)
{
if (name.name.empty()) {
+1 -1
View File
@@ -403,7 +403,7 @@ void PropertyEditor::openEditor(const QModelIndex& index)
str << "...";
}
transactionID = obj->getDocument()->openTransaction(str.str().c_str());
FC_LOG("editor transaction " << App::GetApplication().getTransactionName(transactionID));
FC_LOG("editor transaction " << App::GetApplication().getActiveTransaction(&transactionID));
}
void PropertyEditor::onItemActivated(const QModelIndex& index)
+7
View File
@@ -1887,6 +1887,13 @@ class PostProcessor:
postables = self._buildPostList(early_tool_prep)
Path.Log.debug(f"postables {postables}")
# Process canned cycles for drilling operations
for _, section in enumerate(postables):
_, sublist = section
for obj in sublist:
if hasattr(obj, "Path"):
obj.Path = PostUtils.cannedCycleTerminator(obj.Path)
Path.Log.debug(f"postables count: {len(postables)}")
g_code_sections = []
+1 -5
View File
@@ -708,12 +708,8 @@ def parse_a_path(values: Values, gcode: Gcode, pathobj) -> None:
)
adaptive_op_variables = determine_adaptive_op(values, pathobj)
path_to_process = pathobj.Path
# Process canned cycles for drilling operations
path_to_process = PostUtils.cannedCycleTerminator(path_to_process)
# Apply arc splitting if requested
path_to_process = pathobj.Path
if values["SPLIT_ARCS"]:
path_to_process = PostUtils.splitArcs(path_to_process)
@@ -64,7 +64,7 @@ class _BasePostTaskPanel(base_femtaskpanel._BaseTaskPanel):
def open(self):
# open a new transaction if non is open
if FreeCAD.ActiveDocument.getBookedTransactionID() == 0:
if not FreeCAD.getActiveTransaction():
FreeCAD.ActiveDocument.openTransaction(
translate("FEM", "Edit {}").format(self.obj.Label)
)
@@ -217,6 +217,7 @@ bool TaskDlgFeatureParameters::accept()
feature->getDocument()->commitTransaction();
}
catch (const Base::Exception& e) {
feature->getDocument()->abortTransaction();
QString errorText = QString::fromUtf8(e.what());
QString statusText = QString::fromUtf8(getObject()->getStatusString());
+8 -4
View File
@@ -333,11 +333,15 @@ std::optional<gp_Pnt> ViewProviderHole::getHoleOrigin(const PartDesign::Hole* pc
if (!pcHole) {
return std::nullopt;
}
if (auto* profile = pcHole->Profile.getValue()) {
const Base::Vector3d pos = profile->getPlacement().getPosition();
return Base::convertTo<gp_Pnt>(pos);
auto* sketch = freecad_cast<Part::Part2DObject*>(pcHole->Profile.getValue());
if (!sketch) {
return std::nullopt;
}
return std::nullopt;
const Base::Vector3d& pos = sketch->Placement.getValue().getPosition();
return Base::convertTo<gp_Pnt>(pos);
}
std::vector<TopoDS_Face> ViewProviderHole::collectBoreFaces(const PartDesign::Hole* pcHole) const