amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Tech ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES set as default

Browse source
This commit is contained in:
enricoturri1966 2020-10-12 13:09:04 +02:00
parent f04d9c1806
commit 5356b72a86
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/PrusaSlicer.cpp
View file

@ -154,7 +154,6 @@ int CLI::run(int argc, char **argv)
// Read input file(s) if any. // Read input file(s) if any.
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES
for (const std::string& file : m_input_files) { for (const std::string& file : m_input_files) {
std::string ext = boost::filesystem::path(file).extension().string(); std::string ext = boost::filesystem::path(file).extension().string();
if (boost::filesystem::path(file).extension().string() == ".gcode") { if (boost::filesystem::path(file).extension().string() == ".gcode") {
@ -164,7 +163,6 @@ int CLI::run(int argc, char **argv)
} }
} }
} }
#endif // ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES
if (!start_as_gcodeviewer) { if (!start_as_gcodeviewer) {
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
for (const std::string& file : m_input_files) { for (const std::string& file : m_input_files) {

1
src/libslic3r/Technologies.hpp
View file

@ -55,6 +55,5 @@
#define ENABLE_GCODE_VIEWER (1 && ENABLE_2_3_0_ALPHA1) #define ENABLE_GCODE_VIEWER (1 && ENABLE_2_3_0_ALPHA1)
#define ENABLE_GCODE_VIEWER_STATISTICS (0 && ENABLE_GCODE_VIEWER) #define ENABLE_GCODE_VIEWER_STATISTICS (0 && ENABLE_GCODE_VIEWER)
#define ENABLE_GCODE_VIEWER_DATA_CHECKING (0 && ENABLE_GCODE_VIEWER) #define ENABLE_GCODE_VIEWER_DATA_CHECKING (0 && ENABLE_GCODE_VIEWER)
#define ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES (1 && ENABLE_GCODE_VIEWER)
#endif // _prusaslicer_technologies_h_ #endif // _prusaslicer_technologies_h_

4
src/slic3r/GUI/MainFrame.cpp
View file

@ -113,7 +113,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
// Load the icon either from the exe, or from the ico file. // Load the icon either from the exe, or from the ico file.
#if _WIN32 #if _WIN32
{ {
#if ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES #if ENABLE_GCODE_VIEWER
wxString src_path; wxString src_path;
wxFileName::SplitPath(wxStandardPaths::Get().GetExecutablePath(), &src_path, nullptr, nullptr, wxPATH_NATIVE); wxFileName::SplitPath(wxStandardPaths::Get().GetExecutablePath(), &src_path, nullptr, nullptr, wxPATH_NATIVE);
switch (wxGetApp().get_app_mode()) { switch (wxGetApp().get_app_mode()) {
@ -128,7 +128,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
TCHAR szExeFileName[MAX_PATH]; TCHAR szExeFileName[MAX_PATH];
GetModuleFileName(nullptr, szExeFileName, MAX_PATH); GetModuleFileName(nullptr, szExeFileName, MAX_PATH);
SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO)); SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO));
#endif // ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES #endif // ENABLE_GCODE_VIEWER
} }
#else #else
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER