Commit Graph
67 Commits
Author SHA1 Message Date
Ocraftyone 047b889ba6 ENH: Better Scrolling Over Multiline Fields (#4218)
* Improve scrolling over multiline fields

* Fix text control scrolling
2024-02-27 22:03:59 +08:00
3b7b10f72f Port "No Unsupported Perimeters" feature from SS (#3189)
* first impl

* Properly handle extra bridges in `detect_surfaces_type()`

* Pass `perimeter_spacing` and `ext_perimeter_width` as parameters instead of instance property

* Make `process_no_bridge()` private

* Attempt to run `process_no_bridge()` in arachne

* Update `BridgeDetector::coverage` to give us more precise bridge coverage

Co-authored-by: supermerill <merill@free.fr>

* Fix bridge infill margin scaling

* Rename the option name as well as add tooltip

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
Co-authored-by: supermerill <merill@free.fr>
Co-authored-by: SoftFever <softfeverever@gmail.com>
2024-01-28 10:12:55 +00:00
Ocraftyone fba490969d Add Devcontainer Support (#3777)
* add devcontainer files

* update postCreate

* add chmod for postCreate

* set CORES env variable to pass to build tool

* remove ssh functionality

* Move delete env file cmd to postStartCommand

* update how env file is done

* Update

- Move to older version of ubuntu for compatability
- Change vnc password to orca
2024-01-27 14:16:30 +08:00
Ocraftyone c4a66f36ae Debug Improvments on Windows (#3275)
* fix assert statements

* Add ORCA_INCLUDE_DEBUG_INFO to deps cmake

adds option ORCA_INCLUDE_DEBUG_INFO to deps build script to allow an alternative for RelWithDebInfo that works on windows

* add build type option to windows script

* update .gitignore to include build*
2024-01-24 11:48:14 +00:00
Ocraftyone 11fd73a90d Merge branch 'main' into enh-port-edit-gcode-dlg 2024-01-21 14:12:39 -05:00
Ocraftyone 7c02b5c9f4 Revert to BBL get_line function 2024-01-21 14:11:06 -05:00
Ocraftyone ead78a98f9 Re-enable printing by object gcode (#3691)
Re-enable printing by object gcide
2024-01-21 21:06:23 +08:00
Ocraftyone 9f44e151ba Merge branch 'main' into enh-port-edit-gcode-dlg 2024-01-20 19:43:17 -05:00
Ocraftyone 595f707f22 Fix linux crashing when opening EditGcodeDialog 2024-01-21 00:40:52 +00:00
Ocraftyone 9b76f51bd3 Update BuildLinux.sh (#3679)
* Update BuildLinux.sh

Echo the cmake command. Helps with transparency of what command/parameters are being used. Helps point users in the right direction if they want to build via an IDE.

* Update BuildLinux.sh
2024-01-15 22:34:25 +08:00
Ocraftyone 0af1b9b958 Merge branch 'main' into enh-port-edit-gcode-dlg 2024-01-14 03:54:27 -05:00
Ocraftyone 7dd7b301e1 Remove Resizeable Border
Helps with previous commit
DataView currently doesn't resize vertically
Also, at the moment, the resize grabber is not respecting dark mode and this solves that too.
2024-01-11 06:46:04 -05:00
Ocraftyone aef74ab005 Hardcode Location of Add Button
Hardcoding it prevents the add button from jumping around when switching between parameters with single-line and multi-line descriptions
2024-01-11 06:03:20 -05:00
Ocraftyone 3252e1c228 Append extra parameters from preset
If an option is not under a category in the tab but is part of the preset, it is added to the dataview.
2024-01-10 21:33:53 -05:00
Ocraftyone 8de9d97cd8 Add search term highlighting to EditGCodeDialog
Now leaves text stored in ParamsNode un-formatted and uses flags to determine the formatting. The GetFormattedText function now returns the markup text.
2024-01-10 07:22:36 -05:00
Ocraftyone 22302a0f10 Merge branch 'main' into enh-port-edit-gcode-dlg 2024-01-10 07:18:47 -05:00
Ocraftyone d5ee4ff1ab Merge branch 'main' into enh-port-edit-gcode-dlg 2024-01-08 22:41:35 -05:00
Ocraftyone 068b888199 Implement Search for GCode DataView 2024-01-08 18:00:32 -05:00
Ocraftyone 40a980f5d8 CICD: Fail on no cache hit (#3429) 2024-01-06 13:46:53 +08:00
Ocraftyone 43417b0f63 fix linux compilation 2024-01-05 21:01:45 -05:00
Ocraftyone 907b160007 Merge remote-tracking branch 'origin/enh-port-edit-gcode-dlg' into enh-port-edit-gcode-dlg 2024-01-05 06:06:40 -05:00
Ocraftyone 50b7b3d073 Remove unused code 2024-01-05 06:03:34 -05:00
Ocraftyone a8c3377d9b Merge branch 'main' into enh-port-edit-gcode-dlg 2024-01-05 05:59:43 -05:00
Ocraftyone 4abca6a091 Override full config defs in non-preset categories 2024-01-05 05:58:44 -05:00
Ocraftyone ecd20184f9 Add the rest of the param defs
Also added temperatures category to handle them
2024-01-05 05:24:53 -05:00
Ocraftyone b619e5bf8e Merge remote-tracking branch 'origin/enh-port-edit-gcode-dlg' into enh-port-edit-gcode-dlg 2024-01-02 00:58:44 -05:00
Ocraftyone 42e6b18149 Check if cmake option is truthy rather than defined 2024-01-02 00:56:30 -05:00
Ocraftyone a8148d8ee6 Merge branch 'main' into enh-port-edit-gcode-dlg 2024-01-01 11:01:22 -05:00
Ocraftyone 23942781ff fix spacing in tooltip 2024-01-01 10:58:27 -05:00
Ocraftyone 7f1f94d531 Subgroup presets by page 2024-01-01 10:58:26 -05:00
Ocraftyone 7297997837 Add defs for custom gcode 2024-01-01 10:58:25 -05:00
Ocraftyone 2235371f91 Don't show option if defined with type coNone 2024-01-01 10:58:24 -05:00
Ocraftyone 529f14d64b Use proper config when checking for custom gcode
make sure that the local copy of the config is being used when checking if there is custom gcode otherwise it would be possible it doesn't get run during testing
2024-01-01 10:58:23 -05:00
Ocraftyone 066e2f6062 Make Compatible with wx 3.1.5
This should be reverted when wxWidgets 3.2.1 is re-implemented
2024-01-01 10:58:22 -05:00
Ocraftyone f78d55eac5 Merge branch 'main' into enh-port-edit-gcode-dlg
# Conflicts:
#	src/slic3r/GUI/OG_CustomCtrl.cpp
#	src/slic3r/GUI/OG_CustomCtrl.hpp
2024-01-01 10:58:04 -05:00
Ocraftyone 4e3039b6f9 Improve checking placeholders
Dialog now shows all issues within the same dialog

If a custom gcode value is not specified within the config, a testing value is added. This ensures that (most) of the custom gcode is parsed, and thus checked against the definitions.
2024-01-01 10:57:23 -05:00
Ocraftyone d839d673d0 Remove SlicingState Options that aren't in Orca
Also organized and added missing options to `s_CustomGcodeSpecificPlaceholders`
2024-01-01 10:57:22 -05:00
OcraftyoneandYuSanka 5fc6301520 Update Icons
Add new icons from PS and update to use Orca color scheme

Original Commit: prusa3d/PrusaSlicer@37afe79

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:21 -05:00
Ocraftyone 2109ac649d Fix duplicate else statement 2024-01-01 10:57:19 -05:00
Ocraftyone 011d7ade15 Remove extraneous options 2024-01-01 10:57:18 -05:00
OcraftyoneandYuSanka 7a1d782ce1 Add fix for linux
Original Commit: prusa3d/PrusaSlicer@361ef22

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:17 -05:00
OcraftyoneandLukas Matena 8c6100ea21 Update Labels
Original Commit: prusa3d/PrusaSlicer@7efdbec

Co-authored-by: Lukas Matena <lukasmatena@seznam.cz>
2024-01-01 10:57:15 -05:00
OcraftyoneandYuSanka 036b21edb9 Add wrapping description
Original Commit: prusa3d/PrusaSlicer@83b8988

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:14 -05:00
OcraftyoneandYuSanka 0e590083fa Edit Custom G-Codes Improvements
Orca: Added option to use CMake config option ORCA_CHECK_GCODE_PLACEHOLDERS to check custom gcode placeholders rather than using debug

Original Commit: prusa3d/PrusaSlicer@b8bb7f2

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:13 -05:00
OcraftyoneandYuSanka 6539dc4efa Add parameter description
Original Commit: prusa3d/PrusaSlicer@d652f15

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:11 -05:00
OcraftyoneandYuSanka 58cd50cc23 Implemented new grouping for the params
Original Commit: prusa3d/PrusaSlicer@b2bd7f5

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:10 -05:00
OcraftyoneandYuSanka 6d19d6207a Partial Automation of getting Gcode placeholders
Included pre-generated files specific to Orca rather than PS provided files

Original Commit: prusa3d/PrusaSlicer@55d5921

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:09 -05:00
OcraftyoneandYuSanka 05e159037f Improved ParamsViewCtrl
Original Commit: prusa3d/PrusaSlicer@59af551

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:07 -05:00
OcraftyoneandYuSanka bdac496130 Implement ParamsViewCtrl
+ GUI_App : Fixed update of the dark mode, when DataViewCtrl doesn't have header
-Orca: currently doesn't seem to display dataview labels properly. TBD if it continues to be an issue.

Original Commit: prusa3d/PrusaSlicer@c577b7f

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:06 -05:00
OcraftyoneandYuSanka dd802764b9 Add first impl of EditGCodeDialog
Only current issue is that the grabber for the resizeable window is currently white (ongoing issue for Orca)

Original Commit: prusa3d/PrusaSlicer@a8307bf

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:05 -05:00
OcraftyoneandYuSanka accdbb9661 Implement Preparation for Edit Custom Gcode
Original Commit: prusa3d/PrusaSlicer@7db83d5

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:04 -05:00
OcraftyoneandYuSanka 4f0a47b7f4 add UndoValueUIManager from PS
from prusa3d/PrusaSlicer@32ff20d

Co-authored-by: YuSanka <yusanka@gmail.com>
2024-01-01 10:57:03 -05:00
53d752b606 Fix wx issues from upgrade (#3032)
* fix top bar resizing

* Attempt to fix bitmap bundle scaling issues

* Revert "Attempt to fix bitmap bundle scaling issues"

This reverts commit e94ba58d90.

* Fix AboutDialog and partially fix SwitchButton

* Fix switch button scaling on windows

* Fix dropdown icon size

* fixed sdcard/recording/timelapse icon size in device page

* Set use_legacy_bmp to true by default to it's back compatible

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
2023-12-21 08:27:02 +00:00
Ocraftyone 75b1a30293 fix pwsh variable in CICD (#3188) 2023-12-19 16:07:30 +08:00
25a055491e Update wxWidgets to v3.2.1 (#2905)
* Upgrade wxWidgets to 3.2.1
Based on prusa3d/PrusaSlicer@9a7e024

Co-authored-by: tamasmeszaros <meszaros.q@gmail.com>

* Implement BitmapCache

* update wxExtensions while keeping legacy items

* update dc.DrawBitmap calls to use get_bitmap

* Fix GetSize/Width/Height calls

* update BitmapComboBox

* fix ifndef in wxExtensions.hpp

* update my todos to OcraftyoneTODO

* Get to a compilable state
Everything seems to be working (including the plater). I am not seeing any graphical issues

* fix extruder color icons

* fix crash on opening support tab

* remove GetBmpSize method from DropDown.cpp

* Update TextInput to use bitmap bundles

* update a TODO after testing

* fix the rendering of the icons on combobox

* fix a few todos

* fix WipeTowerDialog.cpp

* Overhaul WipeTowerDialog

Removed simple version of the dialog since BBS removed the functionality but left the code.
Center the table (only seen when the table is smaller than the minimum size of the dialog)
Fix issue where editing a value causes the m_min_flush_label to change colors slightly
Fix an issue where changing a value or running an auto calc changes the disabled value from "-" to "0"

* update a few todos

* Update some todos

* Show dropdown when editing is started

* Update NanoSVG.cmake

Update NanoSVG to work with PR #2780

* Dim the icon on ComboBox when disabled

* solve ObjectDataViewModel todos

leaving colPrint and colEditing cases alone as it does not seem to impact anything

* Update names in wxExtensions

-Rename msw_rescale to sys_color_changed
-Replace GetBmpSize, GetBmpWidth, GetBmpHeight with renamed version (same name without "Bmp")

Both of these changes were also made by PrusaSlicer.

Original Commit: Prusa3D/PrusaSlicer@066b567
Co-authored-by: YuSanka <yusanka@gmail.com>

* update BitmapCache::from_svg

disable finding bundle in the cache to match load_svg
update to match values used in load_svg

* Update ScalableButton

change the signature and remove functions/vars pertaining to a default bmp
fix TODOs in ScalableButton

Original Commit: Prusa3D/PrusaSlicer@066b567
Co-authored-by: YuSanka <yusanka@gmail.com>

* fix up some more todos in wxExtensions

* update ScalableBitmap to use bmp bundles

use wxBitmapBundle by default
add flag to use old scaled bitmap function (specifically to solve issue with advanced toggle)

* attempt to fix macos deps build

* fix ubuntu build

* Revert "attempt to fix macos deps build"

Mistakenly made change to wrong file

This reverts commit d9c20b5121.

* update wxWidgets patch

an attempt to fix macOS build

* Remove duplicate variable from OrcaSlicer.cpp

* Fix macOS build issue

* Fix blank DataViewItem being added to objects list

* Filament ComboBox editor updates

-Add show drop down feature to ObjectTable
-Call finish editing when ComboBox is closed in ObjectList

* remove Apple specific declarations missed during refactor

* delete old wxWidgets patch

* fix ubuntu seg fault

* include patch from #2926

* update patch to include wxWidgets/wxWidgets@991a74c

* fix deps not compiling on Windows

* update WipeTowerDialog

relocates the recalculate button back to its previous position
changes the wording of the tip message label
add spacing below the matrix

* finish patching wxWidgets

from prusa3d/PrusaSlicer@f8477d1 and prusa3d/PrusaSlicer@066b567

Co-authored-by: YuSanka <yusanka@gmail.com>

* fix combobox crash

* revert outside plate changes

---------

Co-authored-by: tamasmeszaros <meszaros.q@gmail.com>
Co-authored-by: YuSanka <yusanka@gmail.com>
2023-12-04 15:21:49 +00:00
Ocraftyone 6ba1e6d6ae Set PointerAlignment to Left (#2948)
A lot of the codebase that I have seen typically uses a left justified pointer character. This would update the formatter to also follow that.
2023-12-01 15:32:48 +00:00
Ocraftyone b86b8ea810 Update BuildLinux.sh (#2919)
getting the value for FOUND_GTK* variables seems to cause an error which prevents using the -u option to install the needed packages. This is fixed by moving the "exit on first error" flag to after setting these vars.
2023-11-29 10:25:00 +08:00
OcraftyoneandSoftFever cbb7c3381c Rework Github Build Actions (#2566)
update workflows from dev branch

Co-authored-by: SoftFever <softfeverever@gmail.com>
2023-11-18 15:30:06 +08:00
Ocraftyone c0386d786c Fix macOS deps build issues (#2541)
update deps/CMakeLists.txt and MPFR.cmake
2023-11-17 21:59:18 +08:00
Ocraftyoneandsupermerill 120a3576a0 SS port - Change extrusion role gcode (#2459)
implement custom gcode for when the extrusion role is changed

Co-authored-by: supermerill <merill@free.fr>
2023-11-09 22:30:30 +08:00
Ocraftyone d574816aef Add default page selection (#2569)
Add option to change default page
2023-11-02 18:28:13 +08:00
Ocraftyone 06f966e43a Add splash screen toggle (#2568)
Add preferences option to toggle splash screen
2023-11-01 16:47:14 +08:00
f84e94faf7 Add "Manual filament change" option and logic (#2379)
* Add "Manual filament change" option and logic

* make suggested changes

* make suggested changes

* change tag from "CHANGE_TOOL" to "MANUAL_TOOL_CHANGE"

* some tweaks

* More fixes

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
Co-authored-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-10-22 19:31:09 +08:00
OcraftyoneandSoftFever 4d14ee15ce Thumbnail Formats Option Ported from PrusaSlicer and add BIQU/BTT format (#2405)
* Add needed src files and update CMake files

* Implementation of GCodeThumbnailsFormat for PNG, JPG, and QOI complete

* Implement BIQU (Big Tree Tech) Thumbnail Format

* have GCodeProcessor.post_process pass through original line end characters

* fix biqu thumbnail output
use \r\n for new lines in the biqu thumbnail portion. the firmware requires these end characters to function properly.
update names of variables and add comments to be more descriptive
replace modified Qt pixel algorithm with much simpler algorithm from BTT TFT firmware

* rename BiQU to BTT_TFT for better clarity

* remove underscore from GUI option

---------

Co-authored-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-10-17 20:00:38 +08:00
Ocraftyone ee9f651511 Fix M141 S0 at end of gcode (#2328)
* remove hardcoded set chamber temp gcode

* Revert "remove hardcoded set chamber temp gcode"

This reverts commit 8fc1f4a38113087a8fb11901981ca8c9cfdf7777.

* disable heated chamber only if chamber is used/defined
2023-10-05 22:02:15 +08:00
Ocraftyone 709504a2d1 toggle visibility of ironing_pattern on selection of ironing type (#2321)
* toggle visibility of ironing_pattern on selection of ironing type

* add a tooltip to ironing_pattern
2023-10-05 20:14:53 +08:00
Ocraftyone a523979ac3 add ironing angle (#2320) 2023-10-04 22:48:35 +08:00