YuSanka
128d0f7708
Correct object splitting to parts (sub-objects)
2018-07-31 12:04:01 +02:00
YuSanka
14c9ff174d
Add variable name to tooltips
2018-07-31 10:42:37 +02:00
bubnikv
f49f871992
Added filament_load_time and filament_unload_time parameters
...
to define the filament load / unload times spent in the MMU2.0 unit
when performing the tool change code (the T code).
2018-07-31 09:44:29 +02:00
Enrico Turri
55e7a1af46
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-31 08:34:34 +02:00
YuSanka
814d255c77
Added split-function for the object in list.
...
Updated adding of amf-objects.
2018-07-30 17:03:14 +02:00
YuSanka
2142070331
Fixed Linux-bug : "Add part" => segmentation fault.
...
Deleted experimental code
2018-07-30 14:25:09 +02:00
Enrico Turri
2f7876b852
Fixed camera jump after object rotate
2018-07-30 13:57:05 +02:00
YuSanka
085ae68e6d
+1 experiment
2018-07-30 13:19:31 +02:00
YuSanka
460021f7d0
EXPERIMENTS for Linux
2018-07-30 12:17:32 +02:00
YuSanka
b6d1d10502
Added updating for the Z_rotation after object selection changing
2018-07-30 10:48:40 +02:00
Enrico Turri
3f6d3b903d
Fixed rotation of 3D view camera after change of bed data
2018-07-30 10:35:08 +02:00
Enrico Turri
11b0325c66
Fixed calculation of bed origin in bed shape dialog
2018-07-30 10:03:17 +02:00
Enrico Turri
1882cd41a4
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-30 09:10:15 +02:00
Enrico Turri
bf4871d7f8
Improved remove hovering on objects when mouse leaves 3D scene
2018-07-30 09:09:14 +02:00
YuSanka
c2993de6e0
Scale and rotation from scene to value updates correctly
2018-07-29 21:42:57 +02:00
bubnikv
db8ba5fb76
New parameter "single_extruder_multi_material_priming" to be able
...
to suppress the MM priming towers.
The PrusaResearch.ini was modified for the MMU2 printers to
correctly prime the initial extruder when
single_extruder_multi_material_priming is disabled.
2018-07-27 22:19:46 +02:00
YuSanka
54f14e7ebb
+1 message
2018-07-27 16:55:42 +02:00
YuSanka
c2e09b5bcb
Added "printf"s to find of an crashing place
2018-07-27 15:57:53 +02:00
Enrico Turri
39c326ebae
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-27 14:41:05 +02:00
Enrico Turri
c64cba8ec2
A few fixes on 3D scene toolbar
2018-07-27 14:38:19 +02:00
Vojtech Kral
a9aca4426c
Fix: port friendly name encoding
2018-07-27 13:27:52 +02:00
Vojtech Kral
f729ab4b12
Fix: Race conditions
2018-07-27 13:27:52 +02:00
Vojtech Kral
a32bd17b75
FirmwareUpdater: MMU 2.0 / Caterina flashing
2018-07-27 13:27:52 +02:00
Vojtech Kral
6b801f250a
avrdude: use sections instead of offsets
2018-07-27 13:27:52 +02:00
YuSanka
575b85bfd6
Try to fix correct extruder updating on all OS
2018-07-27 12:26:14 +02:00
Enrico Turri
590773d77b
Fixed conflict after merge with master
2018-07-27 12:15:35 +02:00
Enrico Turri
ddda5062c2
3D scene toolbar actions
2018-07-27 12:08:33 +02:00
YuSanka
1148c8c018
Experiment on OSX to understand events order
2018-07-27 10:52:16 +02:00
YuSanka
f7c0303acf
Fixed wrong drawing of the object additional settings
2018-07-27 10:42:54 +02:00
bubnikv
987fc4c6df
Merge remote-tracking branch 'origin/backspace_to_delete_on_osx'
2018-07-27 09:55:13 +02:00
bubnikv
5c1de9fdd5
Merge remote-tracking branch 'origin/scene_manipulators'
2018-07-27 09:54:39 +02:00
bubnikv
c2291e54f4
Fixes crash when loading a config with zero number of default_filament_profile
...
values. Fixes SPE-427
2018-07-27 09:53:12 +02:00
Enrico Turri
3a1ec8285e
Reddish background when detected out of print volume toolpaths
2018-07-27 09:38:39 +02:00
Enrico Turri
c2ab8c2ae3
Out of print volume detection for extrusion toolpaths only
2018-07-27 08:49:58 +02:00
YuSanka
c19fe985e8
Del information msg
2018-07-26 17:22:10 +02:00
YuSanka
36e8544df2
Added DATAVIEW_ITEM_VALUE_CHANGED event for Linux and OSX
2018-07-26 16:51:18 +02:00
YuSanka
ca1a11742b
After merging bug fixes
2018-07-26 15:47:18 +02:00
Enrico Turri
b5b7894a6f
Fixed color of all toolpaths when detected as out of print bed volume
2018-07-26 13:12:09 +02:00
Enrico Turri
dd014136b0
Remove hovering on objects when mouse leaves 3D scene
2018-07-26 12:51:31 +02:00
YuSanka
e0bb6bafd5
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-07-26 11:27:25 +02:00
YuSanka
da18e25dfb
Added callback for 3dScene updating after extruder changing
2018-07-26 10:59:03 +02:00
YuSanka
ef0d667d6c
Extruder updating
2018-07-25 17:48:15 +02:00
tamasmeszaros
93ae3a0f1a
Flip Y changed back to BOTTOM_LEFT
...
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-07-25 17:27:02 +02:00
YuSanka
ac9ba61f06
Correct updating for settings list of the object/part
2018-07-25 16:14:28 +02:00
Enrico Turri
efbc1cce25
Fixed rotate gizmo update with multimaterial objects
2018-07-25 11:49:38 +02:00
Enrico Turri
93a05c4946
Use wxWidgets tooltip for 3D scene toolbar
2018-07-25 10:01:17 +02:00
Enrico Turri
2107ea7702
Fixed selection of multimaterial objects
2018-07-25 08:40:34 +02:00
YuSanka
60224415de
Prototype for adding object/part settings to panel
2018-07-24 18:39:40 +02:00
Enrico Turri
d8f5daf345
Fixed selection of object modified by gizmo
2018-07-24 15:32:44 +02:00
Enrico Turri
d4adcd4077
Out of print volume detection for toolpaths
2018-07-24 13:39:17 +02:00
YuSanka
97a25cf608
Work with model objects like reference (from/to perl side)
2018-07-24 12:15:36 +02:00
Enrico Turri
8bf3e63f75
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-24 11:20:02 +02:00
Enrico Turri
bbe5586c15
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r
2018-07-24 10:03:45 +02:00
YuSanka
36f8050d7b
Added popup menu with multiple choice of settings
2018-07-23 17:35:50 +02:00
YuSanka
dd088ba0cc
Localized the (modified) profile indicator
2018-07-23 15:44:01 +02:00
Vojtech Kral
1842520ea6
ConfigWizard: Fix: Don't check the default printer if the wizard is requested by user or re-configure
2018-07-23 15:04:21 +02:00
Vojtech Kral
3e65b4410b
PresetUpdater: Fix reloading of profiles after reconfigure and update
...
Fix #1060
Fix #985
2018-07-23 15:02:13 +02:00
Enrico Turri
4294510ed7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-23 13:56:26 +02:00
Enrico Turri
0bd8affab9
Attempt to fix #1067
2018-07-23 13:54:43 +02:00
Enrico Turri
c68bcb9e60
1st installment of 3D scene toolbar
2018-07-23 13:49:48 +02:00
Vojtech Kral
abe7a71f85
ConfigWizard: Wrap printer model titles
2018-07-23 11:43:06 +02:00
Enrico Turri
df36de0d35
Fixed status of Slice now and Export G-Code buttons after object import
2018-07-23 10:16:56 +02:00
YuSanka
ee4f2cf549
Try to fix #977
2018-07-23 09:59:04 +02:00
Enrico Turri
aaa592bab9
Another fix in gizmos update
2018-07-19 16:06:46 +02:00
Enrico Turri
feb0f76279
Better fix for gizmo update when deleting objects
2018-07-19 13:43:33 +02:00
Enrico Turri
63fe2a9fb9
Warning and legend textures moved from _3DScene class to GLCanvas3D class
2018-07-19 13:18:19 +02:00
Enrico Turri
5ff26bce50
Fixed update of gizmo when deleting all objects
2018-07-19 11:39:51 +02:00
Enrico Turri
678be2b317
Fixed update of rotate gizmo when selecting objects
2018-07-19 11:24:04 +02:00
Enrico Turri
7b551171e8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-19 08:31:59 +02:00
Enrico Turri
7f267987cb
Code cleanup
2018-07-18 15:52:20 +02:00
Enrico Turri
be7b786fee
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 15:11:23 +02:00
Enrico Turri
13ced87089
Fixed depth test when rendering the picking texture
2018-07-18 15:09:26 +02:00
bubnikv
b57418f81d
Reordered the fields on the new "Machine limits" page.
2018-07-18 15:08:55 +02:00
Enrico Turri
4579b71a66
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 15:07:56 +02:00
Enrico Turri
3fac0d92cd
Unified opengl textures
2018-07-18 15:07:52 +02:00
Enrico Turri
d805c8ac3b
Disable slicing when one object crosses the print volume boundary
2018-07-18 14:26:42 +02:00
tamasmeszaros
eeeced1d6b
Merge newest master
2018-07-18 10:26:03 +02:00
tamasmeszaros
9559ad77e5
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-07-18 10:14:28 +02:00
Enrico Turri
d672a69554
Slice only objects contained into the print volume
2018-07-18 09:37:25 +02:00
bubnikv
0660862058
For the Marlin firmware, the machine envelope G-code is emitted
...
based on the Slic3r printer profile.
Also the bundled config has been updated, so that the machine envelope
G-code values were removed and the new Slic3r printer profile values
were updated with the former G-code values.
Slic3r version has been bumped up to 1.41.0-alpha for the configuration
files to work.
2018-07-17 19:37:24 +02:00
Enrico Turri
c9827bb4cf
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-17 10:46:34 +02:00
Enrico Turri
5c90746914
Merge with master + resolved conflicts
2018-07-17 10:44:23 +02:00
bubnikv
c34a713c8c
Simplification of
...
1.40.1-rc2 fails to save the modified AMF settings #1035
2018-07-17 10:41:17 +02:00
bubnikv
161a2bc6f8
Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf'
2018-07-17 09:47:49 +02:00
bubnikv
3339623db6
Merge remote-tracking branch 'remotes/origin/ys_tooltips_osx'
2018-07-17 09:40:19 +02:00
bubnikv
83f9813f56
Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'
2018-07-17 09:37:38 +02:00
bubnikv
c7f59aca7d
Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements'
2018-07-17 09:20:19 +02:00
Enrico Turri
8175c9d306
Merge with master
2018-07-17 08:54:17 +02:00
bubnikv
210eeff160
Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets'
2018-07-16 19:52:17 +02:00
Enrico Turri
0f5ce827a1
Rotate gizmo radius changed only when moving one of multiple instances
2018-07-12 15:19:43 +02:00
Enrico Turri
3839d26e9b
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-12 15:17:08 +02:00
Enrico Turri
b2d9877cd5
Fixed crash on MAC when selecting system info
2018-07-12 13:34:39 +02:00
Enrico Turri
76d4b9dbb8
Attempt to fix SPE-352
2018-07-12 13:10:18 +02:00
Enrico Turri
63ab713585
Added debug output to investigate SPE-352
2018-07-12 12:15:30 +02:00
Enrico Turri
0e9ac1679f
Keep fixed radius of rotate gizmo
2018-07-12 11:26:13 +02:00
Enrico Turri
b6e55a521e
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-12 08:42:08 +02:00
Enrico Turri
a8691bc083
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-12 08:32:42 +02:00
Enrico Turri
1356a9977e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-12 08:32:18 +02:00
YuSanka
a6b1e8466d
Added popupmenu for add_settings
2018-07-09 16:42:31 +02:00
Lukas Matena
4c823b840f
Fix of previous commit
2018-07-09 14:43:32 +02:00
Lukas Matena
bb80774e74
Infill purging - added fifth extruder into default setttings, cosmetic changes
2018-07-09 13:44:41 +02:00
YuSanka
fcc781195b
Added updating of the is_external value for edited_preset after loading preset from (.ini, .gcode, .amf, .3mf etc)
2018-07-09 12:10:57 +02:00
Lukas Matena
92d36df903
Merge branch 'master' into wipe_tower_improvements
2018-07-09 09:28:26 +02:00
YuSanka
182e4232b2
Added error icon before object if errors auto-repaire was detected
...
+ Added size object updating (in the object setting panel)
2018-07-04 16:32:01 +02:00
YuSanka
60f703e7c7
Added function for the sidetext changing
...
+ some code reorganization
2018-07-04 14:52:36 +02:00
YuSanka
38768a7bda
Replaced Object list before Object(Part) Settings
2018-07-04 12:38:34 +02:00
tamasmeszaros
a5d6064ad6
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-07-04 10:26:04 +02:00
YuSanka
54298c8e61
First right-panel reorganization:
...
* Replaced Object list from CollapsiblePane
* Sub-object are adding by context menu from list
* (sub)objects can be deleted by only one "Delete" button
* Added extruder selection to list
2018-07-04 09:03:43 +02:00
bubnikv
e61b25de7c
Merge branch 'master' into amf_activate_existing_presets
2018-07-03 13:04:11 +02:00
YuSanka
b682fb1829
Enabled "delete preset" button after current profile saving
2018-07-03 12:19:34 +02:00
tamasmeszaros
f00c17b959
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-07-03 11:40:35 +02:00
bubnikv
c7f3014d26
Fix of
...
"Slic3r 1.40.1-rc fails to retain the filament list on"
https://github.com/prusa3d/Slic3r/issues/1020
2018-07-02 20:25:37 +02:00
Vojtech Kral
617b5158bd
Fix: Leak in Tab.cpp in serial port test
2018-07-02 19:00:36 +02:00
YuSanka
07b28b2a8c
Bug-fixes of the OSX crashing
2018-07-02 13:51:50 +02:00
YuSanka
678498bed6
Typo fixed
2018-06-29 14:00:22 +02:00
YuSanka
f8ab8b43de
Experiment with Toolpits of selected preset on OSX
2018-06-29 13:07:58 +02:00
YuSanka
16e42b0226
Added tooltips for selected Preset
2018-06-29 11:29:23 +02:00
bubnikv
6b3c24359b
Merge branch 'master' into amf_activate_existing_presets
2018-06-28 22:00:10 +02:00
bubnikv
26b003073b
Renamed the "compatible_printers_condition" and "inherits" vectors
...
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.
Improved escaping of strings stored / loaded from config files.
2018-06-28 20:13:01 +02:00
YuSanka
2cbf5b75db
Final Fix of tooltips on OSX showing on the first page of a parameter tab.
2018-06-28 18:30:22 +02:00
YuSanka
9e4bea8cce
Code cleaning
2018-06-28 18:14:34 +02:00
YuSanka
896d898124
Resizing panel to 1 px
2018-06-28 17:52:20 +02:00
bubnikv
c4a3e4eca7
Merge branch 'for_merging'
2018-06-28 17:43:15 +02:00
YuSanka
5f1f7dcbed
Fix of tooltips on OSX showing on the first page of a parameter tab.
2018-06-28 17:34:55 +02:00
YuSanka
0171f49ad0
And last try..
2018-06-28 17:14:45 +02:00
YuSanka
75bda8cfd8
Addition to last commit
2018-06-28 16:50:06 +02:00
YuSanka
0b1833a2af
Try to fix tooltips on OSX
2018-06-28 16:01:06 +02:00
tamasmeszaros
18bfe4f2dc
ExpTime incorporated. Some refactor as welll.
2018-06-28 13:21:24 +02:00
YuSanka
5605835ba9
Use silent_mode only with MK3 printer
2018-06-28 12:40:27 +02:00
tamasmeszaros
d337b69407
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-27 17:44:33 +02:00
tamasmeszaros
ac9d81cfa0
Refactor and extensions to png export dialog.
2018-06-27 17:43:54 +02:00
bubnikv
80b430ad94
Simplified handling of the "compatible_printers_condition" and
...
"inherits" configuration values.
Implemented correct setting of the "inherits" flag for the profiles
loaded from AMF/3MF/Config files.
2018-06-27 16:57:42 +02:00
Enrico Turri
de28d4edeb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 15:32:47 +02:00
Enrico Turri
3dba0be81e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 15:32:31 +02:00
Vojtech Kral
6706c3b71f
ConfigWizard: Mark the first variant of each printer as default in the GUI
2018-06-27 13:57:21 +02:00
Vojtech Kral
3229574a39
ConfigWizard: Fix default printer selection
2018-06-27 13:57:21 +02:00
Enrico Turri
d02c90d5d0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 13:54:39 +02:00
Enrico Turri
48915a65fd
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 13:52:57 +02:00
Enrico Turri
06f44a9e4b
Code cleanup
2018-06-27 12:49:38 +02:00
Enrico Turri
8db4fdc24c
3rd attempt to fix opengl on ubuntu
2018-06-27 12:36:49 +02:00
Enrico Turri
23d10fdadc
2nd attempt to fix opengl on ubuntu
2018-06-27 12:05:23 +02:00
Enrico Turri
5c32347449
1st attempt to fix opengl on ubuntu
2018-06-27 11:31:11 +02:00
tamasmeszaros
30e177d986
PngExportDialog fix on Windows
2018-06-27 11:21:14 +02:00
tamasmeszaros
a9e2950ad0
PngExportDialog size fix on Linux
2018-06-27 11:13:40 +02:00
bubnikv
68e82a7348
Merge branch 'master' into amf_activate_existing_presets
2018-06-27 10:33:14 +02:00
tamasmeszaros
8eb8d4f0c5
Patch from Lubomír Bláha applied. Polished comments and PngExportDialog.
2018-06-27 10:28:44 +02:00
tamasmeszaros
c28b602465
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-27 09:36:05 +02:00
Lukas Matena
fe0f0fe6af
Merge branch 'master' into wipe_tower_improvements
2018-06-27 08:56:08 +02:00
Enrico Turri
dc223066d3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 08:26:55 +02:00
Enrico Turri
db95460154
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 08:26:33 +02:00
tamasmeszaros
df625a0c4b
File saving to new file fixed.
2018-06-26 16:08:58 +02:00
tamasmeszaros
ae682b9cd3
Export dialog ready
2018-06-26 15:53:43 +02:00
YuSanka
c1724f45c9
Fixed post-merge bugs
2018-06-26 13:34:25 +02:00
Lukas Matena
4dae6cbf60
Merge branch 'master' into wipe_tower_improvements
2018-06-26 12:58:04 +02:00
Enrico Turri
bd1d70d8d3
Fixed crash when slicing from Layers tab
2018-06-26 12:50:04 +02:00
bubnikv
59510c42d1
When loading an archive (AMF/3MF/Config), the original name
...
of the profile is show in braces next to the file name.
2018-06-26 11:31:01 +02:00
Enrico Turri
90b0cd5cae
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-26 11:16:00 +02:00
Enrico Turri
69ff60b557
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-26 11:15:33 +02:00
bubnikv
1175dc95f6
Storing and recovering the "compatible_printers_condition"
...
and "inherits" fields from / to the AMF/3MF/Config files.
The "compatible_printers_condition" are collected over all active profiles
(one print, possibly multiple filament, and one printer profile)
into a single vector.
2018-06-26 10:50:50 +02:00
YuSanka
2fae893af2
Fixed #998
...
Added detection of gtk2/gtk3 GUI libraries required by Alien::wxWidgets.
Added gtk2/gtk3 include paths, so we may call gtk2/3 API directly if needed for some workaround.
2018-06-26 10:37:36 +02:00
YuSanka
0371f368a4
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-26 09:26:27 +02:00
tamasmeszaros
3efe6675cb
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-25 17:14:29 +02:00
Enrico Turri
ecda2a6140
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 16:09:27 +02:00
YuSanka
f9b85b6700
Correct updating of "Machine limits" and "Single extruder MM setup" pages
2018-06-25 16:03:43 +02:00
Enrico Turri
714204b227
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 15:27:06 +02:00
Enrico Turri
b6b14ef819
Fixed conflicts after merge with master branch
2018-06-25 15:26:37 +02:00
Enrico Turri
7b0ba7a9d4
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-25 15:24:58 +02:00
Enrico Turri
40b327eb11
Fix of interaction between opengl contexts and main page notebook
2018-06-25 15:17:13 +02:00
YuSanka
515502e685
Fixed #994 .
...
Print double-type values according to "full" value instead of 2 digits after point
2018-06-25 13:32:28 +02:00
tamasmeszaros
f26cb9ebd6
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
...
# Conflicts:
# lib/Slic3r/GUI/MainFrame.pm
2018-06-25 13:24:37 +02:00
Enrico Turri
581ed7764c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-25 13:21:52 +02:00
YuSanka
318212f475
Fixed crashing-bug after language changing (detected under Debug)
2018-06-25 12:27:42 +02:00
YuSanka
362a9d8eda
Fixed bug #995
2018-06-25 11:40:40 +02:00
Enrico Turri
789a760fbd
Fixed conflict after merge with master
2018-06-25 10:49:30 +02:00
Enrico Turri
8a4a5e487e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:51:47 +02:00
Enrico Turri
7d15a15e14
Fix of #999
2018-06-25 08:48:36 +02:00
Enrico Turri
3da21a4ce8
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:27:09 +02:00
Enrico Turri
f9e6bcf872
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:26:14 +02:00
bubnikv
b5f97baa28
Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics
2018-06-22 17:44:12 +02:00
Enrico Turri
ac0f3a6ef7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-22 16:13:51 +02:00
YuSanka
54c90ee948
Updated PrintConfig default values for machine limits
...
+ fixed incorrect default value setting for the TextCtrl
2018-06-22 16:13:34 +02:00
Enrico Turri
c948ca647c
Code cleanup
2018-06-22 16:11:00 +02:00
Enrico Turri
2a03b90d2b
Forced render of 3D scene when changing tab in plater's notebook
2018-06-22 16:06:37 +02:00
Enrico Turri
de540de9aa
5th Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 15:11:04 +02:00
bubnikv
082ed95a94
Activate existing projects after loading AMF/3MF/Config: Initial implementation.
2018-06-22 14:17:03 +02:00
YuSanka
3fdefbfbea
Added updatin of the "Machine limits" page according to "use silent mode"
2018-06-22 13:01:41 +02:00
Enrico Turri
00ef0610a5
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-22 12:57:16 +02:00
Enrico Turri
f8982c0ca1
Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-22 12:30:15 +02:00
YuSanka
c10e9a6840
Fixed crash-bug when close application after language changing
2018-06-22 12:27:56 +02:00
Enrico Turri
15c69a90ec
Changed use of GL_LIGHTING logic and code cleanup
2018-06-22 12:21:43 +02:00
Enrico Turri
ac7d21b50a
Geometry info updated while using gizmos
2018-06-22 11:19:38 +02:00
YuSanka
bfe7896709
Try to fix uncorrect setup on Linux
2018-06-22 10:59:54 +02:00
Enrico Turri
266a4413bd
4th Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 09:42:56 +02:00
YuSanka
9ba1af5834
Merge remote-tracking branch 'origin/master' into add_kinematics
2018-06-22 09:22:29 +02:00
Enrico Turri
be52647440
Smaller gizmos icons
2018-06-22 09:00:01 +02:00
Enrico Turri
4ba3cef496
3rd Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 08:38:13 +02:00
YuSanka
4454c3437f
"Machine limits" page is completed
2018-06-21 16:15:56 +02:00
Enrico Turri
75cd436ae5
2nd Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-21 15:43:34 +02:00
Enrico Turri
b139f38784
Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-21 13:03:53 +02:00
Enrico Turri
8c40a962fb
Shift key to move selected instances together
2018-06-21 11:14:17 +02:00
Enrico Turri
a7e9ec5757
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 11:05:07 +02:00
Vojtech Kral
1ba81655e2
Octoprint: Add a dialog for setting the filename/path
...
and a "print now" option
cf. #880 , #245 , #55 , #87
2018-06-21 10:44:29 +02:00
Lukas Matena
6669357c81
Merge branch 'master' into wipe_tower_improvements
2018-06-21 10:41:01 +02:00
Enrico Turri
80e4155cbc
Bed textures selection using config inheritance
2018-06-21 10:24:57 +02:00
Enrico Turri
b386f52acc
Removed error dialog when texture file does not exist
2018-06-21 09:54:43 +02:00
Enrico Turri
0c24a65039
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 08:39:26 +02:00
Enrico Turri
550f6e307f
Faster gizmos update
2018-06-21 08:37:04 +02:00
bubnikv
8abe1b3633
Yet another fix for the OSX.
2018-06-20 19:26:19 +02:00
bubnikv
3a2b501012
Fixed compilation on OSX
2018-06-20 19:07:55 +02:00
bubnikv
02d4f3e14d
Provide a callback to libslic3r to translate texts.
...
Moved the "translate" functions to namespaces to avoid clashes
between the code in libslic3r and Slic3r GUI projects.
2018-06-20 18:33:46 +02:00
YuSanka
b6ebbdb94a
Updated "Machine limits"(Kinematics) page according to the new config
2018-06-20 16:30:55 +02:00
Enrico Turri
4803e7fc84
Fixed crash at startup on OpenGL 1.1 cards
2018-06-20 14:34:20 +02:00
YuSanka
fd4feb689e
Added prototype for "Kinematics" Page
...
+ Added enum_labels to localizations
+ Added bold font for the name of Options Groups
2018-06-20 14:20:48 +02:00
Vojtech Kral
635bb1e484
Firmware updater: Add support for l10n firmware images
2018-06-19 18:46:37 +02:00
Vojtech Kral
15f943938b
avrdude: add file offset to update operation spec, refactoring
2018-06-19 18:46:37 +02:00
bubnikv
7863412687
Firwmare updater for the Einsy external flash memory,
...
to be used as a storage for localization strings.
Hacked into the avrdude Arduino STK500 (not STK500v2) protocol.
2018-06-19 18:46:37 +02:00
Vojtech Kral
5414f7379d
FirmwareDialog: Fix progress display
2018-06-19 18:46:37 +02:00
Vojtech Kral
2a07f3a0d5
Firmware updater: Fix filename encoding on Windows
2018-06-19 18:46:37 +02:00
Vojtech Kral
478488972c
Updating bugfixes ( #973 )
...
* ConfigWizard: Fix MM legacy profile detect
* Remove Perl BedShapeDialog
* PresetUpdater: Look for updates in resources as well
* ConfigWizard: Startup condition based on printer profiles only rather than all profiles
Previously wizard would not run if there was a leftover filament profile but no printer profiles
* ConfigWizard: Fix button labels
* ConfigWizard: Pick the very first printer variant by default
2018-06-19 18:26:38 +02:00
YuSanka
8a3cf3f71d
Correct selection update on MSW
2018-06-19 16:24:49 +02:00
YuSanka
a772a19915
"MoveUp" & "MoveDown" work correctly
2018-06-19 12:24:16 +02:00
Enrico Turri
b9ce19b07c
Object updated by rotate gizmo
2018-06-19 09:46:26 +02:00
YuSanka
12232f1a6d
"Delete part" button works correctly
...
Prepared functions for "Split", "MoveUp" & "MoveDown" buttons (update_model function is missing)
2018-06-18 16:22:15 +02:00
Enrico Turri
a3949b9f01
Object updated by scale gizmo
2018-06-18 15:07:17 +02:00
YuSanka
99082bfe67
Modifiers are moving now
2018-06-18 14:20:29 +02:00
tamasmeszaros
4328ecc287
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-18 12:17:19 +02:00
YuSanka
fb9ba1a55c
Set correct man/max value for movers
2018-06-16 03:04:59 +02:00
YuSanka
54975a4e36
Some changes in GUI-files
...
All functions of object settings are moved to GUI_ObjectParts
2018-06-16 01:21:25 +02:00
YuSanka
a91cb5b267
Upgraded object_control to use icons near the name
...
Renamed some classes
Deleted unused classes
2018-06-15 22:42:51 +02:00
Enrico Turri
53f8706805
Rotate gizmo interaction with mouse
2018-06-15 16:16:55 +02:00
Enrico Turri
6874949556
Scale gizmo interaction with mouse
2018-06-15 14:10:28 +02:00
YuSanka
942a3340aa
Added a check for the correctness of the entered characters in numerical fields.
2018-06-14 23:56:44 +02:00
YuSanka
a0090fccb5
Button "Load Lambda" (in the Object Settings) works now
2018-06-14 23:31:15 +02:00
YuSanka
3e0ff5e9ef
Added LambdaObjectDialog
2018-06-14 21:48:06 +02:00
YuSanka
9504780ef4
Buttons "Add Part" and "Add Modifier" (in the Object Settings) works now
2018-06-14 15:33:42 +02:00
Enrico Turri
c624d6bb0a
Hover on gizmo grabbers rendering
2018-06-14 15:32:26 +02:00
Enrico Turri
4d405977dd
Keep selection when panning/rotating 3D view
2018-06-14 12:34:19 +02:00
Enrico Turri
7fb6e2aa03
Use mipmaps for bed textures
2018-06-14 10:37:28 +02:00
Enrico Turri
bc5640eef4
Rotate gizmo rendering
2018-06-14 10:00:59 +02:00
YuSanka
8899be8cca
Started porting of the functions for object settings editing
2018-06-13 16:39:33 +02:00
Enrico Turri
3a19b81cef
Scale gizmo rendering
2018-06-13 15:44:04 +02:00
Enrico Turri
099d59ad27
Selection on gizmo overlay
2018-06-13 13:14:17 +02:00
Enrico Turri
c657654c02
Hovering on gizmo overlay
2018-06-13 10:49:59 +02:00
Enrico Turri
6079fed951
Fixed compile on Linux
2018-06-13 09:26:58 +02:00
Enrico Turri
b2cf576bf3
1st installment of gizmos
2018-06-13 09:12:16 +02:00
YuSanka
1c695fd97e
Added object movers to the object settings. Added SliderControl to Field.
2018-06-12 23:42:01 +02:00
YuSanka
f5ef672815
Prepared callback from c++ to Perl to inform about a change of object settings
2018-06-12 19:15:03 +02:00
YuSanka
6b56f99df7
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-12 13:03:40 +02:00
Enrico Turri
0faaef76e8
C++ code cleanup
2018-06-12 12:18:16 +02:00
Enrico Turri
756064810c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 11:08:16 +02:00