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

Removed 'Setup...' button

Browse source 
Improved Print popup
Made print popup always available

issue: MatterHackers/MCCentral#4661
Unify 'Setup...' into 'Print'
This commit is contained in:
Lars Brubaker 2018-12-03 13:23:24 -08:00
parent 6edfd4b9f0
commit 3ef1abd065
7 changed files with 172 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs
View file

@ -138,7 +138,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
cancellationToken.ThrowIfCancellationRequested();
progressStatus.Status = status;
progressStatus.Progress0To1 = percentCompleted + amountPerOperation * progress0To1;
progressStatus.Progress0To1 = percentCompleted + (amountPerOperation * progress0To1);
reporter.Report(progressStatus);
}, cancellationToken);
@ -149,7 +149,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
cancellationToken.ThrowIfCancellationRequested();
progressStatus.Status = status;
progressStatus.Progress0To1 = percentCompleted + amountPerOperation * progress0To1;
progressStatus.Progress0To1 = percentCompleted + (amountPerOperation * progress0To1);
reporter?.Report(progressStatus);
}, cancellationToken);
@ -160,7 +160,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
cancellationToken.ThrowIfCancellationRequested();
progressStatus.Status = status;
progressStatus.Progress0To1 = percentCompleted + amountPerOperation * progress0To1;
progressStatus.Progress0To1 = percentCompleted + (amountPerOperation * progress0To1);
reporter.Report(progressStatus);
}, cancellationToken);
}
@ -180,9 +180,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
positionIndex.Add(key, i);
var position = Vector3.Transform(vertex.Position, matrix);
va[i * 3 + 0] = position.X;
va[i * 3 + 1] = position.Y;
va[i * 3 + 2] = position.Z;
va[(i * 3) + 0] = position.X;
va[(i * 3) + 1] = position.Y;
va[(i * 3) + 2] = position.Z;
i++;
}
}