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

Fixed entering edit when clicking "add" (large models could cause a race condition).

Browse source 
Made better progress indication while loading models on add
This commit is contained in:
larsbrubaker 2014-10-24 17:27:38 -07:00
parent af16d96004
commit ff9c13baa6
3 changed files with 44 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
PartPreviewWindow/View3D/View3DCreateSelecitonData.cs
View file

@ -31,6 +31,8 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Threading;
using MatterHackers.Agg.UI;
using MatterHackers.Agg;
using MatterHackers.Localizations;
using MatterHackers.MeshVisualizer;
using MatterHackers.PolygonMesh;
@ -109,15 +111,21 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
PullMeshGroupDataFromAsynchLists();
UnlockEditControls();
if (pendingPartsToLoad.Count > 0)
{
LoadAndAddPartsToPlate(pendingPartsToLoad.ToArray());
}
viewControls3D.partSelectButton.ClickButton(null);
Invalidate();
if (DoAddFileAfterCreatingEditData)
{
OpenFileDialogParams openParams = new OpenFileDialogParams(ApplicationSettings.OpenDesignFileParams, multiSelect: true);
FileDialog.OpenFileDialog(ref openParams);
LoadAndAddPartsToPlate(openParams.FileNames);
}
else if (pendingPartsToLoad.Count > 0)
{
LoadAndAddPartsToPlate(pendingPartsToLoad.ToArray());
}
}
}
}

41
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -67,6 +67,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
FlowLayoutWidget materialOptionContainer;
List<string> pendingPartsToLoad = new List<string>();
bool DoAddFileAfterCreatingEditData { get; set; }
ProgressControl processingProgressControl;
FlowLayoutWidget enterEditButtonsContainer;
@ -332,12 +333,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
UiThread.RunOnIdle((state) =>
{
DoAddFileAfterCreatingEditData = true;
EnterEditAndCreateSelectionData();
OpenFileDialogParams openParams = new OpenFileDialogParams(ApplicationSettings.OpenDesignFileParams, multiSelect: true);
FileDialog.OpenFileDialog(ref openParams);
LoadAndAddPartsToPlate(openParams.FileNames);
});
};
@ -724,14 +721,19 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
string[] filesToLoad = e.Argument as string[];
if (filesToLoad != null && filesToLoad.Length > 0)
{
int lastPercent = 0;
double ratioPerFile = 1.0 / filesToLoad.Length;
double currentRatioDone = 0;
for (int i = 0; i < filesToLoad.Length; i++)
{
int nextPercent = i + 1 * 100 / filesToLoad.Length;
int subLength = nextPercent - lastPercent;
string loadedFileName = filesToLoad[i];
List<MeshGroup> loadedMeshGroups = MeshFileIo.Load(Path.GetFullPath(loadedFileName));
List<MeshGroup> loadedMeshGroups = MeshFileIo.Load(Path.GetFullPath(loadedFileName), (double progress0To1, string processingState) =>
{
double ratioAvailable = (ratioPerFile * .5);
double currentRatio = currentRatioDone + progress0To1 * ratioAvailable;
backgroundWorker.ReportProgress((int)(currentRatio * 100));
return true;
});
if (WidgetHasBeenClosed)
{
@ -739,8 +741,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
if (loadedMeshGroups != null)
{
int halfNextPercent = (nextPercent - lastPercent) / 2;
lastPercent = halfNextPercent;
double ratioPerSubMesh = 1.0 / loadedMeshGroups.Count;
double currentPlatingRatioDone = 0;
for (int subMeshIndex = 0; subMeshIndex < loadedMeshGroups.Count; subMeshIndex++)
{
@ -751,15 +753,20 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
return;
}
PlatingHelper.CreateITraceableForMeshGroup(asynchPlatingDatas, asynchMeshGroups, asynchMeshGroups.Count - 1, null);
PlatingHelper.CreateITraceableForMeshGroup(asynchPlatingDatas, asynchMeshGroups, asynchMeshGroups.Count - 1, (double progress0To1, string processingState) =>
{
double ratioAvailable = (ratioPerFile * .5);
double currentRatio = currentRatioDone + currentPlatingRatioDone + ratioAvailable + progress0To1 * ratioAvailable;
backgroundWorker.ReportProgress((int)(currentRatio * 100));
return true;
});
backgroundWorker.ReportProgress(lastPercent + subMeshIndex + 1 * subLength / loadedMeshGroups.Count);
currentPlatingRatioDone += ratioPerSubMesh;
}
backgroundWorker.ReportProgress(nextPercent);
lastPercent = nextPercent;
}
}
currentRatioDone += ratioPerFile;
}
}