Commit graph

382 commits

Author SHA1 Message Date
daid
32d1ea11c2 Changed GCode preview code to be faster on layer switching. 2012-05-03 18:41:58 +02:00
daid
e29261a992 Added more GCode validation to GCode editor. Made temp changes to profile really temp so they are never stored in the ini file. Fixed crash bug in skeinforge where there is no layer code. 2012-05-03 12:29:55 +02:00
daid
9385aa8c25 Move gcode formated text to own file. 2012-05-02 17:54:29 +02:00
daid
a5237fea44 Very basic syntax highlight for comments in the GCode editor for start/end code. 2012-05-02 17:15:55 +02:00
daid
5e8a0c92c0 Add loaded filename into title bar. 2012-05-02 14:21:21 +02:00
daid
92c42d1afa Only show gcode buttons when GCode is loaded. Only show layer selection in GCode and mixed view. Fixed #87 2012-05-02 14:14:41 +02:00
Daid
b9d4c9b5fa Merge branch 'master' of github.com:daid/Cura 2012-05-01 18:40:18 +02:00
Daid
3d70d67145 Save last known Z position in multi color slicing. 2012-05-01 18:40:10 +02:00
daid
11d9022741 Update preferences to allow math expressions. Fixed #86 2012-05-01 11:39:52 +02:00
Daid
8f39846349 Corrected extruder offset direction 2012-04-29 14:50:52 +02:00
Daid
74d8329a73 Fixed positioning when using multiple extruders. Fixed GCode preview for multiple extruders. Removed multiply, depricated because of the project planner, and does not work right with multiple extruders. 2012-04-29 14:22:20 +02:00
Daid
70d833b19d No newlines in slice progress status label. 2012-04-29 12:01:56 +02:00
Daid
632a447575 Show print time, filemant used and cost estimate after slicing. 2012-04-29 12:00:13 +02:00
Daid
2e6f887499 Remove other models when loading a single model again after a dual load. 2012-04-29 11:44:07 +02:00
Daid
9c91c58c6e Move extruder offset and extruder head size to preferences. 2012-04-29 11:35:36 +02:00
Ferdi van der Werf
be075e5e18 Fixes #80
Corrected function call and adjusted parameters accordingly.
2012-04-28 08:02:20 +02:00
Daid
4a57502535 backwards compatibility with older project files. 2012-04-27 21:48:56 +02:00
Daid
a1b4a50342 Added extruder selection to project planner, fixed bug with project planner where the skirt was incorrectly added to the movement size 2012-04-27 19:18:29 +02:00
Daid
b28b7adef5 Slightly increase the default machine head size because the header block can stick out. 2012-04-27 13:51:27 +02:00
Daid
ec9f24fac8 Updates after some testing with dual extrusion (loads of work to do) 2012-04-27 13:45:32 +02:00
daid
a90cdd4993 Solve problem where X/Y/Z text is shown before camera if are actually behind camera 2012-04-25 16:30:51 +02:00
daid
bfaebcce3e Report total time spend slicing after project planner slice 2012-04-25 15:49:43 +02:00
daid
3770dea42c Added tool switching GCode. Made the E value reset after each layer for multiple extruder support. 2012-04-25 13:34:25 +02:00
Ferdi van der Werf
3949ebe844 Bugfix - Missing ) 2012-04-24 20:08:37 +02:00
daid
94f0597be0 Multiple extruders, not functional yet. Final GCode has wrong E values. But the idea starts to work. 2012-04-24 18:46:29 +02:00
daid
b6492df81e Add the ability to edit the nextobject.gcode 2012-04-24 12:03:03 +02:00
daid
3645523074 Remove menu from project planner, and replace it with toolbar buttons. 2012-04-23 18:23:29 +02:00
daid
cfadc75e9c Add alteration files to profile ini. (Note, this broke Slic3r support) 2012-04-23 18:02:30 +02:00
daid
c2c1e0fd63 Add support margin setting to SF and Cura. 2012-04-23 15:03:35 +02:00
daid
a5fdfdb55a Really fix the machine center this time 2012-04-23 14:16:23 +02:00
daid
510aa7fed2 Fix bug in centerX/Y update. 2012-04-23 11:09:56 +02:00
Daid
bdaceed7fd Enable skirt in project planner if needed. 2012-04-22 23:45:19 +02:00
Daid
2962c49a52 Remove debug print. 2012-04-22 16:30:18 +02:00
Daid
86af877c13 Add Z/Y/Z indicators. Fixes #70 2012-04-22 13:11:21 +02:00
Daid
c35be9e4b5 Change abort button into close button after slicing with project planner. Fixes #69 2012-04-21 21:27:53 +02:00
Daid
8f83a2420f Add autoplace button to project planner 2012-04-21 20:45:53 +02:00
daid
ebc579b2a1 Say project planner in title bar 2012-04-20 17:15:10 +02:00
daid
861610f376 Add progress window to project planner. 2012-04-20 17:06:50 +02:00
daid
b438918d92 Add scale/rotate controls to project planner. 2012-04-20 15:12:06 +02:00
daid
ab1e4729ad On close we have a "deselection" on the listbox, but the 3D preview is deleted then already, so we do not need to do a refresh then 2012-04-20 14:23:11 +02:00
Daid
713a1c84ec Added print direct move icons for x and y 2012-04-19 21:39:44 +02:00
daid
9f004dfdfe Add direct control buttons to print window (needs icons :P). Add project planner to file menu. 2012-04-19 17:35:08 +02:00
daid
5a721aaeb8 Updated project planner to use an alteration file between each print. 2012-04-19 16:31:39 +02:00
daid
67e12946ed Update to project planner, toolbar icon buttons, less messy boundery boxes view. 2012-04-19 16:16:15 +02:00
Daid
57c3b1c2bb Fix for bug caused by offloading scaling to the 3D card 2012-04-18 22:51:19 +02:00
Ferdi van der Werf
eb0aac458b On mouse-enter, change on/off icon to on, on mouse-out, change on/off icon to previous state 2012-04-18 20:28:53 +02:00
Ferdi van der Werf
9b31b8f6b3 Added icons for top toolbar of preview panel 2012-04-18 20:27:34 +02:00
Ferdi van der Werf
ba37075ad5 Added icons for 3d and top-down view 2012-04-18 19:03:31 +02:00
daid
5ffbe43329 Speed up preview when changing multiply/scale by offloading that to the 3D card, instead of recalculating vertex positions. 2012-04-18 17:48:34 +02:00
daid
c49b6c99a9 Fixing feature 32 - expressions in scale. 2012-04-18 17:06:32 +02:00
daid
5879a9e71b Do less stuff in software, and more on the video card. Could be improved even more. 2012-04-18 17:04:03 +02:00
Ferdi van der Werf
0a4fa748a8 When scale is empty, default to 1.0 for profile and preview 2012-04-18 16:08:58 +02:00
daid
57cd3cccd3 Viewmode as radio button, still needs proper icons 2012-04-18 15:14:43 +02:00
daid
5512d3bab1 Maybe this fixes the first run wizard calibration of 100mm extrusion problems. 2012-04-18 14:50:52 +02:00
daid
f68303c642 Rename simple mode, quickprint in GUI 2012-04-18 14:49:36 +02:00
daid
3f9c5d53b3 Auto select first radio item on toolbar. 2012-04-18 14:48:05 +02:00
daid
b3eae9c9ff Added "open file location" button 2012-04-18 14:07:41 +02:00
daid
b09f2f1837 Add radio toolbar buttons for 3D/Top view. Some minor cleanup in toggle button code. 2012-04-18 12:39:05 +02:00
daid
e92506cd5a Move "scale to max" button to scale entry, we should have room for it there now 2012-04-18 12:22:01 +02:00
daid
c195ab04bc Move toolbar button classes to an differnt file, so they are re-usable. Also cleaned up the code a bit. 2012-04-18 12:15:07 +02:00
daid
4d10199e74 Fix bugs where scale/rotate will not update on Linux 2012-04-18 11:00:41 +02:00
daid
00ba00cefa Merge branch 'master' of github.com:daid/Cura 2012-04-18 10:53:59 +02:00
daid
1891ebe9ff Merge branch 'master' of github.com:daid/Cura 2012-04-18 10:51:01 +02:00
daid
0ebce8cf3e Update some tooltip texts to help users 2012-04-18 10:50:56 +02:00
Ferdi van der Werf
928b359086 Reset scale to 1.0 instead of 1 2012-04-18 01:56:25 +02:00
Ferdi van der Werf
3bc4eeea89 Removed unused method 2012-04-18 01:54:04 +02:00
Ferdi van der Werf
2a3428e023 Refactored scale and rotate statictext to reset buttons 2012-04-18 01:51:34 +02:00
Ferdi van der Werf
cbadc04c0f Added multiply icons and buttons 2012-04-18 00:41:40 +02:00
Daid
10515a6125 Add NormalButton for toolbars, which has tooltip support, and proper image loading. Add icon for scale to machine size. 2012-04-18 00:08:42 +02:00
Daid
2b20654057 Fix the toolbar buttons file path to be relative to the python file instead of the current working directory 2012-04-17 23:27:11 +02:00
Daid
e3aae1e716 Merge branch 'master' of github.com:daid/Cura 2012-04-17 23:18:58 +02:00
Ferdi van der Werf
949b6c1a1e Refactored GenBitmapToggleButton to ToolButton:
* Added ToggleButton, refactored mirrorX, mirrorY, mirrorZ, swapXZ and swapYZ to use ToggleButton.
* Removed old event handlers for mirrorX, mirrorY, mirrorZ, swapXZ and swapYZ.
2012-04-17 23:16:24 +02:00
Ferdi van der Werf
599f79db89 Moved some code for consistency, fixed swapXY button 2012-04-17 20:08:24 +02:00
Daid
6885a39be1 Merge conflic solved
Merge branch 'master' of github.com:daid/Cura

