nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6440 commits 1 branch 0 tags 103 MiB
Commit graph

6440 commits

This branch
This branch
All branches
Author SHA1 Message Date
johnlewin
7f0e1ee788 Merge pull request #2099 from larsbrubaker/design_tools 
Got decent filtering working correctly
 2017-05-31 12:45:25 -07:00
Lars Brubaker
4f46d1e7d4 Got decent filtering working correctly 
Better debugging of BVH info
 2017-05-31 11:56:25 -07:00
Lars Brubaker
e9a0b1bb0a Merge pull request #2098 from larsbrubaker/design_tools 
Design tools
 2017-05-30 21:04:14 -07:00
Lars Brubaker
4489f3407f Merge remote-tracking branch 'origin/design_tools' into design_tools 
# Conflicts:
#	PartPreviewWindow/ViewGcodeBasic.cs
 2017-05-30 18:16:57 -07:00
Lars Brubaker
a5ae51ae2b Merge pull request #2097 from jlewin/design_tools 
Add support for conditional close to menus
 2017-05-30 17:53:57 -07:00
Lars Brubaker
e8de6b5b7a Working on new proof of bvh enumeration behavior 2017-05-30 17:51:52 -07:00
John Lewin
02482f7121 Add support for conditional close to menus 
- Use IIgnoredPopupChild marker interface
- Extract RotateControl to new file
- Use PopupActionPanel base for conditional close behavior
- Extract Grid options to new GridOptionsPanel.cs
- Fix null reference on translate/scale of gcodeViewWiget
 2017-05-30 17:38:19 -07:00
Lars Brubaker
706d86bcd0 Use the right view for drawing 2017-05-30 10:10:30 -07:00
larsbrubaker
2d0ce4bccf Testing drawing ray trace vertex data from TriangleShape 2017-05-29 16:56:56 -07:00
larsbrubaker
c0831f27db Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools 2017-05-29 14:31:09 -07:00
larsbrubaker
105feb077f Moved the bhv debug test to the debug bvh class 2017-05-29 14:24:59 -07:00
larsbrubaker
9cb7f18276 Some interesting results with iterating IBvhItems 2017-05-29 11:44:53 -07:00
johnlewin
21ce081d30 Merge pull request #2095 from jlewin/design_tools 
Remove ViewControls2D, use shared ViewControls across Layer2D/3D views
 2017-05-27 18:17:46 -07:00
larsbrubaker
cdbff43c10 Correct transform 2017-05-27 17:06:26 -07:00
larsbrubaker
45f5d2b739 Experimenting with iterators 2017-05-27 16:29:35 -07:00
John Lewin
3ec34e0adc Remove ViewControls2D, use shared ViewControls across Layer2D/3D views 2017-05-26 21:28:35 -07:00
johnlewin
0c90910547 Merge pull request #2094 from jlewin/design_tools 
Fix empty Layer2D view
 2017-05-26 20:59:12 -07:00
John Lewin
56e7d3c96d Remove debugging code 2017-05-26 20:25:36 -07:00
John Lewin
e45a0f16f7 Fix empty Layer2D view 
- Refactor ViewControlsToggle
  - Remove public accessors to button controls
  - Add event for changing modes
  - Subscribe to new event
- Collapse named functions into single use callers for clarity
 2017-05-26 20:13:56 -07:00
Lars Brubaker
5e0e35cdc1 Merge pull request #2093 from jlewin/design_tools 
Switch directly to 3D layer view
 2017-05-26 15:47:50 -07:00
John Lewin
8ff6b9ae23 Switch directly to 3D layer view 2017-05-26 15:40:48 -07:00
johnlewin
bfa37055cd Merge pull request #2092 from jlewin/design_tools 
Remove sidebar, fix ViewControl buttons
 2017-05-26 14:01:36 -07:00
John Lewin
bce4137069 Remove sidebar, fix ViewControl buttons 2017-05-26 13:46:12 -07:00
johnlewin
aa3a48d90f Merge pull request #2091 from jlewin/design_tools 
Design tools
 2017-05-26 11:43:04 -07:00
John Lewin
4d4b9dca8e Continue migrating sidebar items to new locations 2017-05-26 02:10:22 -07:00
John Lewin
fa3eea5467 Move Undo/Redo button to PrinterActionsBar 2017-05-26 01:14:22 -07:00
John Lewin
dc0c285156 Adjust ViewControls colors to account for new potentially dark bgcolor 2017-05-26 00:59:47 -07:00
John Lewin
7c4ff5569b Fix more menu issues 
- Restore ViewControls3D Overflow menu selection
- Revise DropList styling
- Revert to prior mechanism for DynamicPopupContent
- Create redirector in PrinterTabPage for dynamic overflow menu
 2017-05-26 00:23:20 -07:00
