Skip to content

Commit e708004

Browse files
XRay3DXRay3D
authored
Merge pull request #61 from XRay3D/dev080
Dev0803
2 parents eaa0084 + 4eccf87 commit e708004

File tree

359 files changed

+3855
-2826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

359 files changed

+3855
-2826
lines changed

‎CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#* *
33
#* Author : Damir Bakiev *
44
#* Version : na *
5-
#* Date : 14 January 2021 *
5+
#* Date : 11 November 2021 *
66
#* Website : na *
77
#* Copyright : Damir Bakiev 2016-2021 *
88
#* *
@@ -17,7 +17,7 @@ project(Gerber_X3)
1717

1818
add_definitions(-DQT_MESSAGELOGCONTEXT)# qDebug()
1919
add_definitions(-DCTRE)
20-
add_definitions(-L/usr/lib64 -static -static-libstdc++ -static-libgcc)
20+
#add_definitions(-L/usr/lib64 -static -static-libstdc++ -static-libgcc)
2121

2222
set_property(GLOBAL PROPERTY CXX_STANDARD 20)
2323
set(CMAKE_CXX_STANDARD 20)

‎GGEasy.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ HEADERS += \
399399
static_libs\gi\thermalpreviewitem.h \
400400
static_libs\graphicsview\edid.h \
401401
static_libs\graphicsview\graphicsview.h \
402-
static_libs\graphicsview\qdruler.h \
402+
static_libs\graphicsview\ruler.h \
403403
static_libs\graphicsview\scene.h \
404404
static_libs\thermal\thermal.h \
405405
static_libs\thermal\thermaldelegate.h \

‎GGEasy/CMakeLists.txt

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#* *
33
#* Author : Damir Bakiev *
44
#* Version : na *
5-
#* Date : 14 January 2021 *
5+
#* Date : 11 November 2021 *
66
#* Website : na *
77
#* Copyright : Damir Bakiev 2016-2021 *
88
#* *
@@ -23,7 +23,7 @@ set(CMAKE_AUTOUIC ON)
2323
set(CMAKE_AUTOMOC ON)
2424
set(CMAKE_AUTORCC ON)
2525

26-
#set(CMAKE_CXX_STANDARD 17)
26+
set(CMAKE_CXX_STANDARD 20)
2727
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2828

2929
# QtCreator supports the following variables for Android, which are identical to qmake Android variables.
@@ -64,16 +64,18 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
6464
set(SUFFIX "_msvc")
6565
if(CMAKE_CL_64)
6666
set(SUFFIX "${SUFFIX}_x64")
67+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin_x64")
6768
else()
6869
set(SUFFIX "${SUFFIX}_x32")
70+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin_x32")
6971
endif()
7072
include_directories (
71-
C:/dev/CGAL-5.1.2/auxiliary/gmp/include
72-
C:/dev/CGAL-5.1.2/include
73-
C:/dev/boost_1_75_0
73+
# C:/dev/CGAL-5.1.2/auxiliary/gmp/include
74+
# C:/dev/CGAL-5.1.2/include
75+
C:/local/boost_1_76_0_x64
7476
)
7577
link_directories(
76-
C:/dev/CGAL-5.1.2/auxiliary/gmp/lib
78+
# C:/dev/CGAL-5.1.2/auxiliary/gmp/lib
7779
)
7880
endif()
7981

@@ -96,7 +98,6 @@ add_definitions(
9698

9799
#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_GX3_DIR}/bin)
98100
#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_GX3_DIR}/bin)
99-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin")
100101

101102
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui Widgets REQUIRED)
102103
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS

‎GGEasy/aboutform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* *
55
* Author : Damir Bakiev *
66
* Version : na *
7-
* Date : 14 January 2021 *
7+
* Date : 11 November 2021 *
88
* Website : na *
99
* Copyright : Damir Bakiev 2016-2021 *
1010
* *

‎GGEasy/aboutform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#* *
33
#* Author : Damir Bakiev *
44
#* Version : na *
5-
#* Date : 14 January 2021 *
5+
#* Date : 11 November 2021 *
66
#* Website : na *
77
#* Copyright : Damir Bakiev 2016-2021 *
88
#* *

‎GGEasy/forms/drillform/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#* *
33
#* Author : Damir Bakiev *
44
#* Version : na *
5-
#* Date : 14 January 2021 *
5+
#* Date : 11 November 2021 *
66
#* Website : na *
77
#* Copyright : Damir Bakiev 2016-2021 *
88
#* *

‎GGEasy/forms/drillform/drillform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *

‎GGEasy/forms/drillform/drillform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/drillform/drillmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *

‎GGEasy/forms/drillform/drillmodel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/formsutil/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#* *
33
#* Author : Damir Bakiev *
44
#* Version : na *
5-
#* Date : 14 January 2021 *
5+
#* Date : 11 November 2021 *
66
#* Website : na *
77
#* Copyright : Damir Bakiev 2016-2021 *
88
#* *

‎GGEasy/forms/formsutil/errordialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/formsutil/errordialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/formsutil/formsutil.cpp

+1-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *
@@ -19,17 +19,9 @@
1919

2020
#include "gcode/gcode.h"
2121

22-
#include "erroritem.h"
2322
#include "project.h"
2423
#include "qprogressdialog.h"
2524
#include "scene.h"
26-
#include <QEvent>
27-
#include <QFile>
28-
#include <QJsonArray>
29-
#include <QJsonDocument>
30-
#include <QMessageBox>
31-
#include <QPushButton>
32-
#include <QTimer>
3325

3426
const int gcpId = qRegisterMetaType<GCode::GCodeParams>("GCode::GCodeParams");
3527

@@ -98,7 +90,6 @@ void FormsUtil::timerEvent(QTimerEvent* event)
9890
const auto [max, val] = m_tpc->getProgress();
9991
progressDialog->setMaximum(max);
10092
progressDialog->setValue(val);
101-
10293
progressDialog->setLabelText(m_tpc->msg);
10394
}
10495
if (event->timerId() == flikerTimerId) {

‎GGEasy/forms/formsutil/formsutil.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *
@@ -49,7 +49,7 @@ class FormsUtil : public QWidget, protected FormsUtilI {
4949
// QObject interface
5050
virtual void timerEvent(QTimerEvent* event) override;
5151

52-
GCode::Creator* m_tpc = nullptr;
52+
GCode::Creator* const m_tpc;
5353
GCode::Direction direction = GCode::Climb;
5454
GCode::SideOfMilling side = GCode::Outer;
5555
UsedItems m_usedItems;

‎GGEasy/forms/gcodepropertiesform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *

‎GGEasy/forms/gcodepropertiesform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/hatchingform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *

‎GGEasy/forms/hatchingform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/pocketoffsetform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *

‎GGEasy/forms/pocketoffsetform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/pocketrasterform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *

‎GGEasy/forms/pocketrasterform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/profileform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *

‎GGEasy/forms/profileform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* Author : Damir Bakiev *
44
* Version : na *
5-
* Date : 14 January 2021 *
5+
* Date : 11 November 2021 *
66
* Website : na *
77
* Copyright : Damir Bakiev 2016-2021 *
88
* *

‎GGEasy/forms/toolname.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* *
66
* Author : Damir Bakiev *
77
* Version : na *
8-
* Date : 14 January 2021 *
8+
* Date : 11 November 2021 *
99
* Website : na *
1010
* Copyright : Damir Bakiev 2016-2021 *
1111
* *

0 commit comments

Comments
 (0)