pin assignment can be changed in the table dialog

src/main/java/de/neemann/digital/analyse/TruthTableTableModel.java

@@ -5,6 +5,8 @@ import javax.swing.event.TableModelListener;
 import javax.swing.table.TableModel;
 import java.util.ArrayList;
 
+import static javax.swing.event.TableModelEvent.HEADER_ROW;
+
 /**
  * Used to visualize a truthTable instance in a JTable
  *
@@ -94,4 +96,15 @@ public class TruthTableTableModel implements TableModel {
     public TruthTable getTable() {
         return truthTable;
     }
+
+    /**
+     * Sets the column name
+     *
+     * @param columnIndex the column
+     * @param name        the new name
+     */
+    public void setColumnName(int columnIndex, String name) {
+        truthTable.setColumnName(columnIndex, name);
+        fireModelEvent(HEADER_ROW);
+    }
 }

src/main/java/de/neemann/digital/core/element/Keys.java

@@ -302,4 +302,10 @@ public final class Keys {
     public static final Key<File> SETTINGS_ATF1502_FITTER
             = new Key<>("atf1502Fitter", new File("fit1502.exe"));
 
+    /**
+     * A pin number, empty means no pin assigned
+     */
+    public static final Key<String> PIN
+            = new Key<>("pin", "");
+
 }

src/main/java/de/neemann/digital/gui/components/table/TableDialog.java

@@ -16,25 +16,31 @@ import de.neemann.digital.analyse.expression.modify.TwoInputs;
 import de.neemann.digital.analyse.format.TruthTableFormatterLaTeX;
 import de.neemann.digital.analyse.quinemc.BoolTableByteArray;
 import de.neemann.digital.builder.ATF1502.*;
-import de.neemann.digital.builder.*;
+import de.neemann.digital.builder.BuilderException;
+import de.neemann.digital.builder.BuilderInterface;
+import de.neemann.digital.builder.ExpressionToFileExporter;
 import de.neemann.digital.builder.Gal16v8.CuplExporter;
 import de.neemann.digital.builder.Gal16v8.Gal16v8JEDECExporter;
 import de.neemann.digital.builder.Gal22v10.Gal22v10CuplExporter;
 import de.neemann.digital.builder.Gal22v10.Gal22v10JEDECExporter;
+import de.neemann.digital.builder.PinMapException;
 import de.neemann.digital.builder.circuit.CircuitBuilder;
 import de.neemann.digital.builder.jedec.FuseMapFillerException;
 import de.neemann.digital.builder.tt2.StartATF1502Fitter;
 import de.neemann.digital.builder.tt2.StartATF1504Fitter;
+import de.neemann.digital.core.element.ElementAttributes;
+import de.neemann.digital.core.element.Key;
+import de.neemann.digital.core.element.Keys;
 import de.neemann.digital.draw.elements.Circuit;
 import de.neemann.digital.draw.shapes.ShapeFactory;
 import de.neemann.digital.gui.Main;
+import de.neemann.digital.gui.components.AttributeDialog;
 import de.neemann.digital.gui.components.ElementOrderer;
 import de.neemann.digital.lang.Lang;
 import de.neemann.gui.ErrorMessage;
 import de.neemann.gui.ToolTipAction;
 
 import javax.swing.*;
-import javax.swing.border.MatteBorder;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.filechooser.FileNameExtensionFilter;
@@ -43,7 +49,6 @@ import javax.swing.table.JTableHeader;
 import javax.swing.table.TableColumn;
 import java.awt.*;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
@@ -51,17 +56,23 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
+import java.util.TreeMap;
 
 /**
  * @author hneemann
  */
 public class TableDialog extends JDialog {
     private static final Color MYGRAY = new Color(230, 230, 230);
+    private static final List<Key> LIST = new ArrayList<>();
+
+    static {
+        LIST.add(Keys.LABEL);
+        LIST.add(Keys.PIN);
+    }
+
     private final JLabel label;
     private final JTable table;
-    private final JTableHeader header;
-    private final JTextField text;
-    private final JPopupMenu renamePopup;
     private final Font font;
     private final ShapeFactory shapeFactory;
     private JCheckBoxMenuItem createJK;
@@ -103,32 +114,18 @@ public class TableDialog extends JDialog {
 
         allSolutionsDialog = new AllSolutionsDialog(parent, font);
 
-        header = table.getTableHeader();
+        JTableHeader header = table.getTableHeader();
         header.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent event) {
-                if (event.getClickCount() == 2) {
+                if (event.getClickCount() == 1 && event.getButton() == 3) {
-                    editColumnAt(event.getPoint());
+                    columnIndex = header.columnAtPoint(event.getPoint());
+                    if (columnIndex != -1)
+                        editColumnName(columnIndex);
                 }
             }
         });
 