John Lewin
88d32b0d2d Restore Library menu item selection 2017-05-26 00:18:34 -07:00
johnlewin
cc8b4223d5 Merge pull request #2090 from jlewin/design_tools 
Fix Layer3D view in design_tools, sync part/layer views on enter
 2017-05-25 19:06:49 -07:00
John Lewin
4d54f7153d Fix build error 2017-05-25 18:57:04 -07:00
John Lewin
42898a6f91 Fix Layer3D view in design_tools, sync part/layer views on enter 
- Revert to 1.7/ViewGcodeBasic code and make functional
 2017-05-25 18:17:09 -07:00
johnlewin
e1421fb779 Merge pull request #2088 from jlewin/design_tools 
Working toward shared ViewControls3D and functional slicing
 2017-05-25 10:13:58 -07:00
John Lewin
08d2a6ab1a Working toward shared ViewControls3D and functional slicing 
- More missing functionality restored in action bars/slicing views
 2017-05-25 01:15:00 -07:00
johnlewin
44e9cbc09c Merge pull request #2087 from larsbrubaker/design_tools 
sync 3d views transform
 2017-05-25 00:58:51 -07:00
Lars Brubaker
04ce0a2380 fixed vector3 2017-05-24 17:26:48 -07:00
Lars Brubaker
77c3b78eb1 Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools 
# Conflicts:
#	PartPreviewWindow/PartPreviewContent.cs
 2017-05-24 15:07:06 -07:00
Lars Brubaker
912101fe32 sync 3d views transform 2017-05-24 14:48:00 -07:00
Lars Brubaker
b9d8880ddc Merge pull request #2086 from jlewin/design_tools 
Sync tab styling
 2017-05-24 14:45:01 -07:00
John Lewin
4559073237 Move more widgets to printer action bar 
- Extract elements in PrinterConnectAndSelectControl to components
- Use new components in printer action bar
- Extract more factories to shared components
- Move shared color to ThemeConfig
- Add support for widget generation during ShowPopup
 2017-05-24 14:19:02 -07:00
Lars Brubaker
ac157577bd Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools 
# Conflicts:
#	Submodules/agg-sharp
 2017-05-24 08:15:00 -07:00
John Lewin
de20dea82d Latest agg-sharp 2017-05-23 23:24:38 -07:00
John Lewin
459dd3d304 Sync tab styling 
- Fix temperature widget flow orientation for toolbar
- Create reusable constructor function for tabcontrols
- Conditional printer tab title of "Printer" or [PrinterName]
 2017-05-23 21:29:03 -07:00
johnlewin
3ed6072625 Merge pull request #2085 from jlewin/design_tools 
Continue migrating features to new layout
 2017-05-23 20:36:08 -07:00
John Lewin
95f6624f5d Prior agg-sharp 2017-05-23 20:30:53 -07:00
John Lewin
69e83b3dd9 Continue migrating features to new layout 
- Create toolbar for printer
- Migrate ActionBarPlus code to new toolbar
- Migrate printer specific actions from Options to new toolbar
- Consolidate and reuse theme factory instances
- Restore F1 reporting of unnamed widgets, useful for finding types
 2017-05-23 19:07:57 -07:00
johnlewin
88ff455851 Merge pull request #2084 from jlewin/design_tools 
Migrate View3D>Edit>Display options to ViewControls3D overflow menu
 2017-05-23 15:36:27 -07:00
John Lewin
1e643617c5 Adjust tab styling 
- Pass separator bars to tabs, disable drawn borders
- Remove ActionBar from leftnav
- Remove PrintProgressBar from leftnav
- Revise BreadCrumb button attributes
- Revise UpFolder icon
- Revise overflow/pancake menu icon
- Create OverflowButton to encapsulate common menu item
- Use horizontal/VerticalLine for consistent color/weight separators
- Reduce visual clutter
  - Minimize regions created by color and line separators
  - Reduce the contrast of separator lines
  - Reduce the contrast of region backgrounds
  - Use consistent background colors across sibling tab pages
 2017-05-23 14:54:36 -07:00
John Lewin
f9c769998d Migrate View3D>Edit>Display options to ViewControls3D overflow menu 2017-05-22 18:17:35 -07:00
Lars Brubaker
f9784738e9 Adding obj loading support 2017-05-22 17:52:08 -07:00