Skip to content

Commit

Permalink
Merge pull request #61 from XRay3D/dev080
Browse files Browse the repository at this point in the history 
Dev0803
  • Loading branch information
@XRay3D
XRay3D committed Nov 11, 2021
2 parents eaa0084 + 4eccf87 commit e708004
Show file tree
Hide file tree
Showing 359 changed files with 3,855 additions and 2,826 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* *
#* Author : Damir Bakiev *
#* Version : na *
#* Date : 14 January 2021 *
#* Date : 11 November 2021 *
#* Website : na *
#* Copyright : Damir Bakiev 2016-2021 *
#* *
Expand All @@ -17,7 +17,7 @@ project(Gerber_X3)

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

set_property(GLOBAL PROPERTY CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD 20)
Expand Down
2 changes: 1 addition & 1 deletion GGEasy.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ HEADERS += \
static_libs\gi\thermalpreviewitem.h \
static_libs\graphicsview\edid.h \
static_libs\graphicsview\graphicsview.h \
static_libs\graphicsview\qdruler.h \
static_libs\graphicsview\ruler.h \
static_libs\graphicsview\scene.h \
static_libs\thermal\thermal.h \
static_libs\thermal\thermaldelegate.h \
Expand Down
15 changes: 8 additions & 7 deletions GGEasy/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* *
#* Author : Damir Bakiev *
#* Version : na *
#* Date : 14 January 2021 *
#* Date : 11 November 2021 *
#* Website : na *
#* Copyright : Damir Bakiev 2016-2021 *
#* *
Expand All @@ -23,7 +23,7 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

#set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

# QtCreator supports the following variables for Android, which are identical to qmake Android variables.
Expand Down Expand Up @@ -64,16 +64,18 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(SUFFIX "_msvc")
if(CMAKE_CL_64)
set(SUFFIX "${SUFFIX}_x64")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin_x64")
else()
set(SUFFIX "${SUFFIX}_x32")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin_x32")
endif()
include_directories (
C:/dev/CGAL-5.1.2/auxiliary/gmp/include
C:/dev/CGAL-5.1.2/include
C:/dev/boost_1_75_0
# C:/dev/CGAL-5.1.2/auxiliary/gmp/include
# C:/dev/CGAL-5.1.2/include
C:/local/boost_1_76_0_x64
)
link_directories(
C:/dev/CGAL-5.1.2/auxiliary/gmp/lib
# C:/dev/CGAL-5.1.2/auxiliary/gmp/lib
)
endif()

Expand All @@ -96,7 +98,6 @@ add_definitions(

#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_GX3_DIR}/bin)
#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_GX3_DIR}/bin)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin")

find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui Widgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/aboutform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/aboutform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* *
#* Author : Damir Bakiev *
#* Version : na *
#* Date : 14 January 2021 *
#* Date : 11 November 2021 *
#* Website : na *
#* Copyright : Damir Bakiev 2016-2021 *
#* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/drillform/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* *
#* Author : Damir Bakiev *
#* Version : na *
#* Date : 14 January 2021 *
#* Date : 11 November 2021 *
#* Website : na *
#* Copyright : Damir Bakiev 2016-2021 *
#* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/drillform/drillform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/drillform/drillform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/drillform/drillmodel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/drillform/drillmodel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/formsutil/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* *
#* Author : Damir Bakiev *
#* Version : na *
#* Date : 14 January 2021 *
#* Date : 11 November 2021 *
#* Website : na *
#* Copyright : Damir Bakiev 2016-2021 *
#* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/formsutil/errordialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/formsutil/errordialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
11 changes: 1 addition & 10 deletions GGEasy/forms/formsutil/formsutil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand All @@ -19,17 +19,9 @@

#include "gcode/gcode.h"

#include "erroritem.h"
#include "project.h"
#include "qprogressdialog.h"
#include "scene.h"
#include <QEvent>
#include <QFile>
#include <QJsonArray>
#include <QJsonDocument>
#include <QMessageBox>
#include <QPushButton>
#include <QTimer>

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

Expand Down Expand Up @@ -98,7 +90,6 @@ void FormsUtil::timerEvent(QTimerEvent* event)
const auto [max, val] = m_tpc->getProgress();
progressDialog->setMaximum(max);
progressDialog->setValue(val);

progressDialog->setLabelText(m_tpc->msg);
}
if (event->timerId() == flikerTimerId) {
Expand Down
4 changes: 2 additions & 2 deletions GGEasy/forms/formsutil/formsutil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down Expand Up @@ -49,7 +49,7 @@ class FormsUtil : public QWidget, protected FormsUtilI {
// QObject interface
virtual void timerEvent(QTimerEvent* event) override;

GCode::Creator* m_tpc = nullptr;
GCode::Creator* const m_tpc;
GCode::Direction direction = GCode::Climb;
GCode::SideOfMilling side = GCode::Outer;
UsedItems m_usedItems;
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/gcodepropertiesform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/gcodepropertiesform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/hatchingform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/hatchingform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/pocketoffsetform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/pocketoffsetform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/pocketrasterform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/pocketrasterform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/profileform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/profileform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
2 changes: 1 addition & 1 deletion GGEasy/forms/toolname.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* *
* Author : Damir Bakiev *
* Version : na *
* Date : 14 January 2021 *
* Date : 11 November 2021 *
* Website : na *
* Copyright : Damir Bakiev 2016-2021 *
* *
Expand Down
Loading

0 comments on commit e708004

Please sign in to comment.