From 4eea76736f724d4f4f24636bdf7d788de3f6eeef Mon Sep 17 00:00:00 2001
From: Daniel Rojas <github@danielrojas.net>
Date: Tue, 10 Nov 2020 19:36:42 +0100
Subject: [PATCH] Implement changes suggested by @kvid

---
 src/wireviz/DataClasses.py | 18 +++---------------
 src/wireviz/Harness.py     | 12 +++++-------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/wireviz/DataClasses.py b/src/wireviz/DataClasses.py
index 30c589c..a138064 100644
--- a/src/wireviz/DataClasses.py
+++ b/src/wireviz/DataClasses.py
@@ -120,30 +120,18 @@ class Connector:
                 raise Exception('Connectors with style set to simple may only have one pin')
             self.pincount = 1
 
-        if self.pincount is None:
-            if self.pinlabels:
-                self.pincount = len(self.pinlabels)
-            elif self.pins:
-                self.pincount = len(self.pins)
-            else:
+        if not self.pincount:
+            if not self.pins and not self.pinlabels:
                 raise Exception('You need to specify at least one, pincount, pins or pinlabels')
-
-        if self.pinlabels and self.pins:
-            if len(self.pinlabels) != len(self.pins):
-                raise Exception('Given pins and pinlabels size mismatch')
+            self.pincount = max(len(self.pins), len(self.pinlabels), len(self.pincolors))
 
         # create default lists for pins (sequential) and pinlabels (blank) if not specified
         if not self.pins:
             self.pins = list(range(1, self.pincount + 1))
-        if not self.pinlabels:
-            self.pinlabels = [''] * self.pincount
 
         if len(self.pins) != len(set(self.pins)):
             raise Exception('Pins are not unique')
 
-        if self.pincolors:
-            self.pincolors.extend([None] * (len(self.pins) - len(self.pincolors)))  # autofill missing pincolors as 'no color'
-
         if self.show_name is None:
             self.show_name = not self.autogenerate # hide auto-generated designators by default
 
diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py
index b167a15..bbc68b7 100644
--- a/src/wireviz/Harness.py
+++ b/src/wireviz/Harness.py
@@ -12,6 +12,7 @@ from wireviz.wv_helper import awg_equiv, mm2_equiv, tuplelist2tsv, \
 from collections import Counter
 from typing import List, Union
 from pathlib import Path
+from itertools import zip_longest
 import re
 
 
@@ -110,9 +111,7 @@ class Harness:
                 pinhtml = []
                 pinhtml.append('<table border="0" cellspacing="0" cellpadding="3" cellborder="1">')
 
-                for pin, pinlabel, pincolor in zip(connector.pins,
-                                                   connector.pinlabels,
-                                                   connector.pincolors if connector.pincolors else [None] * len(connector.pins)):
+                for pin, pinlabel, pincolor in zip_longest(connector.pins, connector.pinlabels, connector.pincolors):
                     if connector.hide_disconnected_pins and not connector.visible_pins.get(pin, False):
                         continue
                     pinhtml.append('   <tr>')
@@ -122,11 +121,10 @@ class Harness:
                         pinhtml.append(f'    <td>{pinlabel}</td>')
                     if connector.pincolors:
                         if pincolor in wv_colors._color_hex.keys():
-                            pinhtml.append(f'<td sides="tbl">{pincolor}</td>')
-                            pinhtml.append(f'<td sides="tbr"><table border="0" cellborder="1"><tr><td bgcolor="{wv_colors.translate_color(pincolor, "HEX")}" width="8" height="8" fixedsize="true"></td></tr></table></td>')
+                            pinhtml.append(f'    <td sides="tbl">{pincolor}</td>')
+                            pinhtml.append(f'    <td sides="tbr"><table border="0" cellborder="1"><tr><td bgcolor="{wv_colors.translate_color(pincolor, "HEX")}" width="8" height="8" fixedsize="true"></td></tr></table></td>')
                         else:
-                            pinhtml.append(f'<td sides="tbl"></td>')
-                            pinhtml.append(f'<td sides="tbr"></td>')
+                            pinhtml.append(f'    <td colspan="2"></td>')
 
                     if connector.ports_right:
                         pinhtml.append(f'    <td port="p{pin}r">{pin}</td>')