-        text = new JTextField();
-        text.setBorder(null);
-        text.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                column.setHeaderValue(text.getText());
-                renamePopup.setVisible(false);
-                header.repaint();
-                model.getTable().setColumnName(columnIndex, text.getText());
-                calculateExpressions();
-            }
-        });
-
-        renamePopup = new JPopupMenu();
-        renamePopup.setBorder(new MatteBorder(0, 1, 1, 1, Color.DARK_GRAY));
-        renamePopup.add(text);
-
         JMenuBar bar = new JMenuBar();
         bar.add(createFileMenu());
 
@@ -213,6 +210,30 @@ public class TableDialog extends JDialog {
         setLocationRelativeTo(parent);
     }
 
+    private void editColumnName(int columnIndex) {
+        ElementAttributes attr = new ElementAttributes();
+        final String name = model.getColumnName(columnIndex);
+        attr.set(Keys.LABEL, name);
+        final TreeMap<String, Integer> pins = model.getTable().getPins();
+        if (pins.containsKey(name))
+            attr.set(Keys.PIN, pins.get(name).toString());
+        if (new AttributeDialog(this, LIST, attr).showDialog()) {
+            pins.remove(name);
+            final String newName = attr.get(Keys.LABEL);
+            final String pinStr = attr.get(Keys.PIN).trim();
+            if (pinStr.length() > 0) {
+                try {
+                    int p = Integer.parseInt(pinStr);
+                    pins.put(newName, p);
+                } catch (NumberFormatException e) {
+                    // Do nothing!
+                }
+            }
+            if (!newName.equals(name))
+                model.setColumnName(columnIndex, newName);
+        }
+    }
+
     private JMenu createFileMenu() {
         JMenu fileMenu = new JMenu(Lang.get("menu_file"));
 
@@ -464,7 +485,6 @@ public class TableDialog extends JDialog {
         hardware.add(atf1504);
 
 
-
         createMenu.add(hardware);
 
         return createMenu;
@@ -545,23 +565,6 @@ public class TableDialog extends JDialog {
         }
     }
 
-    private void editColumnAt(Point p) {
-        columnIndex = header.columnAtPoint(p);
-
-        if (columnIndex != -1) {
-            column = header.getColumnModel().getColumn(columnIndex);
-            Rectangle columnRectangle = header.getHeaderRect(columnIndex);
-
-            text.setText(column.getHeaderValue().toString());
-            renamePopup.setPreferredSize(
-                    new Dimension(columnRectangle.width, columnRectangle.height - 1));
-            renamePopup.show(header, columnRectangle.x, 0);
-
-            text.requestFocusInWindow();
-            text.selectAll();
-        }
-    }
-
     private void setModel(TruthTableTableModel model) {
         this.model = model;
         model.addTableModelListener(new CalculationTableModelListener());

src/main/resources/lang/lang_de.xml

@@ -545,6 +545,8 @@ Es sind nur {1} Variablen erlaubt, es wurden jedoch {2} gefunden.</string>
         bei den LEDs mit dieser Option ein "nachleuchten" eingeschaltet werden.</string>
     <string name="key_atf1502Fitter">ATF1502 Fitter</string>
     <string name="key_atf1502Fitter_tt">Pfad zum Fitter für den ATF1502. Geben Sie hier den vollen Pfad zur Datei fit1502.exe an. Diese Datei wird von ATMEL zu Verfügung gestellt.</string>
+    <string name="key_pin">Pinnummer</string>
+    <string name="key_pin_tt">Ist das Feld leer bedeutet das, dass dieses Signal keinem Pin zugewiesen ist.</string>
 
     <string name="lib_Logic">Logisch</string>
     <string name="lib_arithmetic">Arithmetik</string>

src/main/resources/lang/lang_en.xml

@@ -532,6 +532,8 @@ allowed are {1} variables but {2} are found.</string>
         This simulates a frequency above the critical flicker fusion frequency.</string>
     <string name="key_atf1502Fitter">ATF1502 Fitter</string>
     <string name="key_atf1502Fitter_tt">Path to the fitter for the ATF1502. Enter the full path to the file fit1502.exe provided bei ATMEL.</string>
+    <string name="key_pin">Pin number</string>
+    <string name="key_pin_tt">An empty field means this signal is not assigned to a pin.</string>
 
     <string name="lib_Logic">Logic</string>
     <string name="lib_arithmetic">Arithmetic</string>