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

Code maid

Browse source
This commit is contained in:
Lars Brubaker 2015-05-30 12:48:16 -07:00
parent 29fd5f51c5
commit 4fdfe1efe2
9 changed files with 1708 additions and 1774 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControlApplication.cs
View file

@ -680,7 +680,6 @@ namespace MatterHackers.MatterControl
MatterHackers.Agg.Graphics2D.AssertDebugNotDefined();
MatterHackers.Agg.UI.SystemWindow.AssertDebugNotDefined();
ClipperLib.Clipper.AssertDebugNotDefined();
MatterHackers.Csg.Utilities.AssertDebugNotDefined();
MatterHackers.Agg.ImageProcessing.InvertLightness.AssertDebugNotDefined();
MatterHackers.Localizations.TranslationMap.AssertDebugNotDefined();
MatterHackers.MarchingSquares.MarchingSquaresByte.AssertDebugNotDefined();

48
PartPreviewWindow/View3D/View3DAlign.cs
View file

@ -39,30 +39,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public partial class View3DWidget
{
private void AlignToSelectedMeshGroup()
{
if (MeshGroups.Count > 0)
{
// set the progress lable text
processingProgressControl.PercentComplete = 0;
processingProgressControl.Visible = true;
string makingCopyLabel = LocalizedString.Get("Aligning");
string makingCopyLabelFull = string.Format("{0}:", makingCopyLabel);
processingProgressControl.ProcessType = makingCopyLabelFull;
LockEditControls();
viewIsInEditModePreLock = true;
BackgroundWorker createDiscreteMeshesBackgroundWorker = null;
createDiscreteMeshesBackgroundWorker = new BackgroundWorker();
createDiscreteMeshesBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(alignSelectedBackgroundWorker_RunWorkerCompleted);
createDiscreteMeshesBackgroundWorker.DoWork += new DoWorkEventHandler(alignSelectedBackgroundWorker_DoWork);
createDiscreteMeshesBackgroundWorker.RunWorkerAsync();
}
}
private void alignSelectedBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
if (SelectedMeshGroupIndex == -1)
@ -162,5 +138,29 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Invalidate();
}
private void AlignToSelectedMeshGroup()
{
if (MeshGroups.Count > 0)
{
// set the progress lable text
processingProgressControl.PercentComplete = 0;
processingProgressControl.Visible = true;
string makingCopyLabel = LocalizedString.Get("Aligning");
string makingCopyLabelFull = string.Format("{0}:", makingCopyLabel);
processingProgressControl.ProcessType = makingCopyLabelFull;
LockEditControls();
viewIsInEditModePreLock = true;
BackgroundWorker createDiscreteMeshesBackgroundWorker = null;
createDiscreteMeshesBackgroundWorker = new BackgroundWorker();
createDiscreteMeshesBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(alignSelectedBackgroundWorker_RunWorkerCompleted);
createDiscreteMeshesBackgroundWorker.DoWork += new DoWorkEventHandler(alignSelectedBackgroundWorker_DoWork);
createDiscreteMeshesBackgroundWorker.RunWorkerAsync();
}
}
}
}

40
PartPreviewWindow/View3D/View3DAutoArange.cs
View file

@ -40,26 +40,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public partial class View3DWidget
{
private void AutoArrangePartsInBackground()
{
if (MeshGroups.Count > 0)
{
string progressArrangeParts = LocalizedString.Get("Arranging Parts");
string progressArrangePartsFull = string.Format("{0}:", progressArrangeParts);
processingProgressControl.ProcessType = progressArrangePartsFull;
processingProgressControl.Visible = true;
processingProgressControl.PercentComplete = 0;
LockEditControls();
BackgroundWorker arrangeMeshGroupsBackgroundWorker = new BackgroundWorker();
arrangeMeshGroupsBackgroundWorker.DoWork += new DoWorkEventHandler(arrangeMeshGroupsBackgroundWorker_DoWork);
arrangeMeshGroupsBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(arrangeMeshGroupsBackgroundWorker_RunWorkerCompleted);
arrangeMeshGroupsBackgroundWorker.RunWorkerAsync();
}
}
private void arrangeMeshGroupsBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
@ -163,5 +143,25 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
PullMeshGroupDataFromAsynchLists();
}
private void AutoArrangePartsInBackground()
{
if (MeshGroups.Count > 0)
{
string progressArrangeParts = LocalizedString.Get("Arranging Parts");
string progressArrangePartsFull = string.Format("{0}:", progressArrangeParts);
processingProgressControl.ProcessType = progressArrangePartsFull;
processingProgressControl.Visible = true;
processingProgressControl.PercentComplete = 0;
LockEditControls();
BackgroundWorker arrangeMeshGroupsBackgroundWorker = new BackgroundWorker();
arrangeMeshGroupsBackgroundWorker.DoWork += new DoWorkEventHandler(arrangeMeshGroupsBackgroundWorker_DoWork);
arrangeMeshGroupsBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(arrangeMeshGroupsBackgroundWorker_RunWorkerCompleted);
arrangeMeshGroupsBackgroundWorker.RunWorkerAsync();
}
}
}
}

