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

Fixed bug entering edit more from library.

Browse source
This commit is contained in:
Lars Brubaker 2015-01-08 11:55:50 -08:00
parent 4afadaffc1
commit 679e7cd0d5
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PartPreviewWindow/View3D/View3DCreateSelecitonData.cs
View file

@ -64,8 +64,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
createSelectionDataBackgroundWorker.RunWorkerAsync();
}
SelectedMeshGroupIndex = 0;
}
void createSelectionDataBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
@ -131,6 +129,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
LoadAndAddPartsToPlate(pendingPartsToLoad.ToArray());
}
SelectedMeshGroupIndex = 0;
}
}
}

18
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -64,6 +64,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public enum WindowMode { Embeded, StandAlone };
public enum AutoRotate { Enabled, Disabled };
public enum OpenMode { Viewing, Editing }
OpenMode openMode;
readonly int EditButtonHeight = 44;
@ -350,6 +351,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public View3DWidget(PrintItemWrapper printItemWrapper, Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape, WindowMode windowType, AutoRotate autoRotate, OpenMode openMode = OpenMode.Viewing)
{
this.openMode = openMode;
this.windowType = windowType;
allowAutoRotate = (autoRotate == AutoRotate.Enabled);
autoRotating = allowAutoRotate;
@ -632,14 +634,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
ActiveTheme.Instance.ThemeChanged.RegisterEvent(ThemeChanged, ref unregisterEvents);
if (openMode == OpenMode.Editing)
{
UiThread.RunOnIdle((state) =>
{
EnterEditAndCreateSelectionData();
});
}
upArrow = new UpArrow3D(this);
heightDisplay = new HeightValueDisplay(this);
heightDisplay.Visible = false;
@ -971,6 +965,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
SelectionChanged(this, null);
if (openMode == OpenMode.Editing)
{
UiThread.RunOnIdle((state) =>
{
EnterEditAndCreateSelectionData();
});
}
}
bool viewIsInEditModePreLock = false;