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

Merge remote-tracking branch 'Greg/development' into development

Browse source 
Conflicts:
	StaticData/Translations/Master.txt
This commit is contained in:
larsbrubaker 2014-03-17 14:44:38 -07:00
commit 22edd06781
5 changed files with 79 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControl.csproj
View file

@ -38,7 +38,6 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<ReleaseVersion>0.8.2</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@ -191,11 +190,11 @@
<Compile Include="EeProm\EePromRepetierParameter.cs" />
<Compile Include="EeProm\EePromRepetierWidget.cs" />
<Compile Include="EeProm\EePromRepetierStorage.cs" />
<Compile Include="PartPreviewWindow\SaveAsWindow.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\ICSharpCode.SharpZipLib.dll</HintPath>
<HintPath>ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="PdfSharp">
<HintPath>PdfSharp.dll</HintPath>
@ -328,7 +327,7 @@
<Project>{865172A0-A1A9-49C2-9386-F2FDB4E141B7}</Project>
<Name>MatterControlPluginSystem</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\agg\Agg.csproj">
<ProjectReference Include="..\agg-sharp\Agg\Agg.csproj">
<Project>{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}</Project>
<Name>Agg</Name>
</ProjectReference>

29
MatterControl.userprefs
View file

@ -1,29 +0,0 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeFile.cs">
<Files>
<File FileName="PrintQueue\QueueControlsWidget.cs" Line="1" Column="1" />
<File FileName="CustomWidgets\ExportQueueItemWindow.cs" Line="1" Column="1" />
<File FileName="PrintLibrary\ExportLibraryItemWindow.cs" Line="1" Column="1" />
<File FileName="PartPreviewWindow\GcodeViewBasic.cs" Line="1" Column="1" />
<File FileName="Localizations\LocalizedString.cs" Line="1" Column="1" />
<File FileName="c:\Users\Matter Hackers 1\Development\agg-sharp\Gui\FileDialogs\FileDialog.cs" Line="1" Column="1" />
<File FileName="ActionBar\HelpTextWidget.cs" Line="1" Column="1" />
<File FileName="c:\Users\Matter Hackers 1\Development\agg-sharp\PlatformWin32\win32\WidgetForWindowsFormsAbstract.cs" Line="1" Column="1" />
<File FileName="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeViewWidget.cs" Line="1" Column="1" />
<File FileName="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeFile.cs" Line="1" Column="1" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Catchpoint exceptionName="System.Reflection.TargetInvocationException" includeSubclasses="True" />
<Breakpoint file="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeViewWidget.cs" line="399" column="31" />
<Breakpoint file="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeViewWidget.cs" line="241" column="1" />
<Breakpoint file="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeFile.cs" line="186" column="53" />
<Breakpoint file="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeFile.cs" line="242" column="36" />
<Breakpoint file="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeFile.cs" line="519" column="1" />
<Breakpoint file="c:\Users\Matter Hackers 1\Development\agg-sharp\examples\GCodeVisualizer\GCodeFile.cs" line="639" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
</Properties>

38
PartPreviewWindow/SaveAsWindow.cs Normal file
View file

@ -0,0 +1,38 @@

using System;
using System.Collections.Generic;
using System.Linq;
using System.IO;
using System.Text;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.VectorMath;
using MatterHackers.Agg.Image;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.Localizations;
namespace MatterHackers.MatterControl
{
public class SaveAsWindow : SystemWindow
{
public SaveAsWindow()
: base (360, 300)
{
Title = "Save As Window";
FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
topToBottom.AnchorAll();
topToBottom.Padding = new BorderDouble(3, 0, 3, 5);
FlowLayoutWidget headerRow = new FlowLayoutWidget(FlowDirection.LeftToRight);
headerRow.HAnchor = HAnchor.ParentLeftRight;
headerRow.Margin = new BorderDouble(0, 3, 0, 0);
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
ShowAsSystemWindow ();
}
}
}

31
PartPreviewWindow/View3DTransfromPart.cs
View file

