Commit graph

224 commits

Author SHA1 Message Date
Kevin Pope
ff6e05cb4d Set default render to Shaded, if Outlines are not supported. 2014-10-27 19:54:01 -07:00
Kevin Pope
caed3e4b52 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-27 11:50:22 -07:00
Kevin Pope
e3af28900e Make 3D view panels visible in edit mode only.
Make 2D view panel visible only after layer data is generated.
2014-10-27 11:49:59 -07:00
larsbrubaker
a7989de8e2 Fixed a bug with trying to render null meshes.
Starting work on fixing grid on gcode view not being able to be hidden.
2014-10-27 10:33:41 -07:00
larsbrubaker
3af659dc9d Making canceling during load work much better.
STLs can now stop loading during most of the load operations (only sort verts cannot)
Changed the signature on report progress ratio to make it clearer.
Made mesh viewer handle better load stoping.
2014-10-26 18:08:03 -07:00
larsbrubaker
ff9c13baa6 Fixed entering edit when clicking "add" (large models could cause a race condition).
Made better progress indication while loading models on add
2014-10-24 17:27:38 -07:00
larsbrubaker
af16d96004 Now we always add to our library folder when adding to the library. 2014-10-24 15:37:03 -07:00
larsbrubaker
b2643d55c4 Making the library always save to its own store
fixed a problem when the extension mc is opened with is nothing a part would be added to the plate.
2014-10-24 14:55:27 -07:00
larsbrubaker
08dc379472 Merge remote-tracking branch 'Greg/development' into development
Conflicts:
	PrinterControls/PrinterConnections/PrinterListItems.cs
2014-10-24 13:53:00 -07:00
larsbrubaker
222a5a46a7 Changed ButtonEventHandler to EventHandler
Made lock disable the selection widget but be more inteligent about re-enabling it after unlock
2014-10-24 13:41:13 -07:00
larsbrubaker
e3ba5f3ea7 Made an enum rather than an opaque bool. 2014-10-23 18:06:16 -07:00
larsbrubaker
27b921635f Make sure we only center files that have not had their position changed by the user. 2014-10-23 17:58:48 -07:00
larsbrubaker
e7678a7b1d On enter edit click the select part button. 2014-10-23 16:00:33 -07:00
larsbrubaker
3386bba281 Made any save of a file unsure that we put it in the library.
Took out dead CreateCopyInQueue code
Made it possible to update the FileLocation of a PrintItem.
2014-10-23 14:40:12 -07:00
John Lewin
87026439c1 Invoke ShowMessageBox on UI Thread 2014-10-23 10:05:29 -07:00
larsbrubaker
3fae1e4caf Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-22 11:07:50 -07:00
larsbrubaker
2c2368d969 Fixed a memory leak in ViewGcodeBasic.
Made sd files load into an empty queue
2014-10-22 11:06:52 -07:00
kevinepope
e936fe98f7 Change message confirmation dialogs from modal to async w/callback. 2014-10-21 21:20:09 -07:00
larsbrubaker
6dd447e415 Improved the material selection code.
Started work on changing material color
fixed some bugs.
2014-10-20 17:02:25 -07:00
larsbrubaker
df686386e2 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
Conflicts:
	ApplicationView/CompactTabView.cs