44
PartPreviewWindow/View3D/View3DCopyGroup.cs
View file

@ -37,28 +37,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public partial class View3DWidget
{
private void MakeCopyOfGroup()
{
if (MeshGroups.Count > 0
&& SelectedMeshGroupIndex != -1)
{
string makingCopyLabel = LocalizedString.Get("Making Copy");
string makingCopyLabelFull = string.Format("{0}:", makingCopyLabel);
processingProgressControl.ProcessType = makingCopyLabelFull;
processingProgressControl.Visible = true;
processingProgressControl.PercentComplete = 0;
LockEditControls();
BackgroundWorker copyGroupBackgroundWorker = null;
copyGroupBackgroundWorker = new BackgroundWorker();
copyGroupBackgroundWorker.DoWork += new DoWorkEventHandler(copyGroupBackgroundWorker_DoWork);
copyGroupBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(copyGroupBackgroundWorker_RunWorkerCompleted);
copyGroupBackgroundWorker.RunWorkerAsync();
}
}
private void copyGroupBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
@ -100,5 +78,27 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
MeshGroupExtraData[MeshGroups.Count - 1].currentScale = MeshGroupExtraData[SelectedMeshGroupIndex].currentScale;
SelectedMeshGroupIndex = MeshGroups.Count - 1;
}
private void MakeCopyOfGroup()
{
if (MeshGroups.Count > 0
&& SelectedMeshGroupIndex != -1)
{
string makingCopyLabel = LocalizedString.Get("Making Copy");
string makingCopyLabelFull = string.Format("{0}:", makingCopyLabel);
processingProgressControl.ProcessType = makingCopyLabelFull;
processingProgressControl.Visible = true;
processingProgressControl.PercentComplete = 0;
LockEditControls();
BackgroundWorker copyGroupBackgroundWorker = null;
copyGroupBackgroundWorker = new BackgroundWorker();
copyGroupBackgroundWorker.DoWork += new DoWorkEventHandler(copyGroupBackgroundWorker_DoWork);
copyGroupBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(copyGroupBackgroundWorker_RunWorkerCompleted);
copyGroupBackgroundWorker.RunWorkerAsync();
}
}
}
}

46
PartPreviewWindow/View3D/View3DCreateSelecitonData.cs
View file

@ -38,29 +38,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public partial class View3DWidget
{
private void EnterEditAndCreateSelectionData()
{
if (enterEditButtonsContainer.Visible == true)
{
enterEditButtonsContainer.Visible = false;
}
if (MeshGroups.Count > 0)
{
processingProgressControl.Visible = true;
LockEditControls();
viewIsInEditModePreLock = true;
BackgroundWorker createSelectionDataBackgroundWorker = null;
createSelectionDataBackgroundWorker = new BackgroundWorker();
createSelectionDataBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(createSelectionDataBackgroundWorker_RunWorkerCompleted);
createSelectionDataBackgroundWorker.DoWork += new DoWorkEventHandler(createSelectionDataBackgroundWorker_DoWork);
createSelectionDataBackgroundWorker.RunWorkerAsync();
}
}
private void createSelectionDataBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
string makingCopyLabel = LocalizedString.Get("Preparing Meshes");
@ -127,5 +104,28 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
LoadAndAddPartsToPlate(pendingPartsToLoad.ToArray());
}
}
private void EnterEditAndCreateSelectionData()
{
if (enterEditButtonsContainer.Visible == true)
{
enterEditButtonsContainer.Visible = false;
}
if (MeshGroups.Count > 0)
{
processingProgressControl.Visible = true;
LockEditControls();
viewIsInEditModePreLock = true;
BackgroundWorker createSelectionDataBackgroundWorker = null;
createSelectionDataBackgroundWorker = new BackgroundWorker();
createSelectionDataBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(createSelectionDataBackgroundWorker_RunWorkerCompleted);
createSelectionDataBackgroundWorker.DoWork += new DoWorkEventHandler(createSelectionDataBackgroundWorker_DoWork);
createSelectionDataBackgroundWorker.RunWorkerAsync();
}
}
}
}

82
PartPreviewWindow/View3D/View3DGroup.cs
View file

