dxf2gcode / SourceCode / Merge Request #26: One line update to fix incorrect ConfigWindow enum (rejected)

DXF2GCODE: converting 2D dxf drawings to CNC machine compatible G-Code

SourceCode Merge Request #26: One line update to fix incorrect ConfigWindow enum (rejected)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Richard Kenney wants to merge 106 commits from /u/richk1949/dxf2gcode/ to master, 2026-08-13

See comments to Merge Request #25

Commit	Date
[030798] (HEAD, qt6) by Richard Kenney Fix incorrect enum change to ConfigWindow.Applied This is a class attribute of ConfigWindow, not a member of QDialog.DialogCode	2026-08-13 19:49:32	Tree
[84a8ba] by Richard Kenney Adjust windows release tools to work with current Python & Qt6	2026-08-11 22:05:04	Tree
[7944f4] by Richard Kenney Make make_tr.py compatible with both PyQt5 and PyQt6 Since pylupdate6 can't use a qmake file, manually generate the list of source & translation files.	2026-08-11 19:58:06	Tree
[4a2594] by Richard Kenney Make make_py_uic.py compatible with both PyQt5 and PyQt6 Change from pyrcc5 to rcc as there is no pyrcc6, this also requires modification of the resulting resource file as rcc is PySide compatible.	2026-08-04 22:43:29	Tree
[79402e] by Richard Kenney Add conditional code to canvas3d.py and dxf2gcode.py to cover PyQt5 and PyQt6	2026-08-04 21:10:41	Tree
[305477] by Richard Kenney Correct a couple of string issues in core functions	2026-08-04 20:49:16	Tree
[47cd91] by Richard Kenney Revert changes on example code	2026-08-04 20:13:20	Tree
[1001f6] by Richard Kenney Revert changes on example code	2026-08-04 20:11:27	Tree
[6fc6ea] by Richard Kenney Caught a couple more enums	2026-08-04 20:08:19	Tree
[a67d5a] by Richard Kenney Replace all instances of exec_ with exec	2026-08-04 20:02:15	Tree
[1ed07e] by Richard Kenney Update enums to Qt6 format in all .py files	2026-08-03 23:25:16	Tree
[29308e] by Richard Kenney Correct backslash escape sequences in strings	2026-08-03 22:09:39	Tree
[2944bc] by Richard Kenney Change imports to use compatibility layer	2026-08-03 20:42:27	Tree
[1ff81a] by Richard Kenney Add compatibility layer Qt5/6	2026-08-03 20:26:23	Tree
[ab2aa4] (develop) by christi_ko Updated st-setup.py with correct data format.	2025-02-13 17:41:13	Tree
[e8dc58] by christi_ko Changes to postprocessor configuration description according to: https://sourceforge.net/p/dxf2gcode/tickets/167/	2025-02-05 21:16:13	Tree
[932116] by christi_ko Issue reported on https://www.ltspiceusers.ch/threads/misunderstanding-of-toolpath.3356/#post-6680 fixed by reducing eps for colinear lines.	2024-11-02 16:00:32	Tree
[995a77] by christi_ko Corrected again	2024-10-16 18:33:22	Tree
[1e1dd8] by christi_ko Update to fix problem with [tickets:#165] "name 'post_pro' is not defined" when using command line	2024-10-16 18:16:59	Tree
[ad580d] by Damian Wrobel Fix passing arguments in PocketMove()	2024-05-13 14:54:35	Tree
[f105a0] by Damian Wrobel Fix NameError: name 'post_pro' is not defined - Fixes: Traceback (most recent call last): File "dxf2gcode.py", line 1300, in <module> window.exportShapes(None, options.export_filename) File "dxf2gcode.py", line 322, in exportShapes filename = [None, post_pro] ^^^^^^^^ - Removes superfluous executive bit in dxf2gcode.desktop - Bumps version to make available new zip file A new version is needed for fixing https://bugzilla.redhat.com/2277765	2024-05-09 06:31:03	Tree
[86e386] by christi_ko Missed to commint one change in order not toe look on order of values. https://sourceforge.net/p/dxf2gcode/tickets/159/	2024-04-03 12:33:52	Tree
[f8fa24] by christi_ko Changes in order to fix described issue: https://sourceforge.net/p/dxf2gcode/tickets/159/	2024-03-29 16:20:03	Tree
[85009f] by christi_ko Changes to fix issue described in: https://sourceforge.net/p/dxf2gcode/tickets/159/	2024-03-29 16:19:03	Tree
[6a973c] by christi_ko Updated package information for creating an exectuatable.	2023-09-01 08:46:54	Tree
[a64ae1] by christi_ko Updated package information for creating an exectuatable.	2023-09-01 08:44:57	Tree
[3dca26] by christi_ko corrected a typo	2023-08-31 21:19:46	Tree
[55a0fe] by christi_ko Corrected the calculation for the angle between geometries in order to identify the sharpest angle.	2023-08-31 08:55:39	Tree
[de3f68] by christi_ko Added some preliminary changes in order to detect most sharp corner of a shape. https://www.ltspiceusers.ch/threads/drag-knife-path-optimization-results-in-not-finished-lights.2040/#post-4360	2023-08-30 10:16:41	Tree
[44b33c] by christi_ko Updated french translation according to e-mail from Georges Barnasson 10.10.20222	2023-05-29 09:21:44	Tree
[10dcfb] by christi_ko Merged changes from: https://github.com/ltspicer/dxf2gcode/blob/d1f3ce102a8ebf52d8837ce8d93b55f1e0c0aca9/dxf2gcode/globals/constants.py	2023-05-06 09:06:29	Tree
[4d9f3c] by christi_ko Updated the tolerance for finding intersections of splines in order to solve topic described in: https://www.ltspiceusers.ch/threads/shape-4-wird-%C3%BCbersprungen.1780/#post-3897	2023-05-05 18:40:40	Tree
[11e785] by christi_ko Updated selection model in order to avoid double klicking in view and treeview for selection. https://sourceforge.net/p/dxf2gcode/tickets/148/	2023-04-13 13:30:35	Tree
[889697] by christi_ko Commit according to ticket. https://sourceforge.net/p/dxf2gcode/tickets/147/	2023-04-13 11:00:01	Tree
[74ead2] by christi_ko Update according to https://www.ltspiceusers.ch/threads/dxf2gcode-installer-f%C3%BCr-linux-user.1085/page-2#post-3753	2023-04-13 10:15:04	Tree
[5dd9a3] by christi_ko Changed the default of the lin_ret_drill to use G0 instead of G1.	2023-02-08 18:50:43	Tree
[179784] by christi_ko Implemented request according to https://sourceforge.net/p/dxf2gcode/tickets/146/	2023-02-06 20:49:45	Tree
[b198ad] by christi_ko Updated reload of shape not to create hash with full shape geometries list. Since in case of scaling / dragging / mirroring the geometries are changed and a reload ist not working with same hashes. Changed to use the shape.nr.	2023-02-05 20:22:46	Tree
[970602] by christi_ko Added a check, to verify all Arcs and closed shapes on Drill Layer. Otherwise not interpreted as drill	2023-02-04 19:44:59	Tree
[dd1740] by christi_ko Updated the layer control in order to format shapes which are on a DRILL Layer as Drill.	2023-02-04 19:36:34	Tree
[45b479] by christi_ko Corrected a failure which did lead to a crash of the window while dragging items.	2023-02-04 19:21:00	Tree
[dd95a2] by christi_ko Corrected an issue with the mirror option introduced.	2023-02-04 16:55:58	Tree
[421e4b] by christi_ko Updated the path for QTranslator for absolute path of executed file. Had issues that the relative path was not correct in visual studio editor.	2023-02-04 16:02:01	Tree
[125c69] by christi_ko Test with constants.py again	2023-02-04 15:18:17	Tree
[1b1a7a] by christi_ko Added a new test file for LayerControl	2023-02-04 15:16:30	Tree
[c55143] by christi_ko Changed to include Revision not ID	2023-02-04 14:52:44	Tree
[3304bf] by christi_ko Added the git filter with keyword substituation.	2023-02-04 14:45:04	Tree
[c44903] by christi_ko Updated with changes required to make the translation and updated MSI release in my environment.	2023-02-04 13:30:35	Tree
[49c745] by christi_ko https://sourceforge.net/p/dxf2gcode/tickets/133/ Not all changes commited, once again ...	2023-02-03 16:40:09	Tree
[da206b] by christi_ko Update to have custom G-Codes possible in the postprocessor setting. Also integrated backward compatibility of the postprocessor. Refer to ticket: https://sourceforge.net/p/dxf2gcode/tickets/133/	2023-02-03 16:38:48	Tree
[10566a] by christi_ko 2nd test	2023-02-03 12:32:01	Tree
[cb9af8] by christi_ko Trying to add git keywords. This is a test	2023-02-03 12:29:24	Tree
[054f06] by christi_ko Nr. 4 of suggestions added to code. Backward compatibility of config file also added. https://sourceforge.net/p/dxf2gcode/tickets/123/	2023-02-03 11:58:12	Tree
[280d22] by christi_ko Changes as proposed by ticket: https://sourceforge.net/p/dxf2gcode/tickets/123/ Points 1-3, see comments of today.	2023-02-03 10:50:34	Tree
[fe355c] by christi_ko Introduced the new function to mirror all geometry on the X and Y axis according to reques: https://sourceforge.net/p/dxf2gcode/tickets/104/	2023-02-03 10:12:03	Tree
[819364] by christi_ko Update to fix issue discribred with ticket. HoleGeometry was not exported according to scaling. Now it should work as expected. https://sourceforge.net/p/dxf2gcode/tickets/145/	2023-02-02 18:34:16	Tree
[a328a4] by christi_ko Updated file to include absolute path references for windows.	2023-02-02 16:45:18	Tree
[8a5b05] by christi_ko Updated with changes according to ticket: https://sourceforge.net/p/dxf2gcode/tickets/139/	2023-02-02 16:05:53	Tree
[569615] by Christian Kohlöffel Merged changes from: https://www.ltspiceusers.ch/threads/dxf2gcode-installer-f%C3%BCr-linux-user.1085/#post-3080	2022-12-10 10:24:07	Tree
[7e3572] by Christian Kohlöffel Merged changes from: https://www.ltspiceusers.ch/threads/dxf2gcode-installer-f%C3%BCr-linux-user.1085/#post-3080	2022-09-24 08:38:16	Tree
[b41864] by Christian Kohlöffel Corrected the german translation for the about dialog.	2022-05-19 19:18:14	Tree
[231f30] by Christian Kohlöffel Updated the translatiion files with latest contect of tool.	2022-05-19 05:50:50	Tree
[017840] by Christian Kohlöffel Updated the treeview.py to include logging messages for debugging. May help to better understand the code for dag & drop.	2022-05-18 15:56:49	Tree
[84b5e2] by Christian Kohlöffel Updated the treeview.py to include logging messages for debugging. May help to better understand the code for dag & drop.	2022-05-04 17:58:32	Tree
[aa7136] by Christian Kohlöffel Updated setup.py to include translation files in exe.	2022-02-26 17:07:51	Tree
[d13143] by Christian Kohlöffel Updated all information to Release Candidate 1	2022-02-26 14:36:00	Tree
[b6983e] by Christian Kohlöffel Updated all information to Release Candidate 1	2022-02-26 14:25:56	Tree
[a6bb6a] by Christian Kohlöffel Updated information to include renamed and added files.	2022-02-26 14:10:23	Tree
[895837] by Christian Kohlöffel Updated About dialog according to proposal here: https://www.ltspiceusers.ch/conversations/deutsche-%C3%9Cbersetzung.543/page-2#convMessage-776	2022-02-26 13:55:05	Tree
[3de0df] by spicer Complete german translation by Daniel Luginbühl	2022-02-18 19:50:40	Tree
[bc01f7] by treki , pushed by spicer Complete german translation by Daniel Luginbühl	2022-02-18 19:18:55	Tree
[becbb2] (dxf2gcode) by Christian Kohlöffel Renamed translation file according to discussion in forum: https://www.ltspiceusers.ch/threads/dxf2gcode-in-deutsch.963/post-2618	2022-02-06 16:46:34	Tree
[cc8d31] by Christian Kohlöffel Implemented the changes according to ticket: https://sourceforge.net/p/dxf2gcode/tickets/137/ Added a correction in export.	2022-02-02 17:19:17	Tree
[a0b456] by Christian Kohlöffel Implemented the changes according to ticket: https://sourceforge.net/p/dxf2gcode/tickets/137/	2022-01-03 09:11:01	Tree
[a35445] by Christian Kohlöffel Implemented the request according to: https://sourceforge.net/p/dxf2gcode/tickets/101/ This adds the possibility to start with the last used folders.	2021-12-22 14:41:18	Tree
[714272] by Christian Kohlöffel Fix according to Issue here: https://sourceforge.net/p/dxf2gcode/tickets/132/	2021-12-15 17:52:49	Tree
[aa4548] by Christian Kohlöffel Added one lin to run it directly from script.	2021-12-12 12:51:54	Tree
[fbccfd] by Christian Kohlöffel Corrected some issue with config file and also with the mill depth calcualtion for milling.	2021-12-12 11:43:17	Tree
[e41d4c] by Christian Kohlöffel Small typo correction according to former branch DrillFix	2021-05-20 14:26:03	Tree
[fcf31b] by neveruml , pushed by Christian Kohlöffel Fix drag & drop not working anymore in the treeview (QMimeData.setData() was expecting a QByteArray() and not a string)	2020-08-26 00:37:33	Tree
[8ade61] by Christian Kohlöffel Small typo correction according to former branch DrillFix	2021-05-02 18:11:52	Tree
[458e77] by Christian Kohlöffel Correction to mill already for the first path. this was wrong for last correction	2021-05-02 17:30:28	Tree
[c6ccce] by Christian Kohlöffel Correction of cutter compensation done by dxf2gcode to consider direction and offset in the right direction. Refer to https://sourceforge.net/p/dxf2gcode/tickets/105/	2021-05-02 17:21:44	Tree
[1e0a0b] by Christian Kohlöffel Include the Drill selection in a project file. Canvas now shows a Hole in the size of the tool if a Shape of Drill is selected.	2021-03-07 20:38:43	Tree
[153332] by Christian Kohlöffel Updated to be able to export a drill in a different way. Next step may be to draw things different if its a drill.	2021-03-07 11:35:48	Tree
[874893] by Christian Kohlöffel Added the possibility to change existing closed ARC GEos (Which are interpreted as circle) to a HoleGeo. Next step will be to update Postprocessor to enable special operation for HoleGeos.	2021-03-05 23:31:23	Tree
[67a72f] by Christian Kohlöffel Added some more improvement to make mill depth absolute and remove potential failures due to wrong sign. Added powerpoint with used pictures in documentation.	2021-02-04 08:05:17	Tree
[93dfd4] by Christian Kohlöffel Changed the build information to current date.	2020-11-01 11:44:20	Tree
[086e15] by Christian Kohlöffel Updated the build information to current date.	2020-11-01 11:34:36	Tree
[835c2b] by Christian Kohlöffel Added debug messages.	2020-11-01 08:36:36	Tree
[dd599c] by Andrey Zabolotnyi Added support for Unicode characters in layout names, block names etc. Better diagnostics for filtered out bad geometries (will be printed in console).	2020-04-05 21:20:41	Tree
[15dfee] by Damian Wrobel Add dxf sample file	2020-03-12 20:47:51	Tree
[263227] by Christian Kohlöffel Found some issue in the shapeoffset.py which produced a out or range error. Fixed this issue by adding an addition check for closed shapes. For detail refer to: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/dxf2gcode-users/kiCRK2Zp4gg/Y7YRMYz_AQAJ	2020-03-12 18:57:29	Tree
[d16902] by Andrey Zabolotnyi Do NOT reset cutter compensation to 40 after loading project file! User has to set cutter compensation for every shape all over again after each reload!	2020-03-09 21:18:47	Tree
[6a61b7] by Andrey Zabolotnyi Fixed a bug that would cause incorrect milling direction when using software cutter compensation (will be always CW, no matter if you change shape direction).	2020-03-09 20:59:55	Tree
[4da0a9] by Andrey Zabolotnyi Fixed a bug in latest changes that manifests itself only with the 2D driver. The reason was that the update() member function name is used by Qt objects, so I renamed it to updateShape().	2020-02-03 20:18:38	Tree
[3737ba] by Andrey Zabolotnyi Fixed bug in LWPOLYLINE shape loading. Bulges were wrongly attributed to the segment that was preceeding the really "bulged" segment.	2020-02-02 21:55:18	Tree
[b02bb5] by Andrey Zabolotnyi Fixed a bug in ShapeOffset class that would refuse in some case to create a offset shape. The bug was in the fact, that Arc.diff_ang will always return 2*pi instead of 0, and the logic of ShapeOffset supposes 0 is returned for zero angle.	2020-02-02 20:01:44	Tree
[34670f] by Andrey Zabolotnyi More conversions of __str__ to __repr__ as it allows easier debugging. Overriding __repr__ for class Geos to print the list not as a list (in one line), but each geometric object on a separate line (easier to read).	2020-02-02 19:55:24	Tree
[a632b5] by Andrey Zabolotnyi Now after "set nearest point" operation the start moves will be correctly updated on the drawing	2020-02-01 22:51:52	Tree
[086590] by Andrey Zabolotnyi Fixed a old nasty bug that would cause broken G-code export after invoking Shape.setNearestStPoint()	2020-02-01 22:20:20	Tree
[898e3f] by Andrey Zabolotnyi Fix program crash when loading dxf/top.dxf	2020-02-01 21:31:30	Tree
[706ed1] by Andrey Zabolotnyi Replaced __str__ with __repr__ which is similar, but allows printing lists of objects as well	2020-02-01 21:30:34	Tree
[0ac7fc] by Christian Kohlöffel Added new dxf test file used for pocket milling.	2020-01-29 21:35:51	Tree
[fe6c68] by Christian Kohlöffel Added all changes from following folder: (Now including them all :-) ) https://github.com/SanZamoyski/dxf2gcode-pocketMill/tree/RC1 Thanks to San Zamoyski for this big improvement	2020-01-29 21:34:10	Tree
[aa9883] by Christian Kohlöffel Added all changes from following folder: https://github.com/SanZamoyski/dxf2gcode-pocketMill/tree/RC1 Thanks to San Zamoyski for this big improvement	2020-01-29 21:23:48	Tree

Discussion

Richard Kenney - 2026-08-13

Status: open --> rejected
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

dxf2gcode SourceCode

DXF2GCODE: converting 2D dxf drawings to CNC machine compatible G-Code

Branches

Tags

SourceCode Merge Request #26: One line update to fix incorrect ConfigWindow enum (rejected)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Discussion