Tools/SCViewer
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uadds and pdates some graphics and menu items

Browse Source
This commit is contained in:
Eyck Jentzsch
2023-06-27 16:00:57 +02:00
parent d1808ec1cf
commit be87792dad
22 changed files with 203 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/com.minres.scviewer.e4.application/Application.e4xmi
View File

@ -206,6 +206,9 @@
<children xsi:type="menu:HandledMenuItem" xmi:id="_NFfK0LcyEe294PIiYLxpfA" elementId="com.minres.scviewer.e4.application.handledmenuitem.add_separator" label="Add separator above" command="_vYAOQLcxEe294PIiYLxpfA">
<parameters xmi:id="_or7iYLcyEe294PIiYLxpfA" elementId="com.minres.scviewer.e4.application.parameter.15" name="com.minres.scviewer.e4.application.commandparameter.add_separator" value="before"/>
</children>
<children xsi:type="menu:HandledMenuItem" xmi:id="_Dj-FUBTJEe6ZlJc8qY5-Zw" elementId="com.minres.scviewer.e4.application.handledmenuitem.add_separator" label="Add separator below" command="_vYAOQLcxEe294PIiYLxpfA">
<parameters xmi:id="_Dj-FURTJEe6ZlJc8qY5-Zw" elementId="com.minres.scviewer.e4.application.parameter.15" name="com.minres.scviewer.e4.application.commandparameter.add_separator" value="after"/>
</children>
<children xsi:type="menu:HandledMenuItem" xmi:id="_ecbWkLc0Ee294PIiYLxpfA" elementId="com.minres.scviewer.e4.application.handledmenuitem.add_separator" visible="false" label="Add blank below" enabled="false" command="_vYAOQLcxEe294PIiYLxpfA">
<parameters xmi:id="_ecbWkbc0Ee294PIiYLxpfA" elementId="com.minres.scviewer.e4.application.parameter.15" name="com.minres.scviewer.e4.application.commandparameter.add_separator" value="after"/>
</children>

BIN
plugins/com.minres.scviewer.e4.application/icons/arrow_in.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 600 B

BIN
plugins/com.minres.scviewer.e4.application/icons/arrow_inout.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 551 B

BIN
plugins/com.minres.scviewer.e4.application/icons/arrow_out.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 594 B

6
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java
View File

@ -61,9 +61,9 @@ public class AddWaveformHandler {
@Named(IServiceConstants.ACTIVE_SELECTION) @Optional IStructuredSelection selection) {
if(designBrowser==null) designBrowser = getListPart( partService);
if(designBrowser!=null && selection.size()>0){
List<?> sel=selection.toList();
designBrowser.getActiveWaveformViewerPart().addStreamsToList(sel.toArray(new IWaveform[]{}),
"before".equalsIgnoreCase(where)); //$NON-NLS-1$
@SuppressWarnings("unchecked")
IWaveform[] sel=(IWaveform[]) selection.toList().stream().filter(t -> t instanceof IWaveform).toArray(IWaveform[]::new);
designBrowser.getActiveWaveformViewerPart().addStreamsToList(sel, "before".equalsIgnoreCase(where)); //$NON-NLS-1$
}
}

76
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
View File

@ -13,11 +13,16 @@ package com.minres.scviewer.e4.application.provider;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.DecorationOverlayIcon;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.wb.swt.ResourceManager;
import com.minres.scviewer.database.DirectionType;
import com.minres.scviewer.database.IHierNode;
import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformDb;
@ -49,6 +54,32 @@ public class TxDbLabelProvider implements ILabelProvider {
/** The wave. */
private Image wave;
/** The wave. */
private Image input;
/** The wave. */
private Image output;
/** The wave. */
private Image inout;
/** The signal. */
private Image signal_in;
/** The wave. */
private Image wave_in;
/** The signal. */
private Image signal_out;
/** The wave. */
private Image wave_out;
/** The signal. */
private Image signal_inout;
/** The wave. */
private Image wave_inout;
/**
* Instantiates a new tx db label provider.
*/
@ -64,7 +95,16 @@ public class TxDbLabelProvider implements ILabelProvider {
}
signal=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/signal.png"); //$NON-NLS-1$ //$NON-NLS-2$
wave=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/wave.png"); //$NON-NLS-1$ //$NON-NLS-2$
wave=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/wave.png"); //$NON-NLS-1$ //$NON-NLS-2$s
input=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/arrow_in.png"); //$NON-NLS-1$ //$NON-NLS-2$s
output=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/arrow_out.png"); //$NON-NLS-1$ //$NON-NLS-2$s
inout=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/arrow_inout.png"); //$NON-NLS-1$ //$NON-NLS-2$s
signal_in = new DecorationOverlayIcon(signal, new ImageDescriptor[]{ImageDescriptor.createFromImage(input)}).createImage();
wave_in = new DecorationOverlayIcon(wave, new ImageDescriptor[]{ImageDescriptor.createFromImage(input)}).createImage();
signal_out = new DecorationOverlayIcon(signal, new ImageDescriptor[]{ImageDescriptor.createFromImage(output)}).createImage();
wave_out = new DecorationOverlayIcon(wave, new ImageDescriptor[]{ImageDescriptor.createFromImage(output)}).createImage();
signal_inout = new DecorationOverlayIcon(signal, new ImageDescriptor[]{ImageDescriptor.createFromImage(inout)}).createImage();
wave_inout = new DecorationOverlayIcon(wave, new ImageDescriptor[]{ImageDescriptor.createFromImage(inout)}).createImage();
}
/**
@ -88,7 +128,12 @@ public class TxDbLabelProvider implements ILabelProvider {
*/
@Override
public void dispose() {
// no resources to dispose
signal_in.dispose();
wave_in.dispose();
signal_out.dispose();
wave_out.dispose();
signal_inout.dispose();
wave_inout.dispose();
}
/**
@ -139,10 +184,29 @@ public class TxDbLabelProvider implements ILabelProvider {
case FILTER:
break;
case SIGNAL:
if(((IWaveform) element).getWidth()==1)
return signal;
else
return wave;
IWaveform wf = (IWaveform) element;
switch(wf.getDirection()) {
default:
if(((IWaveform) element).getWidth()==1)
return signal;
else
return wave;
case INPUT:
if(((IWaveform) element).getWidth()==1)
return signal_in;
else
return wave_in;
case OUTPUT:
if(((IWaveform) element).getWidth()==1)
return signal_out;
else
return wave_out;
case INOUT:
if(((IWaveform) element).getWidth()==1)
return signal_inout;
else
return wave_inout;
}
default:
break;
}