kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'main' into CAM-Inspect-Fix

Browse Source
This commit is contained in:
Ian Abreu
2025-07-06 16:24:42 -04:00
parent 5b962e7ec3 c48e5f6e20
commit 1c3a4e5d69
27 changed files with 7102 additions and 4987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/CAM/Path/Main/Gui/Job.py
View File

@@ -132,11 +132,10 @@ class ViewProvider:
self.axs.axisLength.setValue(1.2)
# enum values for SoFCPlacementIndicatorKit
AXES = 1
LABELS = 4
ARROWHEADS = 8
self.axs.parts.setValue(AXES | LABELS | ARROWHEADS)
parts = FreeCADGui.PlacementIndicatorParts
self.axs.parts.setValue(
parts.Axes | parts.Labels | parts.ArrowHeads | parts.OriginIndicator
)
self.sep.addChild(self.axs)
self.switch.addChild(self.sep)

40
src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.cpp
View File

@@ -31,26 +31,30 @@
using namespace MillSim;
// clang-format off
// NOLINTBEGIN(*-magic-numbers)
GuiItem guiItems[] = {
{eGuiItemSlider, 0, 0, 28, -80, 0},
{eGuiItemThumb, 0, 0, 328, -94, 1},
{eGuiItemPause, 0, 0, 28, -50, 'P', true},
{eGuiItemPlay, 0, 0, 28, -50, 'S', false},
{eGuiItemSingleStep, 0, 0, 68, -50, 'T'},
{eGuiItemSlower, 0, 0, 113, -50, ' '},
{eGuiItemFaster, 0, 0, 158, -50, 'F'},
{eGuiItemX, 0, 0, 208, -45, 0, false, 0},
{eGuiItem1, 0, 0, 230, -50, 0, false, 0},
{eGuiItem5, 0, 0, 230, -50, 0, true, 0},
{eGuiItem10, 0, 0, 230, -50, 0, true, 0},
{eGuiItem25, 0, 0, 230, -50, 0, true, 0},
{eGuiItem50, 0, 0, 230, -50, 0, true, 0},
{eGuiItemRotate, 0, 0, -140, -50, ' ', false, GUIITEM_CHECKABLE},
{eGuiItemPath, 0, 0, -100, -50, 'L', false, GUIITEM_CHECKABLE},
{eGuiItemAmbientOclusion, 0, 0, -60, -50, 'A', false, GUIITEM_CHECKABLE},
{eGuiItemView, 0, 0, -180, -50, 'V', false},
{eGuiItemHome, 0, 0, -220, -50, 'H'},
{.name=eGuiItemSlider, .vbo=0, .vao=0, .sx=28, .sy=-80, .actionKey=0, .hidden=false, .flags=0},
{.name=eGuiItemThumb, .vbo=0, .vao=0, .sx=328, .sy=-94, .actionKey=1, .hidden=false, .flags=0},
{.name=eGuiItemPause, .vbo=0, .vao=0, .sx=28, .sy=-50, .actionKey='P', .hidden=true, .flags=0},
{.name=eGuiItemPlay, .vbo=0, .vao=0, .sx=28, .sy=-50, .actionKey='S', .hidden=false, .flags=0},
{.name=eGuiItemSingleStep, .vbo=0, .vao=0, .sx=68, .sy=-50, .actionKey='T', .hidden=false, .flags=0},
{.name=eGuiItemSlower, .vbo=0, .vao=0, .sx=113, .sy=-50, .actionKey=' ', .hidden=false, .flags=0},
{.name=eGuiItemFaster, .vbo=0, .vao=0, .sx=158, .sy=-50, .actionKey='F', .hidden=false, .flags=0},
{.name=eGuiItemX, .vbo=0, .vao=0, .sx=208, .sy=-45, .actionKey=0, .hidden=false, .flags=0},
{.name=eGuiItem1, .vbo=0, .vao=0, .sx=230, .sy=-50, .actionKey=0, .hidden=false, .flags=0},
{.name=eGuiItem5, .vbo=0, .vao=0, .sx=230, .sy=-50, .actionKey=0, .hidden=true, .flags=0},
{.name=eGuiItem10, .vbo=0, .vao=0, .sx=230, .sy=-50, .actionKey=0, .hidden=true, .flags=0},
{.name=eGuiItem25, .vbo=0, .vao=0, .sx=230, .sy=-50, .actionKey=0, .hidden=true, .flags=0},
{.name=eGuiItem50, .vbo=0, .vao=0, .sx=230, .sy=-50, .actionKey=0, .hidden=true, .flags=0},
{.name=eGuiItemRotate, .vbo=0, .vao=0, .sx=-140, .sy=-50, .actionKey=' ', .hidden=false, .flags=GUIITEM_CHECKABLE},
{.name=eGuiItemPath, .vbo=0, .vao=0, .sx=-100, .sy=-50, .actionKey='L', .hidden=false, .flags=GUIITEM_CHECKABLE},
{.name=eGuiItemAmbientOclusion, .vbo=0, .vao=0, .sx=-60, .sy=-50, .actionKey='A', .hidden=false, .flags=GUIITEM_CHECKABLE},
{.name=eGuiItemView, .vbo=0, .vao=0, .sx=-180, .sy=-50, .actionKey='V', .hidden=false, .flags=0},
{.name=eGuiItemHome, .vbo=0, .vao=0, .sx=-220, .sy=-50, .actionKey='H', .hidden=false, .flags=0},
};
// NOLINTEND(*-magic-numbers)
// clang-format on
#define NUM_GUI_ITEMS (sizeof(guiItems) / sizeof(GuiItem))
#define TEX_SIZE 256

8
src/Mod/CAM/PathSimulator/AppGL/MillSimulation.h
View File

@@ -107,9 +107,11 @@ protected:
std::vector<MillPathSegment*> MillPathSegments;
std::ostringstream mFpsStream;
MillMotion mZeroPos = {eNop, -1, 0, 0, 100, 0, 0, 0, 0};
MillMotion mCurMotion = {eNop, -1, 0, 0, 0, 0, 0, 0, 0};
MillMotion mDestMotion = {eNop, -1, 0, 0, 0, 0, 0, 0, 0};
// clang-format off
MillMotion mZeroPos = {.cmd=eNop, .tool=-1, .x=0, .y=0, .z=100, .i=0, .j=0, .k=0, .r=0, .retract_mode='\0', .retract_z=0.0};
MillMotion mCurMotion = {.cmd=eNop, .tool=-1, .x=0, .y=0, .z=0, .i=0, .j=0, .k=0, .r=0, .retract_mode='\0', .retract_z=0.0};
MillMotion mDestMotion = {.cmd=eNop, .tool=-1, .x=0, .y=0, .z=0, .i=0, .j=0, .k=0, .r=0, .retract_mode='\0', .retract_z=0.0};
// clang-format on
StockObject mStockObject;
SolidObject mBaseShape;