@ -100,10 +100,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
CheckBox expandScaleOptions;
Button autoArrangeButton;
Button saveButton;
Button saveButton;
Button saveAsButton;
Button closeButton;
Button applyScaleButton;
SaveAsWindow saveAs;
PrintItemWrapper printItemWrapper;
List<Mesh> asynchMeshesList = new List<Mesh>();
@ -249,6 +252,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
&& meshSelectInfo.downOnPart
&& meshSelectInfo.lastMoveDelta != Vector3.Zero)
{
saveAsButton.Visible = true;
saveButton.Visible = true;
}
@ -775,6 +779,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
MeshExtraData.RemoveAt(SelectedMeshIndex);
MeshTransforms.RemoveAt(SelectedMeshIndex);
SelectedMeshIndex = Math.Min(SelectedMeshIndex, Meshes.Count - 1);
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
}
@ -1038,6 +1043,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
verticalSpacer.VAnchor = VAnchor.ParentBottomTop;
buttonRightPanel.AddChild(verticalSpacer);
//Create Save As Button
saveAsButton = whiteButtonFactory.Generate("Save As".Localize(), centerText: true);
saveAsButton.Visible = false;
saveAsButton.Cursor = Cursors.Hand;
buttonRightPanel.AddChild (saveAsButton);
saveButton = whiteButtonFactory.Generate(LocalizedString.Get("Save"), centerText: true);
saveButton.Visible = false;
saveButton.Cursor = Cursors.Hand;
@ -1190,6 +1201,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
PlatingHelper.PlaceMeshOnBed(Meshes, MeshTransforms, SelectedMeshIndex, false);
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
MeshExtraData[SelectedMeshIndex].currentScale = scale;
@ -1246,6 +1258,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// and shift it back so the new center is where the old center was
SelectedMeshTransform *= Matrix4X4.CreateTranslation(startingCenter - bounds.Center);
PlatingHelper.PlaceMeshOnBed(Meshes, MeshTransforms, SelectedMeshIndex, false);
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
};
@ -1269,6 +1282,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// and shift it back so the new center is where the old center was
SelectedMeshTransform *= Matrix4X4.CreateTranslation(startingCenter - bounds.Center);
PlatingHelper.PlaceMeshOnBed(Meshes, MeshTransforms, SelectedMeshIndex, false);
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
};
@ -1291,6 +1305,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
bounds = SelectedMesh.GetAxisAlignedBoundingBox(SelectedMeshTransform);
// and shift it back so the new center is where the old center was
SelectedMeshTransform *= Matrix4X4.CreateTranslation(startingCenter - bounds.Center);
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
};
@ -1305,6 +1320,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
MakeLowestFaceFlat(SelectedMeshIndex);
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
};
@ -1337,6 +1353,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
totalTransfrom *= Matrix4X4.CreateTranslation(center);
SelectedMeshTransform *= totalTransfrom;
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
};
@ -1355,6 +1372,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
totalTransfrom *= Matrix4X4.CreateTranslation(center);
SelectedMeshTransform *= totalTransfrom;
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
};
@ -1375,6 +1393,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
SelectedMeshTransform *= totalTransfrom;
PlatingHelper.PlaceMeshOnBed(Meshes, MeshTransforms, SelectedMeshIndex, false);
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
};
@ -1398,6 +1417,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
expandRotateOptions.CheckedStateChanged += new CheckBox.CheckedStateChangedEventHandler(expandRotateOptions_CheckedStateChanged);
expandScaleOptions.CheckedStateChanged += new CheckBox.CheckedStateChangedEventHandler(expandScaleOptions_CheckedStateChanged);
saveAsButton.Click += (sender, e) =>
{
new SaveAsWindow();
};
saveButton.Click += (sender, e) =>
{
MergeAndSavePartsToStl();
@ -1406,6 +1433,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
ActiveTheme.Instance.ThemeChanged.RegisterEvent(Instance_ThemeChanged, ref unregisterEvents);
}
bool partSelectButtonWasClicked = false;
private void MergeAndSavePartsToStl()
{
@ -1609,6 +1637,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// and shift it back so the new center is where the old center was
MeshTransforms[indexToLayFlat] *= Matrix4X4.CreateTranslation(startingCenter - bounds.Center);
PlatingHelper.PlaceMeshOnBed(Meshes, MeshTransforms, SelectedMeshIndex, false);
saveAsButton.Visible = true;
saveButton.Visible = true;
Invalidate();
}

8
StaticData/Translations/Master.txt
View file

@ -1372,3 +1372,11 @@ Translated:Finished Print
English:Done Printing
Translated:Done Printing
English:Save As
Translated:Save As
English:Installed Plugins
Translated:Installed Plugins
English:Select a Design Tool
Translated:Select a Design Tool