Skip to content

v1.0.7 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rebelinux merged 2 commits into from
May 2, 2026
Merged

v1.0.7 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eefd77c
style: standardize formatting of font parameters across multiple func…
rebelinux May 2, 2026
3b0917a
Merge branch 'AsBuiltReport:dev' into dev
rebelinux May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions AsBuiltReport.Diagram/Src/Private/Add-HtmlLabel.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@ function Add-HtmlLabel {
)

$ICON = if ($IconType -eq 'NoIcon') { 'NoIcon' }
elseif ($ImagesObj[$IconType]) { $ImagesObj[$IconType] }
else { 'no_icon.png' }
elseif ($ImagesObj[$IconType]) { $ImagesObj[$IconType] }
else { 'no_icon.png' }

$CalculatedImageSize = $null
if ($ImageSizePercent -lt 100 -and $ICON -ne 'NoIcon') {
Expand All @@ -294,16 +294,16 @@ function Add-HtmlLabel {
}

$fontParams = @{
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontStrikeThrough = $FontStrikeThrough
FontOverline = $FontOverline
FontOverline = $FontOverline
}
$FormattedLabel = Format-HtmlFontProperty -Text $Label @fontParams

Expand All @@ -312,10 +312,10 @@ function Add-HtmlLabel {

# Base table params shared by all branches; TableBackgroundColor is added for non-debug branches only.
$baseTableParams = @{
Port = $Port
TableStyle = $TableStyle
Port = $Port
TableStyle = $TableStyle
TableBorder = $TableBorder
CellBorder = $CellBorder
CellBorder = $CellBorder
CellSpacing = $effectiveCellSpacing
CellPadding = $effectiveCellPadding
}
Expand Down
38 changes: 19 additions & 19 deletions AsBuiltReport.Diagram/Src/Private/Add-HtmlSignatureTable.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,33 +257,33 @@ function Add-HtmlSignatureTable {
$effectiveFontBold = if ($NoFontBold) { $false } else { $FontBold }

$fontParams = @{
FontSize = $FontSize
FontColor = $FontColor
FontBold = $effectiveFontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontSize = $FontSize
FontColor = $FontColor
FontBold = $effectiveFontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontStrikeThrough = $FontStrikeThrough
FontOverline = $FontOverline
FontOverline = $FontOverline
}

$tableParams = @{
Port = $Port
TableStyle = $TableStyle
Port = $Port
TableStyle = $TableStyle
TableBackgroundColor = $TableBackgroundColor
TableBorderColor = $TableBorderColor
TableBorder = $TableBorder
CellBorder = $CellBorder
CellSpacing = $CellSpacing
CellPadding = $CellPadding
TableBorderColor = $TableBorderColor
TableBorder = $TableBorder
CellBorder = $CellBorder
CellSpacing = $CellSpacing
CellPadding = $CellPadding
}

$TR = ($Rows | ForEach-Object {
$FormattedRow = Format-HtmlFontProperty -Text $_ @fontParams
'<TR><TD BGCOLOR="{0}" valign="top" align="{1}" colspan="2">{2}</TD></TR>' -f $CellBackgroundColor, $Align, $FormattedRow
}) -join ''
$FormattedRow = Format-HtmlFontProperty -Text $_ @fontParams
'<TR><TD BGCOLOR="{0}" valign="top" align="{1}" colspan="2">{2}</TD></TR>' -f $CellBackgroundColor, $Align, $FormattedRow
}) -join ''

if ($ICON) {
if ($IconDebug) {
Expand Down
26 changes: 13 additions & 13 deletions AsBuiltReport.Diagram/Src/Private/Add-HtmlSubGraph.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,16 +340,16 @@ function Add-HtmlSubGraph {
}

$fontParams = @{
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontStrikeThrough = $FontStrikeThrough
FontOverline = $FontOverline
FontOverline = $FontOverline
}
$FormattedLabel = Format-HtmlFontProperty @fontParams -Text $Label

Expand Down Expand Up @@ -384,11 +384,11 @@ function Add-HtmlSubGraph {
}

$tableParams = @{
TableStyle = $TableStyle
TableStyle = $TableStyle
TableBackgroundColor = $TableBackgroundColor
CellSpacing = $CellSpacing
CellPadding = $CellPadding
TableRowContent = $TR
CellSpacing = $CellSpacing
CellPadding = $CellPadding
TableRowContent = $TR
}
if ($IconDebug) {
$tableParams.TableBorderColor = 'red'
Expand Down
46 changes: 23 additions & 23 deletions AsBuiltReport.Diagram/Src/Private/Add-HtmlTable.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,16 +415,16 @@ function Add-HtmlTable {
$TD = ''
$TR = ''
$fontParams = @{
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontStrikeThrough = $FontStrikeThrough
FontOverline = $FontOverline
FontOverline = $FontOverline
}
# Create the table and splitting elements based on the ColumnSize value
while ($Number -ne $Group.Count) {
Expand All @@ -440,16 +440,16 @@ function Add-HtmlTable {
# This part set the capability to emulate Graphviz Subgraph
if ($Subgraph) {
$subgraphFontParams = @{
FontSize = $SubgraphLabelFontsize
FontColor = $SubgraphFontColor
FontBold = $SubgraphFontBold
FontItalic = $SubgraphFontItalic
FontUnderline = $SubgraphFontUnderline
FontName = $SubgraphFontName
FontSubscript = $SubgraphFontSubscript
FontSuperscript = $SubgraphFontSuperscript
FontSize = $SubgraphLabelFontsize
FontColor = $SubgraphFontColor
FontBold = $SubgraphFontBold
FontItalic = $SubgraphFontItalic
FontUnderline = $SubgraphFontUnderline
FontName = $SubgraphFontName
FontSubscript = $SubgraphFontSubscript
FontSuperscript = $SubgraphFontSuperscript
FontStrikeThrough = $SubgraphFontStrikeThrough
FontOverline = $SubgraphFontOverline
FontOverline = $SubgraphFontOverline
}
$FormattedName = if ($SubGraphLabel) {
Format-HtmlFontProperty @subgraphFontParams -Text $SubGraphLabel
Expand Down Expand Up @@ -492,12 +492,12 @@ function Add-HtmlTable {
}

$tableParams = @{
TableStyle = $SubgraphTableStyle
TableStyle = $SubgraphTableStyle
TableBackgroundColor = $TableBackgroundColor
CellBorder = $CellBorder
CellSpacing = $CellSpacing
CellPadding = $CellPadding
TableRowContent = $TR
CellBorder = $CellBorder
CellSpacing = $CellSpacing
CellPadding = $CellPadding
TableRowContent = $TR
}
if ($IconDebug) {
$tableParams.TableBorderColor = 'red'
Expand Down
34 changes: 17 additions & 17 deletions AsBuiltReport.Diagram/Src/Private/Add-NodeIcon.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,28 +384,28 @@ function Add-NodeIcon {
}

$fontParams = @{
Text = $LabelName
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
Text = $LabelName
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
Comment on lines +387 to +391
FontUnderline = $FontUnderline
FontName = $FontName
FontSubscript = $FontSubscript
FontSuperscript = $FontSuperscript
FontStrikeThrough = $FontStrikeThrough
FontOverline = $FontOverline
FontOverline = $FontOverline
}
$FormattedName = Format-HtmlFontProperty @fontParams

$tableParams = @{
Port = $Port
TableStyle = $TableStyle
TableBorderColor = $TableBorderColor
TableBorder = $TableBorder
CellBorder = $CellBorder
CellSpacing = $CellSpacing
CellPadding = $CellPadding
Port = $Port
TableStyle = $TableStyle
TableBorderColor = $TableBorderColor
TableBorder = $TableBorder
CellBorder = $CellBorder
CellSpacing = $CellSpacing
CellPadding = $CellPadding
TableBackgroundColor = $TableBackgroundColor
}
if ($IconDebug) {
Expand Down
8 changes: 4 additions & 4 deletions AsBuiltReport.Diagram/Src/Private/Add-NodeImage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ function Add-NodeImage {
$HTML = Format-HtmlTable -TableBackgroundColor '#FFCCCC' -TableBorderColor 'red' -CellBorder 0 -CellSpacing 0 -CellPadding 0 -TableRowContent $TRContent
} else {
$tableParams = @{
TableStyle = $TableBorderStyle
TableBorder = $TableBorder
TableStyle = $TableBorderStyle
TableBorder = $TableBorder
TableBackgroundColor = $TableBackgroundColor
TableBorderColor = $TableBorderColor
CellBorder = 0
TableBorderColor = $TableBorderColor
CellBorder = 0
}
if ($ImageSize) {
$TRContent = '<TR><TD STYLE="{0}" ALIGN="Center" fixedsize="true" width="{1}" height="{2}" colspan="1"><img src="{3}"/></TD></TR>' -f $TableBorderStyle, $ImageSize.Width, $ImageSize.Height, $IconSrc
Expand Down
12 changes: 6 additions & 6 deletions AsBuiltReport.Diagram/Src/Private/Add-NodeText.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@ function Add-NodeText {
}

$fontParams = @{
Text = $Text
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
Text = $Text
FontSize = $FontSize
FontColor = $FontColor
FontBold = $FontBold
FontItalic = $FontItalic
FontUnderline = $FontUnderline
FontName = $FontName
FontName = $FontName
}
$FormattedText = Format-HtmlFontProperty @fontParams

Expand Down
Loading