Conflicts:
	Cura/util/profile.py
2012-04-17 19:14:48 +02:00
Daid
0ed8e32b0c Some changes for the project manager. 2012-04-17 19:12:40 +02:00
Ferdi van der Werf
7a2ef03c8c Removing first separator on toolbar2, we need all the space can get 2012-04-17 15:31:25 +02:00
Ferdi van der Werf
e25d5cb300 Merge upstream, fixed conflicts, showing complete toolbar at bottom of preview 2012-04-17 15:19:15 +02:00
daid
aea30f1e0b Change default FOV to look more natural 2012-04-17 13:29:16 +02:00
daid
ddaca56c89 Added "scale up to max size" button, we really need those icons... 2012-04-17 12:08:19 +02:00
Ferdi van der Werf
20d975004c New layout icons for 3d preview pane 2012-04-16 23:06:02 +02:00
daid
870d4fd96f Seperate print interface into a different process. 2012-04-13 18:14:38 +02:00
daid
5994267b29 With the fixes from PyroMani the MacOS version is much more stable and on-par with the Linux version. So the warning message can be removed. 2012-04-13 12:18:51 +02:00
daid
af737ef097 Fixed #52 - Correct error message when trying to print without a model. Fixed #53 - Give an error message when slicing without model loaded. 2012-04-13 12:16:56 +02:00
daid
493dceedc9 Fixing #51 - First run wizard calibration not working because default steps_per_e is zero 2012-04-13 12:13:02 +02:00
Ferdi van der Werf
e062908f0d Removed ToolTip, only popup used right now 2012-04-13 00:11:11 +02:00
Ferdi van der Werf
44c4085881 Flip renamed to Mirror, need to propagate to variables 2012-04-13 00:05:09 +02:00
Ferdi van der Werf
05e13100f7 Added popup window for OSX 2012-04-12 23:13:56 +02:00
Ferdi van der Werf
fe0ca4563c Switched flip y and z images, removed comments 2012-04-12 22:25:09 +02:00
Ferdi van der Werf
2fc8ef6a7c Experimental icons for flip x,y,z and swap xz,yz 2012-04-12 22:18:34 +02:00
daid
3b2b76a8ac Fixed #46 - added support for calculating print costs. 2012-04-12 14:26:03 +02:00
daid
2d10cb47f4 Add option to save profile when slicing 2012-04-12 13:58:19 +02:00
Ferdi van der Werf
76f845d3fa Fixes #49 issue
Calling self.Layout() after changing the static text fixes text going
outside the box.
Needs to be checked on Linux and Windows.
2012-04-11 23:49:09 +02:00
daid
497eb6f03d Add version info 2012-04-11 16:34:15 +02:00
daid
a79a7c066d Allow math expressions in fields. 2012-04-10 16:45:53 +02:00
daid
7fb30600a2 Add popup on textctrl, even tough it does not work for MacOS, it does work for linux/windows. 2012-04-10 15:49:09 +02:00
Ferdi van der Werf
956b6ad33d Probably fixes #17 issue
On OSX spp.Destroy() causes an segfault, sizer.Remove(app) removes app
from the form but tries to call spp.Destroy() afterwards.
By hiding and detaching I created a workaround for the OSX problem.
This solution needs testing on Windows and Linux.
2012-04-09 01:26:37 +02:00
Ferdi van der Werf
e2f4ce4ef6 Upstream merge 2012-04-08 22:43:39 +02:00
Ferdi van der Werf
61915438a6 Fixes #1 issue
Moving enter and leave window event to label, fixes the bug on osx that
didn't show tooltips.
2012-04-08 22:30:49 +02:00
Daid
d0691018c2 Fixed progress bar error when slicing with skin enabled. 2012-04-07 16:27:22 +02:00
daid
b294aede47 Added skin setting to advanced settings 2012-04-06 17:08:49 +02:00
daid
1ded2a5c18 Added defaults for swap_xz and swap_yz 2012-04-06 15:15:41 +02:00
daid
bcf7466f9d Updated advanced window (old name) to expert window (new name), was already called expert config in the GUI, just refactor in the code 2012-04-06 14:41:38 +02:00
Daid
251a96141e Split up some OpenGL stuff from preview3d. Added swapXZ and swapYZ for rotating on the platform 2012-04-05 22:35:52 +02:00
daid
8a82f0c625 Change default support material amount to 50%, this seems to make the support a lot easier to remove, without affecting quality. 2012-04-05 18:00:22 +02:00
daid
835b7883ca Add bottom layer thickness. Fix bug with line with in 3D preview (was not calculated from layer thickness) 2012-04-05 16:50:59 +02:00
daid
374b2d1b5e Add temperature control to print window 2012-04-04 17:02:22 +02:00
Daid
96d014b2c4 Add support and skirt/raft colors to GCode preview 2012-04-03 23:45:42 +02:00
Daid
0a5cc62205 Add support to GCode comments. Show connect button in print dialog. 2012-04-03 20:27:46 +02:00
daid
7000945a07 Simplify the printer interface. 2012-04-03 17:01:51 +02:00
daid
c2ce7b9c24 Updated print window with statistics about the print. Filament used, and estimated print time. 2012-04-03 12:06:02 +02:00
daid
e999faf08a Add hidden virtual printer, for testing 2012-04-03 11:59:38 +02:00
daid
7f27198e7b Disable the window icon till we find out why the MacOS crashes, and the windows version does not work. 2012-04-03 10:44:53 +02:00
Daid
2595e57d5a Fix confict 2012-04-02 19:39:36 +02:00
Daid
6d82dfb4bd Just a comment 2012-04-02 19:34:27 +02:00
daid
a8963b1cc1 Make the printer interface a bit more user friendly. 2012-04-02 18:56:44 +02:00
daid
7ec27fec92 Added extra fan control. Advanced setting to enabled/disable fan. And expert setting to set the fan start layer and fan speed. 2012-04-02 16:09:56 +02:00
daid
85d44ad8a0 Added icon to main window. Added win32 installer script, with drivers for Arduino Mega2560. 2012-04-02 14:43:39 +02:00
Daid
ca92f69770 Printing works! If you press the right buttons in the right order that is. 2012-04-01 19:16:31 +02:00
Daid
7d13b17dd9 Small optimalization in gcode preview, saves a square root per line 2012-03-31 21:48:23 +02:00
Daid
fe91a1b123 Merge branch 'master' of github.com:daid/Cura 2012-03-30 17:39:18 +02:00
daid
88337f1675 No longer use the current_profile.ini to share the profile between the backend slicer and the frontend. No longer have simple-mode overwrite the current profile from normal mode. 2012-03-30 13:54:49 +02:00
daid
e17c4387c9 Speed up the first layer for low quality prints. 2012-03-30 12:11:10 +02:00
daid
7cb514f4aa Disable skirt for ABS on simple mode. Because we already have a raft. 2012-03-30 11:12:26 +02:00
daid
9966bbf6f4 Fix start.gcode saving when the tab is opened for the first time. 2012-03-30 09:49:28 +02:00
Daid
c44c656235 Merge branch 'master' of github.com:daid/Cura 2012-03-29 21:11:43 +02:00
daid
ab6430c843 Added simple mode dialog 2012-03-29 14:45:14 +02:00
daid
ddfd386b73 Make GCode reader store paths per layer 2012-03-29 11:01:33 +02:00
Daid
3ec6fa40d6 Merge branch 'master' of github.com:daid/Cura 2012-03-28 20:36:52 +02:00
daid
0834aec2d2 Added my own STL loader, no longer using the one from Skeinforge. This one is 3 to 4 times faster. 2012-03-28 16:53:08 +02:00
daid
405f4880cd Split gui to gui and util directories. 2012-03-28 14:26:40 +02:00
daid
5d531a7a00 Remove debug message 2012-03-28 12:24:34 +02:00
daid
8b3b3e5076 Move SF into its own directory, to seperate SF and Cura. Rename newui to gui. 2012-03-27 17:20:30 +02:00