3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20381 commits 1 branch 1 tag 249 MiB
Commit graph

414 commits

Author SHA1 Message Date
Filip Sykala - NTB T15p
3bd557b177 Escape ## in name of style in imgui visualization(issue 61) 2022-09-21 15:15:32 +02:00
Filip Sykala - NTB T15p
ed6a1b18f3 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
 2022-09-14 11:28:36 +02:00
Lukas Matena
d4dde50145 Repetier: enforce autostart #7807 2022-09-05 15:38:32 +02:00
Lukas Matena
39af553c2a Repetier validation using 'software' value if present #7807 2022-09-05 15:38:32 +02:00
Filip Sykala - NTB T15p
9cefc74e3d Fix using of deprecated opengl functions 2022-08-31 15:53:13 +02:00
Filip Sykala - NTB T15p
ac6a91debe Fix opengl core using -- remove GL_ALPHA to use texture with GL_RGBA 
-- take more memory from GPU but works universaly(independent on opengl version)
 2022-08-31 15:28:23 +02:00
Filip Sykala - NTB T15p
c549c6afbe Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Point.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLSelectionRectangle.cpp
#	src/slic3r/GUI/GUI_Factories.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/MeshUtils.cpp
#	src/slic3r/GUI/MeshUtils.hpp
#	src/slic3r/GUI/ObjectDataViewModel.cpp
#	src/slic3r/GUI/ObjectDataViewModel.hpp
#	src/slic3r/GUI/Selection.cpp
 2022-08-31 15:22:10 +02:00
Vojtech Bubnik
7e77048593 Removed shiny profiler. The Shiny profiler was only working on MSVC 
and nowadays the sampling profiler inside Visual Studio is better.
 2022-08-24 16:32:01 +02:00
Filip Sykala - NTB T15p
94f735168c fix warnings: 
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1452:18: warning: unused variable 'volume_id' [-Wunused-variable]
../src/slic3r/Utils/EmbossStyleManager.cpp:64:18: warning: unused variable 'loaded' [-Wunused-variable]
 2022-08-16 18:12:08 +02:00
Filip Sykala - NTB T15p
e631d3999c Fix path for just created font by description 
Fix for issue #64 - linux loading windows font
 2022-08-15 12:04:22 +02:00
Filip Sykala - NTB T15p
64728feec3 Store configuration on gizmo close not destructor 2022-08-05 15:28:12 +02:00
Filip Sykala - NTB T15p
fa773f09d3 Store last activ style index into configuration 2022-08-04 15:45:52 +02:00
Filip Sykala - NTB T15p
41aaa13ce7 fix switching between styles 2022-08-04 15:35:44 +02:00
Filip Sykala - NTB T15p
a6ffbb63f0 Remove undo button after style selector 2022-08-04 12:52:58 +02:00
Filip Sykala - NTB T15p
a1914f5f94 add getter on font atlas into style manager 
- get imgui font could return nonValid imgui font to recognize font without loaded symbol
 2022-08-03 19:28:02 +02:00
Filip Sykala - NTB T15p
5e76d86460 rename font_item to style 2022-08-03 13:05:06 +02:00
Filip Sykala - NTB T15p
8e261ace29 add setter for wx_font in style manager 2022-08-03 11:29:23 +02:00
Filip Sykala - NTB T15p
003c7fc54f Rename FontItem to EmbossStyle 2022-08-03 10:29:05 +02:00
Filip Sykala - NTB T15p
ee03ed6d07 Rename file 2022-08-03 09:16:39 +02:00
Filip Sykala - NTB T15p
4267af64e5 Rename FontManager to EmbossStyleManager 2022-08-03 09:11:00 +02:00
Filip Sykala - NTB T15p
26eb8b02ef fix style 'save as' operation + 'rename' 2022-08-01 13:56:00 +02:00
Filip Sykala - NTB T15p
569ba0600c Fix rename and save as style text 2022-07-29 18:21:40 +02:00
Filip Sykala - NTB T15p
f7eef00abb Separate actual style from styles 
(save button will save only actual style no others)
 2022-07-29 09:06:20 +02:00