@ -38,47 +38,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public partial class View3DWidget
{
private void GroupSelectedMeshs()
{
if (MeshGroups.Count > 0)
{
processingProgressControl.PercentComplete = 0;
processingProgressControl.Visible = true;
LockEditControls();
viewIsInEditModePreLock = true;
BackgroundWorker createDiscreteMeshesBackgroundWorker = null;
createDiscreteMeshesBackgroundWorker = new BackgroundWorker();
createDiscreteMeshesBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(groupSelectedBackgroundWorker_RunWorkerCompleted);
createDiscreteMeshesBackgroundWorker.DoWork += new DoWorkEventHandler(groupSelectedBackgroundWorker_DoWork);
createDiscreteMeshesBackgroundWorker.RunWorkerAsync();
}
}
private void groupSelectedBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
string makingCopyLabel = LocalizedString.Get("Grouping");
string makingCopyLabelFull = string.Format("{0}:", makingCopyLabel);
processingProgressControl.ProcessType = makingCopyLabelFull;
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
BackgroundWorker backgroundWorker = (BackgroundWorker)sender;
PushMeshGroupDataToAsynchLists(TraceInfoOpperation.DO_COPY);
for (int i = 0; i < asynchMeshGroups.Count; i++)
{
asynchMeshGroups[i].Transform(asynchMeshGroupTransforms[i].TotalTransform);
bool continueProcessing;
BackgroundWorker_ProgressChanged((i + 1) * .4 / asynchMeshGroups.Count, "", out continueProcessing);
}
DoGroup(backgroundWorker);
}
private void DoGroup(BackgroundWorker backgroundWorker)
{
if (SelectedMeshGroupIndex == -1)
@ -126,6 +85,28 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
private void groupSelectedBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
string makingCopyLabel = LocalizedString.Get("Grouping");
string makingCopyLabelFull = string.Format("{0}:", makingCopyLabel);
processingProgressControl.ProcessType = makingCopyLabelFull;
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
BackgroundWorker backgroundWorker = (BackgroundWorker)sender;
PushMeshGroupDataToAsynchLists(TraceInfoOpperation.DO_COPY);
for (int i = 0; i < asynchMeshGroups.Count; i++)
{
asynchMeshGroups[i].Transform(asynchMeshGroupTransforms[i].TotalTransform);
bool continueProcessing;
BackgroundWorker_ProgressChanged((i + 1) * .4 / asynchMeshGroups.Count, "", out continueProcessing);
}
DoGroup(backgroundWorker);
}
private void groupSelectedBackgroundWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
{
if (WidgetHasBeenClosed)
@ -145,5 +126,24 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Invalidate();
}
private void GroupSelectedMeshs()
{
if (MeshGroups.Count > 0)
{
processingProgressControl.PercentComplete = 0;
processingProgressControl.Visible = true;
LockEditControls();
viewIsInEditModePreLock = true;
BackgroundWorker createDiscreteMeshesBackgroundWorker = null;
createDiscreteMeshesBackgroundWorker = new BackgroundWorker();
createDiscreteMeshesBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(groupSelectedBackgroundWorker_RunWorkerCompleted);
createDiscreteMeshesBackgroundWorker.DoWork += new DoWorkEventHandler(groupSelectedBackgroundWorker_DoWork);
createDiscreteMeshesBackgroundWorker.RunWorkerAsync();
}
}
}
}

38
PartPreviewWindow/View3D/View3DUngroup.cs
View file

@ -39,25 +39,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public partial class View3DWidget
{
private void UngroupSelectedMeshGroup()
{
if (MeshGroups.Count > 0)
{
processingProgressControl.PercentComplete = 0;
processingProgressControl.Visible = true;
LockEditControls();
viewIsInEditModePreLock = true;
BackgroundWorker createDiscreteMeshesBackgroundWorker = null;
createDiscreteMeshesBackgroundWorker = new BackgroundWorker();
createDiscreteMeshesBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(ungroupSelectedBackgroundWorker_RunWorkerCompleted);
createDiscreteMeshesBackgroundWorker.DoWork += new DoWorkEventHandler(ungroupSelectedBackgroundWorker_DoWork);
createDiscreteMeshesBackgroundWorker.RunWorkerAsync();
}
}
private void ungroupSelectedBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
if (SelectedMeshGroupIndex == -1)
@ -139,5 +120,24 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Invalidate();
}
private void UngroupSelectedMeshGroup()
{
if (MeshGroups.Count > 0)
{
processingProgressControl.PercentComplete = 0;
processingProgressControl.Visible = true;
LockEditControls();
viewIsInEditModePreLock = true;
BackgroundWorker createDiscreteMeshesBackgroundWorker = null;
createDiscreteMeshesBackgroundWorker = new BackgroundWorker();
createDiscreteMeshesBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(ungroupSelectedBackgroundWorker_RunWorkerCompleted);
createDiscreteMeshesBackgroundWorker.DoWork += new DoWorkEventHandler(ungroupSelectedBackgroundWorker_DoWork);
createDiscreteMeshesBackgroundWorker.RunWorkerAsync();
}
}
}
}

3177
PartPreviewWindow/View3D/View3DWidget.cs
View file

File diff suppressed because it is too large Load diff

6
StaticData/Translations/Master.txt
View file

@ -3280,3 +3280,9 @@ Translated:WARNING: Write Failed!
English:Can't access '{0}'.
Translated:Can't access '{0}'.
English:Oops! Unable to save changes.
Translated:Oops! Unable to save changes.
English:Unable to save
Translated:Unable to save