TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-10-01 00:40:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Easier editing of the truth table by using the keys "0", "1" and "x" to fill the table.

Browse Source
This commit is contained in:
hneemann 2017-03-03 21:18:11 +01:00
parent d438695f19
commit ffdb08c47f
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,13 @@ public class TableDialog extends JDialog {
table.setDefaultRenderer(Integer.class, new CenterDefaultTableCellRenderer()); table.setDefaultRenderer(Integer.class, new CenterDefaultTableCellRenderer());
table.setRowHeight(25); table.setRowHeight(25);
table.getInputMap().put(KeyStroke.getKeyStroke("0"), "0_ACTION");
table.getActionMap().put("0_ACTION", new SetAction(0));
table.getInputMap().put(KeyStroke.getKeyStroke("1"), "1_ACTION");
table.getActionMap().put("1_ACTION", new SetAction(1));
table.getInputMap().put(KeyStroke.getKeyStroke("X"), "X_ACTION");
table.getActionMap().put("X_ACTION", new SetAction(2));
allSolutionsDialog = new AllSolutionsDialog(parent, font); allSolutionsDialog = new AllSolutionsDialog(parent, font);
header = table.getTableHeader(); header = table.getTableHeader();
@ -304,25 +311,25 @@ public class TableDialog extends JDialog {
setMenu.add(new ToolTipAction(Lang.get("menu_table_setAllToX")) { setMenu.add(new ToolTipAction(Lang.get("menu_table_setAllToX")) {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
settAllValuesTo(2); setAllValuesTo(2);
} }
}.setToolTip(Lang.get("menu_table_setAllToX_tt")).createJMenuItem()); }.setToolTip(Lang.get("menu_table_setAllToX_tt")).createJMenuItem());
setMenu.add(new ToolTipAction(Lang.get("menu_table_setAllTo0")) { setMenu.add(new ToolTipAction(Lang.get("menu_table_setAllTo0")) {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
settAllValuesTo(0); setAllValuesTo(0);
} }
}.setToolTip(Lang.get("menu_table_setAllTo0_tt")).createJMenuItem()); }.setToolTip(Lang.get("menu_table_setAllTo0_tt")).createJMenuItem());
setMenu.add(new ToolTipAction(Lang.get("menu_table_setAllTo1")) { setMenu.add(new ToolTipAction(Lang.get("menu_table_setAllTo1")) {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
settAllValuesTo(1); setAllValuesTo(1);
} }
}.setToolTip(Lang.get("menu_table_setAllTo1_tt")).createJMenuItem()); }.setToolTip(Lang.get("menu_table_setAllTo1_tt")).createJMenuItem());
return setMenu; return setMenu;
} }
private void settAllValuesTo(int value) { private void setAllValuesTo(int value) {
TruthTable t = model.getTable(); TruthTable t = model.getTable();
t.setAllTo(value); t.setAllTo(value);
setModel(new TruthTableTableModel(t)); setModel(new TruthTableTableModel(t));
@ -573,7 +580,8 @@ public class TableDialog extends JDialog {
default: default:
label.setText(""); label.setText("");
allSolutionsDialog.setText(html.getHtml()); allSolutionsDialog.setText(html.getHtml());
allSolutionsDialog.setVisible(true); if (!allSolutionsDialog.isVisible())
allSolutionsDialog.setVisible(true);
} }
} catch (ExpressionException | FormatterException e1) { } catch (ExpressionException | FormatterException e1) {
new ErrorMessage(Lang.get("msg_errorDuringCalculation")).addCause(e1).show(); new ErrorMessage(Lang.get("msg_errorDuringCalculation")).addCause(e1).show();
@ -772,4 +780,32 @@ public class TableDialog extends JDialog {
return ident.substring(0, p) + "<sub>" + ident.substring(p + 1) + "</sub>"; return ident.substring(0, p) + "<sub>" + ident.substring(p + 1) + "</sub>";
} }
} }
private final class SetAction extends AbstractAction {
private final int value;
private SetAction(int value) {
this.value = value;
}
@Override
public void actionPerformed(ActionEvent actionEvent) {
int r = table.getSelectedRow();
int c = table.getSelectedColumn();
if (r < 0 || c < 0) {
r = 0;
c = model.getTable().getVars().size();
}
model.setValueAt(value, r, c);
c++;
if (c >= table.getColumnCount()) {
c = model.getTable().getVars().size();
r++;
if (r >= model.getRowCount())
r = 0;
}
table.changeSelection(r, c, false, false);
}
}
} }