Skip to content

Commit 7053dcc

Browse files
committed
Merge branch 'feature/pocket' into develop
2 parents 4ec322c + aa4cfc0 commit 7053dcc

27 files changed

+552
-50
lines changed

README.md

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<p align="center">
2+
<img src="doc/logo.png"/>
3+
</p>
4+
15
# DXF Plotter
26

37
> Fast and easy to use DXF to GCode converter for laser and router CNC
@@ -13,13 +17,20 @@ This application helps users converting DXF files to GCode with minimal settings
1317
It targets only laser and router CNC following every lines and arcs from DXF file with optional desired depth.
1418

1519

16-
## Features
20+
## Features
1721

1822
* DXF support of line, arc, circle, polyline, spline
1923
* Customizable GCode command format
24+
* Saving current work to file
2025
* Multi selected path setting edition
2126
* Path offseting (Tool Compensation)
27+
* Pocket generation with islands capabilities
2228
* Multi passes with depth
29+
* Scale and translate paths
30+
31+
<p align="center">
32+
<img src="doc/pocket.gif" width="80%"/>
33+
</p>
2334

2435
## Installation
2536

@@ -34,12 +45,12 @@ chmod +x dxfplotter-*.AppImage
3445
./dxfplotter-*.AppImage
3546
```
3647

37-
### Manual installation from source
48+
### 🏗 Manual installation from source
3849

39-
This project depends on Qt5, yaml-cpp and fmt, for debian like distribution following command install all dependencies:
50+
This project depends on Qt5, for debian like distribution following command install all dependencies:
4051

4152
```sh
42-
sudo apt-get install qtbase5-dev libyaml-cpp-dev libfmt-dev
53+
sudo apt-get install qtbase5-dev
4354
```
4455

4556
```sh
@@ -74,16 +85,15 @@ Once opened, select path from left panel or from viewport and modify settings of
7485

7586
Export with `File->Export` or `Ctrl+E`
7687

77-
78-
## Configuration
88+
## ✏ Configuration
7989

8090
![](doc/configuration.png)
8191

8292
Configuration settings are exposed in `Configuration->Settings`, the configuration is splitted in two:
8393
* general settings aiming dxf importing or default values
8494
* tools with settings such as radius and gcode formatting
8595

86-
## GCode format
96+
## 📝 GCode format
8797

8898
Simple set of GCode command is used per tool:
8999

doc/configuration.png

-1.98 KB
Loading

doc/logo.png

13.8 KB
Loading

doc/pocket.gif

30.1 KB
Loading

doc/screen.png

9.01 KB
Loading

resource/icons/pocket-shape.svg

Lines changed: 27 additions & 0 deletions
Loading

resource/icons/zoom-in.svg

Lines changed: 13 additions & 0 deletions
Loading

resource/resource.qrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
<file>icons/list-remove.svg</file>
2020
<file>icons/path-inset.svg</file>
2121
<file>icons/path-outset.svg</file>
22+
<file>icons/pocket-shape.svg</file>
2223
<file>icons/resizecol.svg</file>
2324
<file>icons/show-path-outline.svg</file>
2425
<file>icons/transform-rotate.svg</file>
26+
<file>icons/zoom-in.svg</file>
2527
</qresource>
2628
</RCC>

src/common/aggregable.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class Aggregable
1616

1717
using List = std::vector<Item>;
1818
using ListPtr = std::vector<Item *>;
19+
using ListCPtr = std::vector<const Item *>;
1920
using ListUPtr = std::vector<UPtr>;
2021

2122
template <size_t Size>

src/geometry/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(SRC
77
cleaner.cpp
88
circle.cpp
99
cubicspline.cpp
10+
pocketer.cpp
1011
polyline.cpp
1112
quadraticspline.cpp
1213
spline.cpp

0 commit comments

Comments
 (0)