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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Browse source
This commit is contained in:
larsbrubaker 2014-03-24 12:21:47 -07:00
commit 98a53f312c
21 changed files with 208 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SlicerConfiguration/ActiveSliceSettings.cs
View file

@ -317,7 +317,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
get { return ParseDouble(GetActiveValue("nozzle_diameter")); }
}
public double FillamentDiameter
public double FilamentDiameter
{
get { return ParseDouble(GetActiveValue("filament_diameter")); }
}
@ -609,7 +609,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
string error = "The Min Fan Speed can only go as high as 100%.";
string details = string.Format("It is currently set to {0}.", MinFanSpeed);
string location = "Location: 'Advanced Controls' -> 'Slice Settings' -> 'Fillament' -> 'Cooling' (show all settings)";
string location = "Location: 'Advanced Controls' -> 'Slice Settings' -> 'Filament' -> 'Cooling' (show all settings)";
StyledMessageBox.ShowMessageBox(string.Format("{0}\n\n{1}\n\n{2}", error, details, location), "Slice Error");
return false;
}
@ -618,7 +618,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
string error = "The Max Fan Speed can only go as high as 100%.";
string details = string.Format("It is currently set to {0}.", MaxFanSpeed);
string location = "Location: 'Advanced Controls' -> 'Slice Settings' -> 'Fillament' -> 'Cooling' (show all settings)";
string location = "Location: 'Advanced Controls' -> 'Slice Settings' -> 'Filament' -> 'Cooling' (show all settings)";
StyledMessageBox.ShowMessageBox(string.Format("{0}\n\n{1}\n\n{2}", error, details, location), "Slice Error");
return false;
}

4
SlicerConfiguration/SettingsControlBar.cs
View file

@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
settingsStatusLabelContainer.VAnchor |= VAnchor.ParentTop;
settingsStatusLabelContainer.Margin = new BorderDouble(0);
{
string activeSettingsLabelText = LocalizedString.Get ("Active Settings");
string activeSettingsLabelText = LocalizedString.Get ("Active Settings").ToUpper();
string activeSettingsLabelTextFull = string.Format ("{0}:", activeSettingsLabelText);
@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
sliceEngineContainer.Margin = new BorderDouble(0,0,10,0);
sliceEngineContainer.VAnchor |= VAnchor.ParentTop;
{
string sliceEngineLabelText = LocalizedString.Get ("Slice Engine");
string sliceEngineLabelText = LocalizedString.Get("Slice Engine").ToUpper();
string sliceEngineLabelTextFull = string.Format ("{0}:", sliceEngineLabelText);
TextWidget sliceEngineLabel = new TextWidget(string.Format(sliceEngineLabelTextFull), pointSize: 10);
sliceEngineLabel.Margin = new BorderDouble(0);

8
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -154,7 +154,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
pageTopToBottomLayout.AddChild(noConnectionMessageContainer);
categoryTabs = new TabControl();
categoryTabs.TabBar.BorderColor = RGBA_Bytes.White;
categoryTabs.TabBar.BorderColor = ActiveTheme.Instance.PrimaryTextColor;
categoryTabs.Margin = new BorderDouble(top: 8);
categoryTabs.AnchorAll();
List<TabBar> sideTabBarsListForLayout = new List<TabBar>();
@ -210,7 +210,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// add in the ability to turn on and off all details settings
{
showAllDetails.TextColor = RGBA_Bytes.White;
showAllDetails.TextColor = ActiveTheme.Instance.PrimaryTextColor;
showAllDetails.Margin = new BorderDouble(right: 8);
showAllDetails.VAnchor = VAnchor.ParentCenter;
showAllDetails.Cursor = Cursors.Hand;
@ -221,7 +221,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// add in the ability to turn on and off help text
{
showHelpBox.TextColor = RGBA_Bytes.White;
showHelpBox.TextColor = ActiveTheme.Instance.PrimaryTextColor;
showHelpBox.Margin = new BorderDouble(right: 3);
showHelpBox.VAnchor = VAnchor.ParentCenter;
showHelpBox.Cursor = Cursors.Hand;
@ -304,7 +304,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
TabControl groupTabs = new TabControl(Orientation.Vertical);
groupTabs.Margin = new BorderDouble(0, 0, 0, 5);
groupTabs.TabBar.BorderColor = RGBA_Bytes.White;
groupTabs.TabBar.BorderColor = ActiveTheme.Instance.PrimaryTextColor;
foreach (OrganizerGroup group in category.GroupsList)
{
tabIndexForItem = 0;

2
SlicerConfiguration/SlicerMapping/EngineMappingCura.cs
View file

@ -389,7 +389,7 @@ enableOozeShield = 0;
{
double lengthToExtrudeMm = double.Parse(base.MappedValue);
// we need to convert mm of filament to mm of extrusion path
double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.FillamentDiameter * MathHelper.Tau * lengthToExtrudeMm;
double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.FilamentDiameter * MathHelper.Tau * lengthToExtrudeMm;
double extrusionSquareSize = ActiveSliceSettings.Instance.FirstLayerHeight * ActiveSliceSettings.Instance.NozzleDiameter;
double lineLength = amountOfFilamentCubicMms / extrusionSquareSize;

2
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -451,7 +451,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
double lengthToExtrudeMm = double.Parse(base.MappedValue);
// we need to convert mm of filament to mm of extrusion path
double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.FillamentDiameter * MathHelper.Tau * lengthToExtrudeMm;
double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.FilamentDiameter * MathHelper.Tau * lengthToExtrudeMm;
double extrusionSquareSize = ActiveSliceSettings.Instance.FirstLayerHeight * ActiveSliceSettings.Instance.NozzleDiameter;
double lineLength = amountOfFilamentCubicMms / extrusionSquareSize;

2
SlicerConfiguration/SlicingQueue.cs
View file

@ -237,7 +237,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
#if DEBUG
if (ActivePrinterProfile.Instance.ActiveSliceEngineType == ActivePrinterProfile.SlicingEngineTypes.MatterSlice)
{
MatterSlice.MatterSlice.ProcessArgs(slicerProcess.StartInfo.Arguments);
//MatterSlice.MatterSlice.ProcessArgs(slicerProcess.StartInfo.Arguments);
}
else
#endif