nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improving fit to bounds default position on rebuild

Browse source 
Making it easier to see that you have opened the obsolete version of a file
This commit is contained in:
Lars Brubaker 2019-01-28 10:53:09 -08:00
parent 51da7c21b0
commit 1ef0a37f1d
10 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControlLib/DesignTools/Obsolete/CombineObject3D.cs
View file

@ -27,8 +27,12 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
/*********************************************************************/
/**************************** OBSOLETE! ******************************/
/************************ USE NEWER VERSION **************************/
/*********************************************************************/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@ -36,8 +40,6 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DesignTools;
using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{

6
MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs
View file

@ -27,6 +27,12 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
/*********************************************************************/
/**************************** OBSOLETE! ******************************/
/************************ USE NEWER VERSION **************************/
/*********************************************************************/
using System;
using System.Collections.Generic;
using System.ComponentModel;

5
MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs
View file

@ -27,6 +27,11 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
/*********************************************************************/
/**************************** OBSOLETE! ******************************/
/************************ USE NEWER VERSION **************************/
/*********************************************************************/
using System;
using System.ComponentModel;
using System.Linq;

8
MatterControlLib/DesignTools/Obsolete/IntersectionObject3D.cs
View file

@ -27,8 +27,12 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
/*********************************************************************/
/**************************** OBSOLETE! ******************************/
/************************ USE NEWER VERSION **************************/
/*********************************************************************/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@ -36,8 +40,6 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DesignTools;
using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{

11
MatterControlLib/DesignTools/Obsolete/MirrorObject3D.cs
View file

@ -27,19 +27,18 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.ComponentModel;
using System.Linq;
/*********************************************************************/
/**************************** OBSOLETE! ******************************/
/************************ USE NEWER VERSION **************************/
/*********************************************************************/
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DesignTools.Operations;
using MatterHackers.MatterControl.PartPreviewWindow.View3D;
using MatterHackers.PolygonMesh;
using MatterHackers.VectorMath;
using Newtonsoft.Json;
namespace MatterHackers.MatterControl.DesignTools
{

5
MatterControlLib/DesignTools/Obsolete/PinchObject3D.cs
View file

@ -27,6 +27,11 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
/*********************************************************************/
/**************************** OBSOLETE! ******************************/
/************************ USE NEWER VERSION **************************/
/*********************************************************************/
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;

7
MatterControlLib/DesignTools/Obsolete/RotateObject3D.cs
View file

@ -27,11 +27,14 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg.UI;
/*********************************************************************/
/**************************** OBSOLETE! ******************************/
/************************ USE NEWER VERSION **************************/
/*********************************************************************/
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.VectorMath;
using Newtonsoft.Json;
using System;
using System.ComponentModel;
using System.Threading.Tasks;

10
MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs
View file

@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
return base.GetAxisAlignedBoundingBox(matrix);
}
public override void OnInvalidate(InvalidateArgs invalidateType)
public override async void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
@ -143,12 +143,12 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
&& invalidateType.Source != this
&& !RebuildLocked)
{
Rebuild();
await Rebuild();
}
else if (invalidateType.InvalidateType == InvalidateType.Properties
&& invalidateType.Source == this)
{
Rebuild();
await Rebuild();
}
else if ((invalidateType.InvalidateType == InvalidateType.Properties
|| invalidateType.InvalidateType == InvalidateType.Matrix
@ -175,6 +175,10 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
cacheRequestedMatrix = new Matrix4X4();
var after = this.GetAxisAlignedBoundingBox();
var newAabbb = this.GetAxisAlignedBoundingBox();
this.Translate(aabb.Center - newAabbb.Center);
if (aabb.ZSize > 0)
{
// If the part was already created and at a height, maintain the height.

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 45f10600c6b9ae4de450e782e9ef66b82d5179bb
Subproject commit 283f0ae00cf347fd9345de2fe100846e2dd7d95e

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 445c807b0a95253b31273fc8194054283227997a
Subproject commit a1e536bd0d14cd92af62cf3bdc90f9a53d4c1cff