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

This commit is contained in:
gregory-diaz 2014-03-12 15:14:32 -07:00
commit f33098043a

View file

@ -326,17 +326,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
string filamentVolumeLblFull = string.Format("{0}:", filamentVolumeLbl);
modelInfoContainer.AddChild(new TextWidget(filamentVolumeLblFull, textColor: RGBA_Bytes.White));
{
var density = 1.0;
string filamentType = "PLA";
if(filamentType == "ABS")
{
density = 1.04;
}
else if(filamentType == "PLA")
{
density = 1.24;
}
double filamentMm3 = gcodeViewWidget.LoadedGCode.GetFilamentCubicMm(ActiveSliceSettings.Instance.FillamentDiameter);
GuiWidget estimatedPrintTime = new TextWidget(string.Format("{0:0.00} cm3", filamentMm3/1000), textColor: RGBA_Bytes.White, pointSize: 10);