juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-24 05:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix various typos in source documentation (#11553)

Browse Source 
* Fix various typos in source documentation

* Delete cmake/modules/Catch2/CatchAddTests.cmake

* Delete tests/example/example_tests_main.cpp

* Revert test_config.cpp

---------

Co-authored-by: Ian Bassi <ian.bassi@outlook.com>
This commit is contained in:
luzpaz
2026-01-21 07:19:25 -05:00
committed by GitHub
parent 4c90144b98
commit a036de042b
15 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@@ -103,7 +103,7 @@ if(ORCA_TOOLS)
endif()
# Create a slic3r executable
# Process mainfests for various platforms.
# Process manifests for various platforms.
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/msw/OrcaSlicer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.rc @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/msw/OrcaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.manifest @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
@@ -136,7 +136,7 @@ elseif (MSVC)
# Manifest is provided through OrcaSlicer.rc, don't generate your own.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
else ()
# Boost on Raspberry-Pi does not link to pthreads explicitely.
# Boost on Raspberry-Pi does not link to pthreads explicitly.
target_link_libraries(OrcaSlicer ${CMAKE_DL_LIBS} -lstdc++ Threads::Threads pangoft2-1.0)
endif ()
@@ -184,7 +184,7 @@ set(output_dlls_Release "")
set(output_dlls_Debug "")
set(output_dlls_RelWithDebInfo "")
if (WIN32)
# This has to be a separate target due to the windows command line lenght limits
# This has to be a separate target due to the windows command line length limits
add_custom_target(COPY_DLLS ALL DEPENDS OrcaSlicer)
if (CMAKE_CONFIGURATION_TYPES)

28
src/OrcaSlicer.cpp
View File

@@ -254,7 +254,7 @@ typedef struct _cli_callback_mgr {
while(1) {
lck.lock();
m_condition.wait(lck, [this](){ return m_data_ready || m_exit; });
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": wakup.";
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": wakeup.";
if (m_data_ready) {
notify();
m_data_ready = false;
@@ -1221,7 +1221,7 @@ int CLI::run(int argc, char **argv)
PrinterTechnology printer_technology = get_printer_technology(m_config);
//BBS: remove GCodeViewer as seperate APP logic
//BBS: remove GCodeViewer as separate APP logic
/*bool start_as_gcodeviewer =
#ifdef _WIN32
false;
@@ -1299,7 +1299,7 @@ int CLI::run(int argc, char **argv)
params.input_files = std::move(m_input_files);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ", normal mode, input_files size = "<<params.input_files.size();
}
//BBS: remove GCodeViewer as seperate APP logic
//BBS: remove GCodeViewer as separate APP logic
//params.start_as_gcodeviewer = start_as_gcodeviewer;
BOOST_LOG_TRIVIAL(info) << "begin to launch OrcaSlicer GUI soon";
@@ -2636,7 +2636,7 @@ int CLI::run(int argc, char **argv)
}
};
//update seperate configs into full config
//update separate configs into full config
auto update_full_config = [](DynamicPrintConfig& full_config, const DynamicPrintConfig& config, std::set<std::string>& diff_key_sets, bool variant_count_changed, std::set<std::string>& key_set_1, std::set<std::string>& key_set_2, std::vector<int> variant_index, bool update_all = false, bool skip_gcodes = false) {
const t_config_option_keys& config_keys = config.keys();
BOOST_LOG_TRIVIAL(info) << boost::format("update_full_config: config keys count %1%")%config_keys.size();
@@ -4616,7 +4616,7 @@ int CLI::run(int argc, char **argv)
y = tower_margin;
}
//create the options using default if neccessary
//create the options using default if necessary
ConfigOptionFloats* wipe_x_option = m_print_config.option<ConfigOptionFloats>("wipe_tower_x", true);
ConfigOptionFloats* wipe_y_option = m_print_config.option<ConfigOptionFloats>("wipe_tower_y", true);
ConfigOptionFloat* width_option = m_print_config.option<ConfigOptionFloat>("prime_tower_width", true);
@@ -4756,7 +4756,7 @@ int CLI::run(int argc, char **argv)
y = WIPE_TOWER_MARGIN;
}
//create the options using default if neccessary
//create the options using default if necessary
ConfigOptionFloats* wipe_x_option = m_print_config.option<ConfigOptionFloats>("wipe_tower_x", true);
ConfigOptionFloats* wipe_y_option = m_print_config.option<ConfigOptionFloats>("wipe_tower_y", true);
ConfigOptionFloat wt_x_opt(x);
@@ -4913,7 +4913,7 @@ int CLI::run(int argc, char **argv)
ConfigOptionFloat wt_x_opt(x);
ConfigOptionFloat wt_y_opt(y);
//create the options using default if neccessary
//create the options using default if necessary
ConfigOptionFloats* wipe_x_option = m_print_config.option<ConfigOptionFloats>("wipe_tower_x", true);
ConfigOptionFloats* wipe_y_option = m_print_config.option<ConfigOptionFloats>("wipe_tower_y", true);
ConfigOptionFloat* width_option = m_print_config.option<ConfigOptionFloat>("prime_tower_width", true);
@@ -5212,7 +5212,7 @@ int CLI::run(int argc, char **argv)
}
// Move the unprintable items to the last virtual bed.
// Note ap.apply() moves relatively according to bed_idx, so we need to subtract the orignal bed_idx
// Note ap.apply() moves relatively according to bed_idx, so we need to subtract the original bed_idx
for (ArrangePolygon& ap : unprintable)
{
ap.bed_idx = bed_idx_max + 1;
@@ -5386,7 +5386,7 @@ int CLI::run(int argc, char **argv)
}
// Move the unprintable items to the last virtual bed.
// Note ap.apply() moves relatively according to bed_idx, so we need to subtract the orignal bed_idx
// Note ap.apply() moves relatively according to bed_idx, so we need to subtract the original bed_idx
for (ArrangePolygon& ap : unprintable)
{
ap.bed_idx = bed_idx_max + 1;
@@ -6094,7 +6094,7 @@ int CLI::run(int argc, char **argv)
outfile = outfile_dir + "/plate_" + std::to_string(index + 1) + ".gcode";
part_plate->set_tmp_gcode_path(outfile);
}
BOOST_LOG_TRIVIAL(info) << "process finished, will export gcode temporily to " << outfile << std::endl;
BOOST_LOG_TRIVIAL(info) << "process finished, will export gcode temporarily to " << outfile << std::endl;
temp_time = (long long)Slic3r::Utils::get_current_time_utc();
outfile = print_fff->export_gcode(outfile, gcode_result, nullptr);
time_using_cache = time_using_cache + ((long long)Slic3r::Utils::get_current_time_utc() - temp_time);
@@ -6438,7 +6438,7 @@ int CLI::run(int argc, char **argv)
BOOST_LOG_TRIVIAL(error) << "init opengl failed! skip thumbnail generating" << std::endl;
}
else {
BOOST_LOG_TRIVIAL(info) << "glewInit Sucess." << std::endl;
BOOST_LOG_TRIVIAL(info) << "glewInit Success." << std::endl;
GLVolumeCollection glvolume_collection;
Model &model = m_models[0];
int obj_extruder_id = 1, volume_extruder_id = 1;
@@ -6513,7 +6513,7 @@ int CLI::run(int argc, char **argv)
int dec_ret = decode_png_to_thumbnail(plate_data->thumbnail_file, plate_data->plate_thumbnail);
if (!dec_ret)
{
BOOST_LOG_TRIVIAL(info) << boost::format("decode png to mem sucess.");
BOOST_LOG_TRIVIAL(info) << boost::format("decode png to mem success.");
}
else {
BOOST_LOG_TRIVIAL(warning) << boost::format("decode png to mem failed.");
@@ -6752,7 +6752,7 @@ int CLI::run(int argc, char **argv)
int dec_ret = decode_png_to_thumbnail(plate_data->thumbnail_file, plate_data->plate_thumbnail);
if (!dec_ret)
{
BOOST_LOG_TRIVIAL(info) << boost::format("decode png to mem sucess.");
BOOST_LOG_TRIVIAL(info) << boost::format("decode png to mem success.");
need_create_thumbnail_group = true;
}
else {
@@ -7151,7 +7151,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
boost::nowide::cout
<< std::endl
<< "Print settings priorites:" << std::endl
<< "Print setting priorities:" << std::endl
<< "\t1) setting values from the command line (highest priority)"<< std::endl
<< "\t2) setting values loaded with --load_settings and --load_filaments" << std::endl
<< "\t3) setting values loaded from 3mf(lowest priority)" << std::endl;

2
src/OrcaSlicer_app_msvc.cpp
View File

@@ -276,7 +276,7 @@ int wmain(int argc, wchar_t **argv)
if (hInstance_OpenGL == nullptr) {
printf("MESA OpenGL library was not loaded\n");
} else
printf("MESA OpenGL library was loaded sucessfully\n");
printf("MESA OpenGL library was loaded successfully\n");
}
#endif /* SLIC3R_GUI */