Made a new Draw EventHandler for GuiWidget
Made mesh viewer have colors per material
Made the screen reload on change printer
Made the select material a radio button, much easier to use.
2014-10-18 13:23:53 -07:00
larsbrubaker
38e55eefbb Working on material color setting 2014-10-18 10:26:36 -07:00
Kevin Pope
6646db683f Spelling correction. 2014-10-17 19:17:10 -07:00
larsbrubaker
8237fb5e98 Made the default sliders have some size. 2014-10-17 12:14:06 -07:00
larsbrubaker
55923d8f2a Fixed the text creator to work with new MeshGroups code for AMF.
Move more stuff from View3DWidget into separate files.
Renamed View3DWidget.
2014-10-16 17:52:21 -07:00
larsbrubaker
f9d4d526e6 Now align works. 2014-10-16 12:58:51 -07:00
larsbrubaker
398023ba7b Put in actual extruder temp setting and reading for multi extruders.
Got rid of crash when no gcode loaded and try to clear it.
2014-10-15 17:04:14 -07:00
larsbrubaker
edcce1e360 Moving PartPreview3DWindow into partial class with the processors being partial adds so it is easier to navigate the code.
Can export from amf
Starting work on align
2014-10-15 14:11:14 -07:00
larsbrubaker
098b203153 Making the progress bars much better. 2014-10-15 10:50:22 -07:00
larsbrubaker
242bac2b1a Get the transform from the right array. 2014-10-15 08:01:48 -07:00
larsbrubaker
fabbbc4472 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-15 07:44:59 -07:00
larsbrubaker
c2e7ce949c Put the sort vertices into mesh 2014-10-15 07:44:50 -07:00
larsbrubaker
941c06555b Made the multi object stls generate better thumbnails.
Better progress indication.
Fixed bugs in ungrouping amfs
2014-10-14 14:38:17 -07:00
larsbrubaker
92758491a7 show save buttons when material changes not when selection changes 2014-10-14 11:15:42 -07:00
Kevin Pope
eed4306c1f Adjusted library items. 2014-10-13 19:29:25 -07:00
larsbrubaker
20c60380c7 Make sure we remember what material a mesh is using when we copy it. 2014-10-13 18:20:01 -07:00
larsbrubaker
1f5bd3fcad Save 'save as' meshes as amf. 2014-10-13 15:58:06 -07:00
larsbrubaker
ba9834fec6 Did not mean to check in the conflict. 2014-10-13 12:28:59 -07:00
larsbrubaker
196c3e1c76 Merge remote-tracking branch 'Greg/development' into development
Conflicts:
	PartPreviewWindow/View3DTransfromPart.cs
2014-10-13 12:27:31 -07:00
larsbrubaker
c7915b30b9 Saving as stl (amf broken)
Better labels on progress.
2014-10-12 20:47:54 -07:00
larsbrubaker
3f7c300d2a Make sure we don't try to create thumbnails for things we can't. 2014-10-12 20:40:38 -07:00
larsbrubaker
426742ebf2 Got auto arrange working with groups 2014-10-12 18:49:46 -07:00
larsbrubaker
69825d48dc Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-12 08:18:34 -07:00
larsbrubaker
d3cd9a25f9 Making ungroup work on meshes (this is what used to happen when entering edit).
New CreateDiscreteMeshes that works on attached mesh volumes rather than an orthographic projection.
Put in a "Selection" menu for 3D editing that lets one group and ungroup and assign materials.
2014-10-12 08:18:24 -07:00
Kevin Pope
fbe1333cf0 Change file open functionality to async compatible. 2014-10-11 14:48:10 -07:00
larsbrubaker
b90177e4e0 Fixed the 3d gcode view stopping correct rendering.
Removed MatterRepair from project
Renaming
2014-10-11 08:13:26 -07:00
gregory-diaz
f6e5929e5b Added Export button to PartPreviewWindow with functionality. 2014-10-10 14:52:50 -07:00
larsbrubaker
b8b3370eb6 Fixed lay flat with groups 2014-10-10 09:30:44 -07:00
larsbrubaker
d8010a3116 We can select parts again.
We don't automatically change the selected mouse state.
2014-10-09 14:10:17 -07:00
larsbrubaker
2d3d26a68d Working to get the collision stuff working with mesh groups
Put in the RomotingLite project to start on TigerSong
2014-10-09 11:29:33 -07:00
larsbrubaker
3a39e79580 Got the rotate and scale working again (with groups)
Took out some dead code.
Making going into edit mode not do any work.
Changing split to group and ungroup
2014-10-08 16:34:25 -07:00