Filip Sykala - NTB T15p
79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss 
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Selection.cpp
#	src/slic3r/GUI/Selection.hpp
 2022-07-20 13:02:07 +02:00
David Kocik
cd30e8f2e7 get_host_from_url function 2022-07-17 18:40:07 +02:00
David Kocik
a2330e77c2 Filter lookup replies by service name 2022-07-17 18:40:07 +02:00
David Kocik
8481de43cc Improved error message if both ipv4 and ipv6 upload fails. 2022-07-17 18:40:07 +02:00
David Kocik
d9058b2a92 Cancel upload priority before error showing. 2022-07-17 18:40:07 +02:00
David Kocik
89e288dcf8 Propagate resolved ip address to the UI layer (both upload dialog and notification) 2022-07-17 18:40:07 +02:00
David Kocik
bc167ce90b Decision tree for different types and numbers of resolved IPs. 2022-07-17 18:40:07 +02:00
David Kocik
9fd3108726 Resolved IP dialog before uploading - needs better design and to not show if only 1x v4 and v6 is resolved. 2022-07-17 18:40:07 +02:00
David Kocik
36f473c984 Bonjour lookup function in same style as resolve function. 
Includes refactoring of resolve function. 
refactor
 2022-07-17 18:40:07 +02:00
David Kocik
457a5d4a65 system ifdefs 2022-07-17 18:40:07 +02:00
David Kocik
d2c6f597d2 Bonjour - resolve hostname to IP using mdns. 
Octoprint - on Windows use Bonjour resolving to get IP address before the http connection. Only use Windows address resolving if Bonjour couldn't resolve.
 2022-07-17 18:40:07 +02:00
Lukas Matena
6c0db58628 Fixing conflicts part 4: 
See previous commit. This one applies changes from master_250
to the files mentioned
 2022-06-29 16:43:29 +02:00
Lukas Matena
d662bf2a18 Fixing conflicts part 3: 
Some files have whitespace changes that make resolving conflicts difficult.
Take the version from master first, next commit will apply changes from master_250
 2022-06-29 16:43:29 +02:00
Lukas Matena
b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED): 
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250.  Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250.  Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
 2022-06-29 14:37:14 +02:00
PavelMikus
a3d10f7f50 fix deadlock condition varaible use in netfabb wrapper 2022-06-17 16:14:30 +02:00
Lukas Matena
9aa104d080 Revert "Merge branch 'pm_stable_meshfix' into dev_250" 
This reverts commit 71a8ead282, reversing
changes made to a1143ab26e.
 2022-06-17 16:13:18 +02:00
PavelMikus
04ac99a54e fix deadlock condition varaible use in netfabb wrapper 2022-06-07 11:10:52 +02:00
PavelMikus
24dc0317a2 Fix undefined behavior and other issues in the MeshFix library 
!ADD call to TMesh::init function to initialize prediacates, fixes problems
turn off result check - sometimes it is too restrictive
 2022-06-07 11:10:52 +02:00
PavelMikus
91eb0b8153 fix multipart object progress bar 2022-06-07 11:10:52 +02:00
PavelMikus
4a92b110e6 small includes optimization 2022-06-07 11:10:51 +02:00
PavelMikus
20c91aa48e Meshfix integration into GUI 2022-06-07 11:10:51 +02:00
Slicer
879a03fda4 Changed http::ca_file_supported function to return false for OSX. 2022-06-02 09:03:52 +02:00
Filip Sykala
ff604785f6 Fix cleaning during actualization of raycast manager 2022-05-31 20:09:51 +02:00
Filip Sykala
e0d5505413 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
 2022-05-31 11:14:53 +02:00
enricoturri1966
1b09628b0d #8332 - File association on Windows: reimplemented to allow setting PrusaSlicer as default application for .3mf and .stl files and GCodeViewer as default application for .gcode files 2022-05-25 13:14:33 +02:00
Filip Sykala
37961c36e8 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
 2022-05-18 14:35:48 +02:00
enricoturri1966
39cefdad89 Tech ENABLE_REMOVE_ASSOCIATION_TO_FILE_FOR_WINDOWS_8_AND_LATER - Disable association to 3mf and stl files if the application is run on Windows 8 or later 2022-05-17 13:19:33 +02:00