projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed InstructionView containing every column twice
[Mograsim.git]
/
net.mograsim.plugin.core
/
src
/
net
/
mograsim
/
plugin
/
tables
/
mi
/
InstructionView.java
diff --git
a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
index
d864491
..
3af070f
100644
(file)
--- a/
net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
+++ b/
net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
@@
-6,7
+6,6
@@
import java.util.Optional;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.EditingSupport;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@
-27,6
+26,7
@@
import net.mograsim.plugin.MachineContext;
import net.mograsim.plugin.MachineContext.ContextObserver;
import net.mograsim.plugin.tables.AddressLabelProvider;
import net.mograsim.plugin.tables.DisplaySettings;
import net.mograsim.plugin.MachineContext.ContextObserver;
import net.mograsim.plugin.tables.AddressLabelProvider;
import net.mograsim.plugin.tables.DisplaySettings;
+import net.mograsim.plugin.tables.LazyTableViewer;
import net.mograsim.plugin.tables.RadixSelector;
import net.mograsim.plugin.util.DropDownMenu;
import net.mograsim.plugin.util.DropDownMenu.DropDownEntry;
import net.mograsim.plugin.tables.RadixSelector;
import net.mograsim.plugin.util.DropDownMenu;
import net.mograsim.plugin.util.DropDownMenu.DropDownEntry;
@@
-34,12
+34,13
@@
import net.mograsim.plugin.util.DropDownMenu.DropDownEntry;
public class InstructionView extends ViewPart implements ContextObserver
{
private String saveLoc = null;
public class InstructionView extends ViewPart implements ContextObserver
{
private String saveLoc = null;
- private TableViewer viewer;
+ private
Lazy
TableViewer viewer;
private TableViewerColumn[] columns = new TableViewerColumn[0];
private MicroInstructionDefinition miDef;
private MicroInstructionMemory memory;
private DisplaySettings displaySettings;
private InstructionTableContentProvider provider;
private TableViewerColumn[] columns = new TableViewerColumn[0];
private MicroInstructionDefinition miDef;
private MicroInstructionMemory memory;
private DisplaySettings displaySettings;
private InstructionTableContentProvider provider;
+ private int highlighted = 0;
@SuppressWarnings("unused")
@Override
@SuppressWarnings("unused")
@Override
@@
-53,7
+54,7
@@
public class InstructionView extends ViewPart implements ContextObserver
new RadixSelector(parent, displaySettings);
parent.setLayout(layout);
new RadixSelector(parent, displaySettings);
parent.setLayout(layout);
- viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL);
+ viewer = new
Lazy
TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL);
Table table = viewer.getTable();
table.setHeaderVisible(true);
Table table = viewer.getTable();
table.setHeaderVisible(true);
@@
-68,6
+69,14
@@
public class InstructionView extends ViewPart implements ContextObserver
displaySettings.addObserver(() -> viewer.refresh());
MachineContext.getInstance().registerObserver(this);
displaySettings.addObserver(() -> viewer.refresh());
MachineContext.getInstance().registerObserver(this);
+ setMachine(Optional.ofNullable(MachineContext.getInstance().getMachine()));
+ }
+
+ public void highlight(int index)
+ {
+ viewer.highlightRow(highlighted, false);
+ viewer.highlightRow(index, true);
+ viewer.getTable().setTopIndex(index);
}
@SuppressWarnings("unused")
}
@SuppressWarnings("unused")
@@
-122,12
+131,14
@@
public class InstructionView extends ViewPart implements ContextObserver
private void createColumns()
{
private void createColumns()
{
+ int size = miDef.size();
+ columns = new TableViewerColumn[size + 1];
+
TableViewerColumn col = createTableViewerColumn("Address", 200);
TableViewerColumn col = createTableViewerColumn("Address", 200);
+ columns[0] = col;
col.setLabelProvider(new AddressLabelProvider());
col.setLabelProvider(new AddressLabelProvider());
- int size = miDef.size();
int bit = 0;
int bit = 0;
- columns = new TableViewerColumn[size];
ParameterClassification[] classes = miDef.getParameterClassifications();
for (int i = 0; i < size; i++)
ParameterClassification[] classes = miDef.getParameterClassifications();
for (int i = 0; i < size; i++)
@@
-137,9
+148,10
@@
public class InstructionView extends ViewPart implements ContextObserver
String name = startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit;
int bounds = 20 + 20 * classes[i].getExpectedBits();
String name = startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit;
int bounds = 20 + 20 * classes[i].getExpectedBits();
- createEditingAndLabel(createTableViewerColumn(name, bounds), miDef, i);
+ col = createTableViewerColumn(name, bounds);
+ columns[i + 1] = col;
+ createEditingAndLabel(col, miDef, i);
}
}
-
}
private void createEditingAndLabel(TableViewerColumn col, MicroInstructionDefinition miDef, int index)
}
private void createEditingAndLabel(TableViewerColumn col, MicroInstructionDefinition miDef, int index)
@@
-158,7
+170,7
@@
public class InstructionView extends ViewPart implements ContextObserver
provider = new IntegerColumnLabelProvider(displaySettings, index);
break;
case MNEMONIC:
provider = new IntegerColumnLabelProvider(displaySettings, index);
break;
case MNEMONIC:
- support = new MnemonicEditingSupport(viewer, miDef, index);
+ support = new MnemonicEditingSupport(viewer, miDef, index
, this.provider
);
provider = new ParameterLabelProvider(index);
break;
default:
provider = new ParameterLabelProvider(index);
break;
default:
@@
-167,6
+179,7
@@
public class InstructionView extends ViewPart implements ContextObserver
}
col.setEditingSupport(support);
col.setLabelProvider(provider);
}
col.setEditingSupport(support);
col.setLabelProvider(provider);
+ col.getColumn().setToolTipText(miDef.getParameterDescription(index).orElse(""));
}
private TableViewerColumn createTableViewerColumn(String title, int bound)
}
private TableViewerColumn createTableViewerColumn(String title, int bound)