70 color options update

.github/workflows/pr-validation-main.yml

@@ -8,22 +8,7 @@ on:
     branches:
       - main
 jobs:
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup .NET 7
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "7.0"
-      - name: Test Runner
-        working-directory: Tests
-        run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura /p:CoverletOutput=../TestResults/cobertura.xml
-      - name: Publish Coverage
-        working-directory: TestResults
-        run: export CODACY_PROJECT_TOKEN=${{secrets.CODACY_PROJECT_TOKEN}} && bash <(curl -Ls https://coverage.codacy.com/get.sh)
   build:
-    needs: coverage
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -37,3 +22,15 @@ jobs:
         run: dotnet build --no-restore -c Release
       - name: Pack Project DLL
         run: dotnet pack -c Release -o nupkgs
+  coverage:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET 7
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "7.0"
+      - name: Test Runner
+        working-directory: Tests
+        run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura /p:CoverletOutput=../TestResults/cobertura.xml

Directory.Build.props

@@ -12,7 +12,7 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <OutputPath>..\bin\</OutputPath>
         <Authors>DraviaVemal</Authors>
-        <Version>2.8.0-Alpha.2</Version>
+        <Version>2.8.0-Alpha.3</Version>
         <Company>DraviaVemal</Company>
         <Copyright>Copyright (c) 2023 DraviaVemal
             Permission is hereby granted, free of charge, to any person obtaining a copy of this

Global/Components/2007/CommonProperties.cs

@@ -436,7 +436,7 @@ protected static OpenXmlElement CreateColorComponent<ColorOption>(ColorOptionMod
 		/// <returns></returns>
 		protected C.ShapeProperties CreateChartShapeProperties()
 		{
-			return CreateChartShapeProperties(new ShapePropertiesModel<NoOptions, NoOptions>());
+			return CreateChartShapeProperties(new ShapePropertiesModel<NoFillOptions, NoFillOptions>());
 		}
 		/// <summary>
 		/// Create Shape Properties

Global/Components/Charts/2007/ChartBase.cs

@@ -27,7 +27,7 @@ namespace OpenXMLOffice.Global_2007
 		/// </summary>
 		internal ChartSetting<ApplicationSpecificSetting> chartSetting;
 		private readonly C.Chart chart;
-		private readonly C.ChartSpace openXMLChartSpace;
+		private readonly C.ChartSpace documentChartSpace;
 		/// <summary>
 		/// Chart base class constructor restricted only for inheritance use
 		/// </summary>
@@ -38,7 +38,7 @@ internal ChartBase(ChartSetting<ApplicationSpecificSetting> chartSetting)
 			CategoryAxisId = chartSetting.categoryAxisId ?? CategoryAxisId;
 			ValueAxisId = chartSetting.valueAxisId ?? ValueAxisId;
 			this.chartSetting = chartSetting;
-			openXMLChartSpace = CreateChartSpace();
+			documentChartSpace = CreateChartSpace();
 			chart = CreateChart();
 			GetChartSpace().Append(chart);
 		}
@@ -47,7 +47,7 @@ internal ChartBase(ChartSetting<ApplicationSpecificSetting> chartSetting)
 		/// </summary>
 		public virtual C.ChartSpace GetChartSpace()
 		{
-			return openXMLChartSpace;
+			return documentChartSpace;
 		}
 		/// <summary>
 		/// Create Bubble Size Axis for the chart
@@ -82,7 +82,7 @@ internal C.TrendlineLabel CreateTrendLineLabel()
 			{
 				NumberingFormat = new C.NumberingFormat() { FormatCode = "General", SourceLinked = false },
 			};
-			trendlineLabel.Append(CreateChartShapeProperties(new ShapePropertiesModel<NoOptions, NoOptions>()));
+			trendlineLabel.Append(CreateChartShapeProperties(new ShapePropertiesModel<NoFillOptions, NoFillOptions>()));
 			trendlineLabel.Append(CreateChartTextProperties(new ChartTextPropertiesModel<SolidOptions>()
 			{
 				drawingBodyProperties = new DrawingBodyPropertiesModel()
@@ -336,7 +336,7 @@ internal OpenXmlElement CreateAxis<AxisDirection, AxisType>(AxisSetting<AxisDire
 				axis.Append(new C.TickLabelPosition { Val = AxisOptions<ValueAxis>.GetLabelAxesPosition(axisSetting.axisOptions.chartAxesOptions.axesLabelPosition) });
 				if(axisSetting.axisOptions.axisLineColor != null)
 				{
-					axis.Append(new List<OpenXmlElement> { CreateChartShapeProperties(new ShapePropertiesModel<SolidOptions, NoOptions>()
+					axis.Append(new List<OpenXmlElement> { CreateChartShapeProperties(new ShapePropertiesModel<SolidOptions, NoFillOptions>()
 					{
 						lineColor = new OutlineModel<SolidOptions>()
 						{
@@ -586,7 +586,7 @@ private C.BackWall CreateBackWall()
 			return new C.BackWall()
 			{
 				Thickness = new C.Thickness() { Val = 0 },
-				ShapeProperties = CreateChartShapeProperties(new ShapePropertiesModel<NoOptions, NoOptions>()
+				ShapeProperties = CreateChartShapeProperties(new ShapePropertiesModel<NoFillOptions, NoFillOptions>()
 				{
 					shapeProperty3D = new ShapeProperty3D()
 				}),
@@ -597,7 +597,7 @@ private C.SideWall CreateSideWall()
 			return new C.SideWall()
 			{
 				Thickness = new C.Thickness() { Val = 0 },
-				ShapeProperties = CreateChartShapeProperties(new ShapePropertiesModel<NoOptions, NoOptions>()
+				ShapeProperties = CreateChartShapeProperties(new ShapePropertiesModel<NoFillOptions, NoFillOptions>()
 				{
 					shapeProperty3D = new ShapeProperty3D()
 				}),
@@ -608,7 +608,7 @@ private C.Floor CreateFloor()
 			return new C.Floor()
 			{
 				Thickness = new C.Thickness() { Val = 0 },
-				ShapeProperties = CreateChartShapeProperties(new ShapePropertiesModel<NoOptions, NoOptions>()
+				ShapeProperties = CreateChartShapeProperties(new ShapePropertiesModel<NoFillOptions, NoFillOptions>()
 				{
 					shapeProperty3D = new ShapeProperty3D()
 				}),
@@ -746,7 +746,7 @@ protected static A.Field CreateField(string type, string text)
 		}
 		private C.MajorGridlines CreateMajorGridLine()
 		{
-			return new C.MajorGridlines(CreateChartShapeProperties(new ShapePropertiesModel<SolidOptions, NoOptions>()
+			return new C.MajorGridlines(CreateChartShapeProperties(new ShapePropertiesModel<SolidOptions, NoFillOptions>()
 			{
 				lineColor = new OutlineModel<SolidOptions>()
 				{
@@ -771,7 +771,7 @@ private C.MajorGridlines CreateMajorGridLine()
 		}
 		private C.MinorGridlines CreateMinorGridLine()
 		{
-			return new C.MinorGridlines(CreateChartShapeProperties(new ShapePropertiesModel<SolidOptions, NoOptions>()
+			return new C.MinorGridlines(CreateChartShapeProperties(new ShapePropertiesModel<SolidOptions, NoFillOptions>()
 			{
 				lineColor = new OutlineModel<SolidOptions>()
 				{
@@ -870,7 +870,7 @@ internal C.Trendline CreateTrendLine(TrendLineModel trendLineModel)
 			{
 				TrendlineName = new C.TrendlineName(trendLineModel.trendLineName)
 			};
-			trendLine.Append(CreateChartShapeProperties(new ShapePropertiesModel<SolidOptions, NoOptions>()
+			trendLine.Append(CreateChartShapeProperties(new ShapePropertiesModel<SolidOptions, NoFillOptions>()
 			{
 				lineColor = new OutlineModel<SolidOptions>()
 				{

Global/Components/Charts/2007/LineChart.cs

@@ -154,7 +154,7 @@ private C.LineChartSeries CreateLineChartSeries(int seriesIndex, ChartDataGroupi
 					outlineModel.lineColor.colorOption.transparency = (int)lineChartLineFormat.transparency;
 				}
 			}
-			ShapePropertiesModel<SolidOptions, NoOptions> shapePropertiesModel = new ShapePropertiesModel<SolidOptions, NoOptions>()
+			ShapePropertiesModel<SolidOptions, NoFillOptions> shapePropertiesModel = new ShapePropertiesModel<SolidOptions, NoFillOptions>()
 			{
 				lineColor = outlineModel,
 			};
@@ -205,7 +205,7 @@ private C.LineChartSeries CreateLineChartSeries(int seriesIndex, ChartDataGroupi
 			}
 			else
 			{
-				MarkerModel<NoOptions, NoOptions> marketModel = new MarkerModel<NoOptions, NoOptions>()
+				MarkerModel<NoFillOptions, NoFillOptions> marketModel = new MarkerModel<NoFillOptions, NoFillOptions>()
 				{
 					markerShapeType = MarkerShapeTypes.NONE,
 				};

Global/Components/Charts/2007/ScatterChart.cs

@@ -224,7 +224,7 @@ private C.ScatterChartSeries CreateScatterChartSeries(int seriesIndex, ChartData
 			}
 			else
 			{
-				MarkerModel<NoOptions, NoOptions> markerModel = new MarkerModel<NoOptions, NoOptions>();
+				MarkerModel<NoFillOptions, NoFillOptions> markerModel = new MarkerModel<NoFillOptions, NoFillOptions>();
 				if (scatterChartSetting.scatterChartType != ScatterChartTypes.BUBBLE && scatterChartSetting.scatterChartType != ScatterChartTypes.BUBBLE_3D)
 				{
 					series.Append(CreateMarker(markerModel));

Global/Models/2007/ChartBaseModel.cs

@@ -659,21 +659,78 @@
 	public class PresentationSetting : ISizeAndPosition
 	{
 		/// <summary>
-		/// Chart Height in EMU
+		/// Value in EMU
 		/// </summary>
-		public uint height = 6858000;
+		private int _height = 6858000;
+		private int _width = 12192000;
 		/// <summary>
-		/// Chart Width in EMU
+		/// Value in EMU
 		/// </summary>
-		public uint width = 12192000;
+		private int _y = 0;
 		/// <summary>
-		/// Chart X Position in EMU
+		/// Value in EMU
 		/// </summary>
-		public uint x = 0;
+		private int _x = 0;
 		/// <summary>
-		/// Chart Y Position in EMU
+		/// Chart Height in Px
 		/// </summary>
-		public uint y = 0;
+		public int Height
+		{
+			get
+			{
+				return _height;
+			}
+			set
+			{
+				// _height = (int)ConverterUtils.PixelsToEmu(value);
+				_height = value;
+			}
+		}
+		/// <summary>
+		/// Chart Width in Px
+		/// </summary>
+		public int Width
+		{
+			get
+			{
+				return _width;
+			}
+			set
+			{
+				// _width = (int)ConverterUtils.PixelsToEmu(value);
+				_width = value;
+			}
+		}
+		/// <summary>
+		/// Chart X Position in Px
+		/// </summary>
+		public int X
+		{
+			get
+			{
+				return _x;
+			}
+			set
+			{
+				// _x = (int)ConverterUtils.PixelsToEmu(value);
+				_x = value;
+			}
+		}
+		/// <summary>
+		/// Chart Y Position in Px
+		/// </summary>
+		public int Y
+		{
+			get
+			{
+				return _y;
+			}
+			set
+			{
+				// _y = (int)ConverterUtils.PixelsToEmu(value);
+				_y = value;
+			}
+		}
 	}
 	/// <summary>
 	///

Global/Models/2007/CommonPropertiesModel.cs

@@ -503,11 +503,11 @@ public class EffectListModel
 	/// </summary>
 	public interface IColorOptions { }
 	/// <summary>
-	///
+	///	This will update NoFill Color as result
 	/// </summary>
-	public class NoOptions : IColorOptions { }
+	public class NoFillOptions : IColorOptions { }
 	/// <summary>
-	///
+	///	Solid Fill options
 	/// </summary>
 	public class SolidOptions : IColorOptions
 	{