v1.0.8

.github/workflows/Pester.yml

@@ -2,9 +2,9 @@ name: Pester Tests
 
 on:
     push:
-        branches: [ "dev", "main" ]
+        branches: ["dev", "main"]
     pull_request:
-        branches: [ "dev" ]
+        branches: ["dev"]
     workflow_dispatch:
 
 jobs:
@@ -13,8 +13,8 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ windows-latest, ubuntu-latest, macos-latest ]
-                shell: [ pwsh, powershell ]
+                os: [windows-latest, ubuntu-latest, macos-latest]
+                shell: [pwsh, powershell]
                 exclude:
                     - os: ubuntu-latest
                       shell: powershell
@@ -42,7 +42,8 @@ jobs:
               run: dotnet publish ./Sources/Diagrammer -c Release
               if: matrix.shell == 'pwsh'
             - name: Copy the library PWSH
-              run: Copy-Item -Path ./Sources/Diagrammer/bin/Release/net8.0/publish/*
+              run:
+                  Copy-Item -Path ./Sources/Diagrammer/bin/Release/net8.0/publish/*
                   -Destination ./AsBuiltReport.Diagram/Src/Bin/Assemblies/net80
                   -Recurse
               if: matrix.shell == 'pwsh'
@@ -51,7 +52,8 @@ jobs:
               run: dotnet publish ./Sources/DiaConvertImageToPDF -c Release
               if: matrix.os == 'windows-latest' && matrix.shell == 'powershell'
             - name: Copy the library for Windows PowerShell
-              run: Copy-Item -Path ./Sources/DiaConvertImageToPDF/bin/Release/net48/publish/*
+              run:
+                  Copy-Item -Path ./Sources/DiaConvertImageToPDF/bin/Release/net48/publish/*
                   -Destination ./AsBuiltReport.Diagram/Src/Bin/Assemblies/net48
                   -Recurse
               if: matrix.os == 'windows-latest' && matrix.shell == 'powershell'

AsBuiltReport.Diagram/AsBuiltReport.Diagram.psd1

@@ -12,7 +12,7 @@
     RootModule = 'AsBuiltReport.Diagram.psm1'
 
     # Version number of this module.
-    ModuleVersion = '1.0.7'
+    ModuleVersion = '1.0.8'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

AsBuiltReport.Diagram/Src/Private/Add-HtmlNodeTable.ps1

@@ -120,6 +120,12 @@ function Add-HtmlNodeTable {
     .PARAMETER SubgraphIconHeight
         Allow to set a subgraph icon height.
 
+    .PARAMETER IconWidth
+        Allow to set the icon width. When combined with IconHeight, the icon's table cell is fixed to that size and the image is scaled to fit.
+
+    .PARAMETER IconHeight
+        Allow to set the icon height. When combined with IconWidth, the icon's table cell is fixed to that size and the image is scaled to fit.
+
     .PARAMETER TableBackgroundColor
         Allow to set a table background color (Hex format EX: #FFFFFF).
 
@@ -400,6 +406,18 @@ function Add-HtmlNodeTable {
         )]
         [string] $SubgraphIconHeight,
 
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Allow to set the icon width'
+        )]
+        [string] $IconWidth,
+
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Allow to set the icon height'
+        )]
+        [string] $IconHeight,
+
         [Parameter(
             Mandatory = $false,
             HelpMessage = 'Allow to set a table background color'
@@ -634,16 +652,17 @@ function Add-HtmlNodeTable {
                 }
             }
         } else {
+            $IconSizeAttr = if ($IconWidth -and $IconHeight) { ' fixedsize="true" width="{0}" height="{1}"' -f $IconWidth, $IconHeight } else { '' }
             if ($MultiIcon) {
                 while ($Number -ne $Group.Count) {
                     if ($Icon.Count -gt 1) {
                         foreach ($Element in $Group[$Number]) {
-                            $TDICON += '<TD ALIGN="{0}" colspan="1"><img src="{1}"/></TD>' -f $Align, $Icon[$iconNumber]
+                            $TDICON += '<TD ALIGN="{0}" colspan="1"{1}><img src="{2}"/></TD>' -f $Align, $IconSizeAttr, $Icon[$iconNumber]
                             $iconNumber++
                         }
                     } else {
                         foreach ($Element in $Group[$Number]) {
-                            $TDICON += '<TD ALIGN="{0}" colspan="1"><img src="{1}"/></TD>' -f $Align, $Icon
+                            $TDICON += '<TD ALIGN="{0}" colspan="1"{1}><img src="{2}"/></TD>' -f $Align, $IconSizeAttr, $Icon
                         }
                     }
                     $TR += '<TR>{0}</TR>' -f $TDICON
@@ -708,7 +727,7 @@ function Add-HtmlNodeTable {
             } else {
 
                 $TDICONMatch = if ($Icon.Count -eq 1) { $Icon } else { $Icon[0] }
-                $TDICON += '<TD ALIGN="{0}" colspan="{1}"><img src="{2}"/></TD>' -f $Align, $inputObject.Count, $TDICONMatch
+                $TDICON += '<TD ALIGN="{0}" colspan="{1}"{2}><img src="{3}"/></TD>' -f $Align, $inputObject.Count, $IconSizeAttr, $TDICONMatch
 
                 $TR += '<TR>{0}</TR>' -f $TDICON
 

AsBuiltReport.Diagram/Src/Private/Get-AbrNodeIP.ps1

@@ -26,17 +26,21 @@ function Get-AbrNodeIP {
     )
     process {
         try {
-            try {
-                if ('InterNetwork' -in [System.Net.Dns]::GetHostAddresses($Hostname).AddressFamily) {
-                    $IPADDR = ([System.Net.Dns]::GetHostAddresses($Hostname) | Where-Object { $_.AddressFamily -eq 'InterNetwork' })[0].IPAddressToString
-                } elseif ('InterNetworkV6' -in [System.Net.Dns]::GetHostAddresses($Hostname).AddressFamily) {
-                    $IPADDR = ([System.Net.Dns]::GetHostAddresses($Hostname) | Where-Object { $_.AddressFamily -eq 'InterNetworkV6' })[0].IPAddressToString
-                } else {
+            if ([string]::IsNullOrEmpty($Hostname)) {
+                $IPADDR = $Null
+            } else {
+                try {
+                    if ('InterNetwork' -in [System.Net.Dns]::GetHostAddresses($Hostname).AddressFamily) {
+                        $IPADDR = ([System.Net.Dns]::GetHostAddresses($Hostname) | Where-Object { $_.AddressFamily -eq 'InterNetwork' })[0].IPAddressToString
+                    } elseif ('InterNetworkV6' -in [System.Net.Dns]::GetHostAddresses($Hostname).AddressFamily) {
+                        $IPADDR = ([System.Net.Dns]::GetHostAddresses($Hostname) | Where-Object { $_.AddressFamily -eq 'InterNetworkV6' })[0].IPAddressToString
+                    } else {
+                        $IPADDR = $Null
+                    }
+                } catch {
+                    Write-Verbose -Message "Unable to resolve Hostname Address: $Hostname"
                     $IPADDR = $Null
                 }
-            } catch {
-                Write-Verbose -Message "Unable to resolve Hostname Address: $Hostname"
-                $IPADDR = $Null
             }
             $NodeIP = switch ([string]::IsNullOrEmpty($IPADDR)) {
                 $true { 'Unknown' }

AsBuiltReport.Diagram/Src/Public/New-AbrDiagram.ps1

@@ -72,6 +72,9 @@
     .PARAMETER SignatureLogoName
         Name (key in $ImagesObj) to use as the signature logo.
 
+    .PARAMETER SignatureTableBorderColor
+        Border color for the signature table (RGB hex or color name). Default: '#000000'.
+
     .PARAMETER Logo
         Path to a custom main diagram logo file.
 
@@ -111,6 +114,9 @@
     .PARAMETER MainDiagramLabel
         Main label/title displayed at the top of the diagram.
 
+    .PARAMETER MainDiagramLabelTableBackgroundColor
+        Main label/title displayed at the top of the diagram.
+
     .PARAMETER MainDiagramLabelFontsize
         Font size for the main diagram label. Default: 24.
 
@@ -123,6 +129,9 @@
     .PARAMETER MainGraphAttributes
         Hashtable of graph attributes to override or augment defaults (examples: fontname, fontcolor, imagepath, style, nodesep, ranksep, bgcolor).
 
+    .PARAMETER Dpi
+        Raster output resolution in dots per inch for PNG/JPG formats (Ex: 300). Default: 96 (Graphviz default).
+
     .PARAMETER WaterMarkColor
         Color used for watermark text. Default: 'DarkGray'.
 
@@ -338,6 +347,20 @@
         )]
         [string] $SignatureLogoName,
 
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Please provide the signature table border color in RGB format (Ex: #FFFFFF) or color string'
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string] $SignatureTableBorderColor = '#000000',
+
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Please provide the signature table border color in RGB format (Ex: #FFFFFF) or color string'
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string] $SignatureTableBackgroundColor = '#000000',
+
         [Parameter(
             Mandatory = $false,
             HelpMessage = 'Please provide the path to the custom logo'
@@ -427,6 +450,12 @@
         )]
         [string] $MainDiagramLabel,
 
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Set the Main Label Table Background color used at the top of the diagram'
+        )]
+        [string] $MainDiagramLabelTableBackgroundColor = '#ffffff',
+
         [Parameter(
             Mandatory = $false,
             HelpMessage = 'Set the Main Label font size used at the top of the diagram'
@@ -488,7 +517,14 @@
             HelpMessage = 'Set the image size in percent (100% is default)'
         )]
         [ValidateRange(1, 100)]
-        [int] $MainGraphLogoSizePercent = 100
+        [int] $MainGraphLogoSizePercent = 100,
+
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Allow to set the raster output resolution in dots per inch (Ex: 300). Default: 96 (Graphviz default)'
+        )]
+        [ValidateRange(72, 600)]
+        [int] $Dpi
     )
 
     begin {
@@ -567,6 +603,10 @@
         if ($MainGraphSize) {
             $MainGraphAttributes['size'] = $MainGraphSize
         }
+
+        if ($Dpi) {
+            $MainGraphAttributes['dpi'] = $Dpi
+        }
     }
 
     process {
@@ -599,9 +639,9 @@
             if ($Signature) {
                 Write-Verbose -Message 'Generating diagram signature'
                 if ($CustomSignatureLogo) {
-                    $Signature = (Add-HtmlSignatureTable -ImagesObj $ImagesObj -Rows "Author: $($AuthorName)", "Company: $($CompanyName)" -TableBorder 2 -CellBorder 0 -Align 'left' -Logo $CustomSignatureLogo -IconDebug $IconDebug)
+                    $Signature = (Add-HtmlSignatureTable -ImagesObj $ImagesObj -Rows "Author: $($AuthorName)", "Company: $($CompanyName)" -TableBorder 2 -CellBorder 0 -Align 'left' -Logo $CustomSignatureLogo -IconDebug $IconDebug -TableBorderColor $SignatureTableBorderColor -TableBackgroundColor $SignatureTableBackgroundColor -CellBackgroundColor $SignatureTableBackgroundColor -FontColor $Fontcolor)
                 } else {
-                    $Signature = (Add-HtmlSignatureTable -ImagesObj $ImagesObj -Rows "Author: $($AuthorName)", "Company: $($CompanyName)" -TableBorder 2 -CellBorder 0 -Align 'left' -Logo 'Logo_Footer' -IconDebug $IconDebug)
+                    $Signature = (Add-HtmlSignatureTable -ImagesObj $ImagesObj -Rows "Author: $($AuthorName)", "Company: $($CompanyName)" -TableBorder 2 -CellBorder 0 -Align 'left' -Logo 'Logo_Footer' -IconDebug $IconDebug -TableBorderColor $SignatureTableBorderColor -TableBackgroundColor $SignatureTableBackgroundColor -CellBackgroundColor $SignatureTableBackgroundColor -FontColor $Fontcolor)
                 }
             } else {
                 Write-Verbose -Message 'No diagram signature specified'
@@ -622,7 +662,7 @@
                 if ($DisableMainDiagramLogo) {
                     $FormatedMainLogo = ''
                 } else {
-                    $FormatedMainLogo = (Add-HtmlLabel -ImagesObj $ImagesObj -Label $MainDiagramLabel -IconType $CustomLogo -IconDebug $IconDebug -ImageSizePercent $MainGraphLogoSizePercent -Fontsize $MainDiagramLabelFontsize -FontColor $MainDiagramLabelFontColor -FontName $MainDiagramLabelFontname -FontBold:$MainDiagramLabelFontBold -FontItalic:$MainDiagramLabelFontItalic -FontUnderline:$MainDiagramLabelFontUnderline -FontOverline:$MainDiagramLabelFontOverline -FontSubscript:$MainDiagramLabelFontSubscript -FontSuperscript:$MainDiagramLabelFontSuperscript -FontStrikeThrough:$MainDiagramLabelFontStrikeThrough -CellSpacing 0 -IconPath $IconPath)
+                    $FormatedMainLogo = (Add-HtmlLabel -ImagesObj $ImagesObj -Label $MainDiagramLabel -TableBackgroundColor $MainDiagramLabelTableBackgroundColor -CellBackgroundColor $MainDiagramLabelTableBackgroundColor -IconType $CustomLogo -IconDebug $IconDebug -ImageSizePercent $MainGraphLogoSizePercent -Fontsize $MainDiagramLabelFontsize -FontColor $MainDiagramLabelFontColor -FontName $MainDiagramLabelFontname -FontBold:$MainDiagramLabelFontBold -FontItalic:$MainDiagramLabelFontItalic -FontUnderline:$MainDiagramLabelFontUnderline -FontOverline:$MainDiagramLabelFontOverline -FontSubscript:$MainDiagramLabelFontSubscript -FontSuperscript:$MainDiagramLabelFontSuperscript -FontStrikeThrough:$MainDiagramLabelFontStrikeThrough -CellSpacing 0 -IconPath $IconPath)
                 }
 
                 SubGraph MainGraph -Attributes @{Label = $FormatedMainLogo; fontsize = 24; penwidth = 0; labelloc = 't'; labeljust = 'c' } {

CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.8] - 2026-06-16
+
+### :toolbox: Added
+
+- Add `-Dpi` parameter to `New-AbrDiagram`, allowing the raster output resolution (PNG/JPG) to be set directly via the Graphviz `dpi` graph attribute instead of being fixed at the Graphviz default of 96
+- Add `-IconWidth`/`-IconHeight` parameters to `Add-HtmlNodeTable`, allowing the rendered icon size in a node's HTML table to be set explicitly instead of being derived solely from the source image's pixel dimensions
+
+### :arrows_clockwise: Changed
+
+- Improve the name resolutions in `Get-AbrNodeIP` cmdlet
+
+### :wrench: Fixed
+
+- Fix missing TableBorderColor parameter in `Add-HtmlSignatureTable` calls in `New-AbrDiagram` function
+- Fix missing TableBorderColor parameter in Main Logo section calls in `New-AbrDiagram` function
+
+
 ## [1.0.7] - 2026-05-02
 
 ### :arrows_clockwise: Changed

Sources/DiaConvertImageToPDF/AbrDiaConvertImageToPDF.csproj

@@ -5,7 +5,7 @@
     <LangVersion>8.0</LangVersion>
     <TargetFramework>net48</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
-    <Version>1.0.6</Version>
+    <Version>1.0.8</Version>
   </PropertyGroup>
 
   <ItemGroup>

Sources/DiaConvertImageToPDF/Todo.md

@@ -1,2 +1,2 @@
-- [ ] Add support for Watermark in SVG output format to DiaConvertImageToPDF
-    - [ ] Use the Diagrammer c# package as a reference to add watermark support to SVG output format
+- [x] Add support for Watermark in SVG output format to DiaConvertImageToPDF
+    - [x] Use the Diagrammer c# package as a reference to add watermark support to SVG output format

Sources/Diagrammer/AbrDiagrammer.csproj

@@ -18,4 +18,4 @@
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
     </ItemGroup>
 
-</Project>
+</Project>