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

Make 3D view panels visible in edit mode only.

Browse source 
Make 2D view panel visible only after layer data is generated.
This commit is contained in:
Kevin Pope 2014-10-27 11:49:59 -07:00
parent 7c3e8982fc
commit e3af28900e
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PartPreviewWindow/View3D/View3DCreateSelecitonData.cs
View file

@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
void createSelectionDataBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
string makingCopyLabel = LocalizedString.Get("Creating Edit Data");
string makingCopyLabel = LocalizedString.Get("Preparing Meshes");
string makingCopyLabelFull = string.Format("{0}:", makingCopyLabel);
processingProgressControl.textWidget.Text = makingCopyLabelFull;
@ -110,6 +110,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// remove the original mesh and replace it with these new meshes
PullMeshGroupDataFromAsynchLists();
buttonRightPanel.Visible = true;
UnlockEditControls();
viewControls3D.partSelectButton.ClickButton(null);

1
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -307,6 +307,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
buttonBottomPanel.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
buttonRightPanel = CreateRightButtonPanel(viewerVolume.y);
buttonRightPanel.Visible = false;
CreateOptionsContent();

4
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -232,6 +232,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
centerPartPreviewAndControls.AddChild(gcodeDisplayWidget);
buttonRightPanel = CreateRightButtonPanel();
buttonRightPanel.Visible = false;
centerPartPreviewAndControls.AddChild(buttonRightPanel);
// add in a spacer
@ -342,8 +343,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
FlowLayoutWidget buttonRightPanel = new FlowLayoutWidget(FlowDirection.TopToBottom);
buttonRightPanel.Width = 200;
{
BorderDouble buttonMargin = new BorderDouble(top: 3);
string label = "Model".Localize().ToUpper();
expandModelOptions = expandMenuOptionFactory.GenerateCheckBoxButton(label, "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandModelOptions.Margin = new BorderDouble(bottom: 2);
@ -807,6 +806,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
&& gcodeViewWidget.LoadedGCode.Count > 0)
{
CreateOptionsContent();
buttonRightPanel.Visible = true;
CloseIfNotNull(setLayerWidget);
setLayerWidget = new SetLayerWidget(gcodeViewWidget);