|
@@ -571,10 +571,10 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
ty1 = ty1 == 2 ? i * tx1 + l : ty1;
|
|
|
tx2 = tx2 == 2 ? w - tx1 : tx2;
|
|
|
ty2 = ty2 == 2 ? h - ty1 : ty2;
|
|
|
- double x1 = System.Math.Round(tx2 / w * 100 * 100) / 100;
|
|
|
- double y1 = System.Math.Round(ty2 / h * 100 * 100) / 100;
|
|
|
- double x2 = System.Math.Round(tx1 / w * 100 * 100) / 100;
|
|
|
- double y2 = System.Math.Round(ty1 / h * 100 * 100) / 100;
|
|
|
+ double x1 = System.Math.Round(tx2 / w * 100 * 100) / 100.0;
|
|
|
+ double y1 = System.Math.Round(ty2 / h * 100 * 100) / 100.0;
|
|
|
+ double x2 = System.Math.Round(tx1 / w * 100 * 100) / 100.0;
|
|
|
+ double y2 = System.Math.Round(ty1 / h * 100 * 100) / 100.0;
|
|
|
return new List<double> { x1, y1, x2, y2 };
|
|
|
}
|
|
|
public static Fill GetPatternFill(XmlNode node, Dictionary<string, string> slideLayoutClrOvride, XmlNode slideMasterContent, XmlNode themeContent)
|
|
@@ -587,7 +587,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
fgclr = ShapeHelper.ColorToning(fgClr.OuterXml, fgclr);
|
|
|
}
|
|
|
|
|
|
- fill.gradColor.Add(fgclr);
|
|
|
+ fill.grad.Add(fgclr);
|
|
|
// 处理背景色
|
|
|
var bgClr = node.GetTextByPath("a:bgClr");
|
|
|
string bgclr = GetSolidFill(bgClr, slideLayoutClrOvride, slideMasterContent, themeContent);
|
|
@@ -598,9 +598,9 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
var prst = node.GetTextByPath("@prst");
|
|
|
if (prst != null)
|
|
|
{
|
|
|
- fill.pattPrst = prst.Value;
|
|
|
+ fill.patt = prst.Value;
|
|
|
}
|
|
|
- fill.gradColor.Add(bgclr);
|
|
|
+ fill.grad.Add(bgclr);
|
|
|
return fill;
|
|
|
}
|
|
|
|
|
@@ -632,7 +632,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
return new Fill()
|
|
|
{
|
|
|
Type = 2,
|
|
|
- gradColor = color_ary,
|
|
|
+ grad = color_ary,
|
|
|
Rot = rot
|
|
|
};
|
|
|
}
|
|
@@ -742,7 +742,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
{
|
|
|
return 0;
|
|
|
}
|
|
|
- return double.Parse(angle.Value) / 60000.00;
|
|
|
+ return double.Parse(angle.Value) / rot60000;
|
|
|
}
|
|
|
|
|
|
public static XmlNode GetNodesTable(XmlNode id, XmlNode idx, XmlNode type, WarpObj warpObj, string LayoutOrMaster)
|
|
@@ -844,7 +844,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
var tint = solidFill.GetTextByPath("a:srgbClr/a:tint/@val");
|
|
|
if (tint != null)
|
|
|
{
|
|
|
- opcity = double.Parse(tint.Value) / 100000;
|
|
|
+ opcity = double.Parse(tint.Value) / 100000.0;
|
|
|
}
|
|
|
}
|
|
|
else if (solidFill.GetTextByPath("a:schemeClr") != null)
|
|
@@ -852,7 +852,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
var tint = solidFill.GetTextByPath("a:schemeClr/a:tint/@val");
|
|
|
if (tint != null)
|
|
|
{
|
|
|
- opcity = double.Parse(tint.Value) / 100000;
|
|
|
+ opcity = double.Parse(tint.Value) / 100000.0;
|
|
|
}
|
|
|
}
|
|
|
else if (solidFill.GetTextByPath("a:scrgbClr") != null)
|
|
@@ -860,7 +860,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
var tint = solidFill.GetTextByPath("a:scrgbClr/a:tint/@val");
|
|
|
if (tint != null)
|
|
|
{
|
|
|
- opcity = double.Parse(tint.Value) / 100000;
|
|
|
+ opcity = double.Parse(tint.Value) / 100000.0;
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -869,7 +869,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
var tint = solidFill.GetTextByPath("a:prstClr/a:tint/@val");
|
|
|
if (tint != null)
|
|
|
{
|
|
|
- opcity = double.Parse(tint.Value) / 100000;
|
|
|
+ opcity = double.Parse(tint.Value) / 100000.0;
|
|
|
}
|
|
|
}
|
|
|
else if (solidFill.GetTextByPath("a:hslClr") != null)
|
|
@@ -877,7 +877,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
var tint = solidFill.GetTextByPath("a:hslClr/a:tint/@val");
|
|
|
if (tint != null)
|
|
|
{
|
|
|
- opcity = double.Parse(tint.Value) / 100000;
|
|
|
+ opcity = double.Parse(tint.Value) / 100000.0;
|
|
|
}
|
|
|
}
|
|
|
else if (solidFill.GetTextByPath("a:sysClr") != null)
|
|
@@ -885,7 +885,7 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
|
|
|
var tint = solidFill.GetTextByPath("a:sysClr/a:tint/@val");
|
|
|
if (tint != null)
|
|
|
{
|
|
|
- opcity = double.Parse(tint.Value) / 100000;
|
|
|
+ opcity = double.Parse(tint.Value) / 100000.0;
|
|
|
}
|
|
|
}
|
|
|
return opcity;
|