diff --git a/Common/Common.csproj b/Common/Common.csproj index b5f5063c5..08fd0a62e 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -69,6 +69,9 @@ + + Component + diff --git a/Results/Output/Printers/PrintersCommon.cs b/Common/Printers/PrintersCommon.cs similarity index 97% rename from Results/Output/Printers/PrintersCommon.cs rename to Common/Printers/PrintersCommon.cs index ead45088d..b57fe9aaa 100644 --- a/Results/Output/Printers/PrintersCommon.cs +++ b/Common/Printers/PrintersCommon.cs @@ -2,10 +2,8 @@ using System.Collections.Generic; using System.Drawing; using System.Drawing.Printing; -using Common; -using Config.Entities; -namespace Results.Output.Printers +namespace Common.Printers { public class PrintersCommon : PrintDocument { diff --git a/Results/Output/Printers/Label/LabelPrintDocument.cs b/Results/Output/Printers/Label/LabelPrintDocument.cs index d7a9af3f3..cb307aa90 100644 --- a/Results/Output/Printers/Label/LabelPrintDocument.cs +++ b/Results/Output/Printers/Label/LabelPrintDocument.cs @@ -14,7 +14,7 @@ using GenCode128; namespace Results.Output.Printers.Label { - public class LabelPrintDocument : PrintersCommon + public class LabelPrintDocument : Common.Printers.PrintersCommon { static QrEncoder encoder = new QrEncoder(); diff --git a/Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs b/Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs index 3a090ab11..42c635527 100644 --- a/Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs +++ b/Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs @@ -14,7 +14,7 @@ using GenCode128; namespace Results.Output.Printers.MultiLabel { - public class MultiLabelPrintDocument : PrintersCommon + public class MultiLabelPrintDocument : Common.Printers.PrintersCommon { static QrEncoder encoder = new QrEncoder(); diff --git a/Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs b/Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs index 3d31d616b..8269b71b4 100644 --- a/Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs +++ b/Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs @@ -11,7 +11,7 @@ using Results.Resources; namespace Results.Output.Printers.OnePerBatch { - public class OnePerBatchPrintDocument : PrintersCommon + public class OnePerBatchPrintDocument : Common.Printers.PrintersCommon { const float GapBetweenTableColumns = 10; const float GapBetweenCommonColumns = 10; diff --git a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs index 9cb01273d..12b02fe25 100644 --- a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs +++ b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs @@ -14,7 +14,7 @@ using Results.Resources; namespace Results.Output.Printers.OnePerMeter { - public class OnePerMeterPrintDocument : PrintersCommon + public class OnePerMeterPrintDocument : Common.Printers.PrintersCommon { const float GapBetweenTableColumns = 10; const float GapBetweenCommonColumns = 10; diff --git a/Results/Output/Table.cs b/Results/Output/Table.cs index 5bdf1cb5a..c48a032e4 100644 --- a/Results/Output/Table.cs +++ b/Results/Output/Table.cs @@ -97,7 +97,7 @@ namespace Results.Output else { bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount); - SizeF size = Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font); + SizeF size = Common.Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font); if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width; if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height; } @@ -160,7 +160,7 @@ namespace Results.Output { /// In not a separator line bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount); - SizeF size = Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font); + SizeF size = Common.Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font); if ((Style.ColumnWidths != null) && (Style.ColumnWidths.Length > colIx)) { size.Width = Style.ColumnWidths[colIx]; /// Override measurement if column width is defined @@ -247,7 +247,7 @@ namespace Results.Output for (int colIndex = 0; colIndex < tblColumnsCount; colIndex++) { bool isHeader = (colIndex < Style.LeftHeadersCount) || (rowIndex < Style.TopHeadersCount); - Printers.PrintersCommon.PrintAt(e, oneTableRow[colIndex], + Common.Printers.PrintersCommon.PrintAt(e, oneTableRow[colIndex], isHeader ? Style.HeaderFont : Style.Font, columnPos[colIndex], rowPos[rowIndex], diff --git a/Results/Results.csproj b/Results/Results.csproj index 8d70f8a1c..66b13caf0 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -163,9 +163,6 @@ Component - - Component - Component