diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/ICursor.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/ICursor.java index 9c62a46..eb7b160 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/ICursor.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/ICursor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2021 MINRES Technologies GmbH and others. + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,8 +12,8 @@ package com.minres.scviewer.database.ui; public interface ICursor { - public long getTime(); + long getTime(); - public void setTime(long time); + void setTime(long time); } diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformView.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformView.java index cdc41fc..aa87631 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformView.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2021 MINRES Technologies GmbH and others. + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,82 +35,86 @@ public interface IWaveformView extends PropertyChangeListener, ISelectionProvide static final int MARKER_POS = 1; - public static final RelationType NEXT_PREV_IN_STREAM = RelationTypeFactory.create("Prev/Next in stream"); + static final RelationType NEXT_PREV_IN_STREAM = RelationTypeFactory.create("Prev/Next in stream"); - public void addSelectionChangedListener(ISelectionChangedListener listener); + void addSelectionChangedListener(ISelectionChangedListener listener); - public void removeSelectionChangedListener(ISelectionChangedListener listener); + void removeSelectionChangedListener(ISelectionChangedListener listener); - public void setStyleProvider(IWaveformStyleProvider styleProvider); + void setStyleProvider(IWaveformStyleProvider styleProvider); - public void update(); + void update(); - public Control getControl(); + Control getControl(); - public Control getNameControl(); + Control getNameControl(); - public Control getValueControl(); + Control getValueControl(); - public Control getWaveformControl(); + Control getWaveformControl(); - public ISelection getSelection(); + ISelection getSelection(); - public void setSelection(ISelection selection); + void setSelection(ISelection selection); - public void setSelection(ISelection selection, boolean showIfNeeded); + void setSelection(ISelection selection, boolean showIfNeeded); - public void addToSelection(ISelection selection, boolean showIfNeeded); + void addToSelection(ISelection selection, boolean showIfNeeded); - public void moveSelection(GotoDirection direction); + void moveSelection(GotoDirection direction); - public void moveSelection(GotoDirection direction, RelationType relationType); + void moveSelection(GotoDirection direction, RelationType relationType); - public void moveCursor(GotoDirection direction); + void moveCursor(GotoDirection direction); - public List getStreamList(); + List getStreamList(); - public TrackEntry getEntryFor(ITx source); + TrackEntry getEntryFor(ITx source); - public TrackEntry getEntryFor(IWaveform source); + TrackEntry getEntryFor(IWaveform source); - public List getElementsAt(Point pt); + List getElementsAt(Point pt); - public void moveSelectedTrack(int i); + void moveSelectedTrack(int i); - public void setHighliteRelation(RelationType relationType); + void setHighliteRelation(RelationType relationType); - public void setMaxTime(long maxTime); + void setMaxTime(long maxTime); - public void setCursorTime(long time); + void setCursorTime(long time); - public void setMarkerTime(int marker, long time); + void setMarkerTime(int marker, long time); - public long getCursorTime(); + long getCursorTime(); - public int getSelectedMarker(); + int getSelectedMarker(); - public long getMarkerTime(int marker); + long getMarkerTime(int marker); - public void addPropertyChangeListener(PropertyChangeListener listener); + void addPropertyChangeListener(PropertyChangeListener listener); - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); + void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); - public void removePropertyChangeListener(PropertyChangeListener listener); + void removePropertyChangeListener(PropertyChangeListener listener); - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); + void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); - public List getCursorList(); + List getCursorList(); - public void scrollHorizontal(int percent); + void scrollHorizontal(int percent); - public void scrollTo(int pos); + void scrollTo(int pos); - public void addDisposeListener( DisposeListener listener ); + void addDisposeListener( DisposeListener listener ); - public void deleteSelectedTracks(); + void addEventListner(IWaveformviewEventListener listener); + + void removeEventListner(IWaveformviewEventListener listener); + + void deleteSelectedTracks(); - public TrackEntry addWaveform(IWaveform waveform, int pos); + TrackEntry addWaveform(IWaveform waveform, int pos); - public IWaveformZoom getWaveformZoom(); + IWaveformZoom getWaveformZoom(); } \ No newline at end of file diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformViewFactory.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformViewFactory.java index 730da62..b5fd1fb 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformViewFactory.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformViewFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2021 MINRES Technologies GmbH and others. + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,7 @@ package com.minres.scviewer.database.ui; import org.eclipse.swt.widgets.Composite; public interface IWaveformViewFactory { - public IWaveformView createPanel(Composite parent); + IWaveformView createPanel(Composite parent); - public IWaveformView createPanel(Composite parent, IWaveformStyleProvider styleProvider); + IWaveformView createPanel(Composite parent, IWaveformStyleProvider styleProvider); } diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformviewEventListener.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformviewEventListener.java new file mode 100644 index 0000000..5160d0d --- /dev/null +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformviewEventListener.java @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * MINRES Technologies GmbH - initial API and implementation + *******************************************************************************/ + +package com.minres.scviewer.database.ui; + +public interface IWaveformviewEventListener { + void onTrackEntryDoubleClickEvent (TrackEntry trackEntry); +} diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/TrackEntryGroup.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/TrackEntryGroup.java index 00973b2..a209b66 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/TrackEntryGroup.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/TrackEntryGroup.java @@ -1,9 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * MINRES Technologies GmbH - initial API and implementation + *******************************************************************************/ + package com.minres.scviewer.database.ui; import java.util.ArrayList; import java.util.List; -import com.minres.scviewer.database.BlankWaveform; +import com.minres.scviewer.database.EmptyWaveform; public class TrackEntryGroup extends TrackEntry { @@ -12,7 +23,7 @@ public class TrackEntryGroup extends TrackEntry { public Boolean is_open = true; public TrackEntryGroup(TrackEntry[] waveform, IWaveformStyleProvider styleProvider) { - super(new BlankWaveform(), styleProvider); + super(new EmptyWaveform(), styleProvider); for (TrackEntry iWaveform : waveform) { waveforms.add(iWaveform); } diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java index d93e3a7..2c68d80 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2021 MINRES Technologies GmbH and others. + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -89,6 +89,7 @@ import com.minres.scviewer.database.ui.ICursor; import com.minres.scviewer.database.ui.IWaveformStyleProvider; import com.minres.scviewer.database.ui.IWaveformView; import com.minres.scviewer.database.ui.IWaveformZoom; +import com.minres.scviewer.database.ui.IWaveformviewEventListener; import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.TrackEntryGroup; import com.minres.scviewer.database.ui.swt.internal.slider.ZoomBar; @@ -98,6 +99,8 @@ public class WaveformView implements IWaveformView { private ListenerList selectionChangedListeners = new ListenerList<>(); private PropertyChangeSupport pcs; + + private List eventListener = new ArrayList<>(); private ITx currentTxSelection; @@ -176,6 +179,12 @@ public class WaveformView implements IWaveformView { @Override public void mouseDoubleClick(MouseEvent e) { + Entry entry = trackVerticalOffset.floorEntry(e.y); + if(entry != null) + setSelection(new StructuredSelection(entry.getValue()), false, false); + for (IWaveformviewEventListener listner : eventListener) { + listner.onTrackEntryDoubleClickEvent(entry.getValue()); + } } }; @@ -1537,6 +1546,20 @@ public class WaveformView implements IWaveformView { waveformCanvas.addDisposeListener(listener); } + @Override + public void addEventListner(IWaveformviewEventListener listener) { + if(!eventListener.contains(listener)) { + eventListener.add(listener); + } + } + + @Override + public void removeEventListner(IWaveformviewEventListener listener) { + if(eventListener.contains(listener)) { + eventListener.remove(listener); + } + } + @Override public void setStyleProvider(IWaveformStyleProvider styleProvider) { this.styleProvider = styleProvider; diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BlankWaveform.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EmptyWaveform.java similarity index 68% rename from plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BlankWaveform.java rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EmptyWaveform.java index c4c0752..9fe311f 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BlankWaveform.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EmptyWaveform.java @@ -1,11 +1,23 @@ +/******************************************************************************* + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * MINRES Technologies GmbH - initial API and implementation + *******************************************************************************/ + package com.minres.scviewer.database; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; -public class BlankWaveform implements IWaveform { +public class EmptyWaveform implements IWaveform { + private String label = ""; @Override public void addPropertyChangeListener(PropertyChangeListener l) { } @@ -16,16 +28,17 @@ public class BlankWaveform implements IWaveform { @Override public String getFullName() { - return ""; + return label; } @Override public String getName() { - return ""; + return label; } @Override public void setName(String name) { + label=name; } @Override diff --git a/plugins/com.minres.scviewer.e4.application/Application.e4xmi b/plugins/com.minres.scviewer.e4.application/Application.e4xmi index e3f7410..f7d3384 100644 --- a/plugins/com.minres.scviewer.e4.application/Application.e4xmi +++ b/plugins/com.minres.scviewer.e4.application/Application.e4xmi @@ -118,6 +118,7 @@ + type:user @@ -216,6 +217,9 @@ + + + @@ -315,6 +319,7 @@ + diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/AppModelId.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/AppModelId.java index a28bac2..b8673b6 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/AppModelId.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/AppModelId.java @@ -4,15 +4,17 @@ public class AppModelId { public static final String ADDON_ORG_ECLIPSE_E4_CORE_COMMANDS_SERVICE = "org.eclipse.e4.core.commands.service"; public static final String ADDON_ORG_ECLIPSE_E4_UI_BINDINGS_SERVICE = "org.eclipse.e4.ui.bindings.service"; public static final String ADDON_ORG_ECLIPSE_E4_UI_CONTEXTS_SERVICE = "org.eclipse.e4.ui.contexts.service"; + public static final String ADDON_ORG_ECLIPSE_E4_UI_WORKBENCH_ADDONS_DNDADDON_DNDADDON = "org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon"; public static final String ADDON_ORG_ECLIPSE_E4_UI_WORKBENCH_BINDINGS_MODEL = "org.eclipse.e4.ui.workbench.bindings.model"; public static final String ADDON_ORG_ECLIPSE_E4_UI_WORKBENCH_COMMANDS_MODEL = "org.eclipse.e4.ui.workbench.commands.model"; public static final String ADDON_ORG_ECLIPSE_E4_UI_WORKBENCH_CONTEXTS_MODEL = "org.eclipse.e4.ui.workbench.contexts.model"; public static final String ADDON_ORG_ECLIPSE_E4_UI_WORKBENCH_HANDLER_MODEL = "org.eclipse.e4.ui.workbench.handler.model"; - public static final String ADDON_ORG_ECLIPSE_E4_UI_WORKBENCH_ADDONS_DNDADDON_DNDADDON = "org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon"; public static final String APPLICATION_ORG_ECLIPSE_E4_IDE_APPLICATION = "org.eclipse.e4.ide.application"; public static final String BINDINGCONTEXT_ORG_ECLIPSE_UI_CONTEXTS_DIALOG = "org.eclipse.ui.contexts.dialog"; public static final String BINDINGCONTEXT_ORG_ECLIPSE_UI_CONTEXTS_DIALOGANDWINDOW = "org.eclipse.ui.contexts.dialogAndWindow"; public static final String BINDINGCONTEXT_ORG_ECLIPSE_UI_CONTEXTS_WINDOW = "org.eclipse.ui.contexts.window"; + public static final String BINDINGTABLE_COM_MINRES_SCVIEWER_E4_APPLICATION_BINDINGTABLE_WINDOW = "com.minres.scviewer.e4.application.bindingtable.window"; + public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMANDPARAMETER_ADD_SEPARATOR = "com.minres.scviewer.e4.application.commandparameter.add_separator"; public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMANDPARAMETER_CHANGEVALUEDISPLAY = "com.minres.scviewer.e4.application.commandparameter.changevaluedisplay"; public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMANDPARAMETER_CHANGEWAVEDISPLAY = "com.minres.scviewer.e4.application.commandparameter.changewavedisplay"; public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMANDPARAMETER_LOADSTORE = "com.minres.scviewer.e4.application.commandparameter.loadStore"; @@ -22,33 +24,40 @@ public class AppModelId { public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_MOVEWAVEFORMUPCOMMAND_PARAMETER_DIR = "com.minres.scviewer.e4.application.command.movewaveformupCommand.parameter.dir"; public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_NAVIGATEEVENTCOMMAND_PARAMETER_DIR = "com.minres.scviewer.e4.application.command.navigateEventCommand.parameter.dir"; public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_NAVIGATETRANSCOMMAND_PARAMETER_DIR = "com.minres.scviewer.e4.application.command.navigateTransCommand.parameter.dir"; + public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_PANCOMMAND_PARAMETER_DIRECTION = "com.minres.scviewer.e4.application.command.pancommand.parameter.direction"; public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_THEME_PARAMETER_ID = "com.minres.scviewer.e4.application.command.theme.parameter.id"; public static final String COMMANDPARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_ZOOMCOMMAND_PARAMETER_LEVEL = "com.minres.scviewer.e4.application.command.zoomcommand.parameter.level"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_ADDWAVEFORM = "com.minres.scviewer.e4.application.command.addwaveform"; + public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_ADD_SEPARATOR = "com.minres.scviewer.e4.application.command.add_separator"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_CHANGEVALUEDISPLAY = "com.minres.scviewer.e4.application.command.changevaluedisplay"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_CHANGEWAVEDISPLAY = "com.minres.scviewer.e4.application.command.changewavedisplay"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_DELETEWAVEFORMCOMMAND = "com.minres.scviewer.e4.application.command.deletewaveformCommand"; + public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_ENABLEHOVER = "com.minres.scviewer.e4.application.command.enablehover"; + public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_ENABLETXDETAILS = "com.minres.scviewer.e4.application.command.enabletxdetails"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_LOADSTORESETTINGS = "com.minres.scviewer.e4.application.command.loadStoreSettings"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_MOVEWAVEFORMUPCOMMAND = "com.minres.scviewer.e4.application.command.movewaveformupCommand"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_NAVIGATEEVENTCOMMAND = "com.minres.scviewer.e4.application.command.navigateEventCommand"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_NAVIGATETRANSCOMMAND = "com.minres.scviewer.e4.application.command.navigateTransCommand"; + public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_PANCOMMAND = "com.minres.scviewer.e4.application.command.pancommand"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_SELECTALLCOMMAND = "com.minres.scviewer.e4.application.command.selectallCommand"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_SETRELATIONTYPE = "com.minres.scviewer.e4.application.command.setrelationtype"; + public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_SET_LABEL_TEXT = "com.minres.scviewer.e4.application.command.set_label_text"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_SET_THEM = "com.minres.scviewer.e4.application.command.set_them"; + public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_UPDATE = "com.minres.scviewer.e4.application.command.update"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_ZOOMCOMMAND = "com.minres.scviewer.e4.application.command.zoomcommand"; public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_OPEN = "com.minres.scviewer.e4.application.open"; + public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_RELOAD = "com.minres.scviewer.e4.application.reload"; + public static final String COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_TXSEARCH = "com.minres.scviewer.e4.application.txSearch"; public static final String COMMAND_ORG_ECLIPSE_UI_FILE_EXIT = "org.eclipse.ui.file.exit"; public static final String COMMAND_ORG_ECLIPSE_UI_FILE_SAVE = "org.eclipse.ui.file.save"; public static final String COMMAND_ORG_ECLIPSE_UI_HELP_ABOUTACTION = "org.eclipse.ui.help.aboutAction"; + public static final String COMMAND_ORG_ECLIPSE_UI_HELP_HELPCOMMAND = "org.eclipse.ui.help.helpCommand"; + public static final String COMMAND_ORG_ECLIPSE_UI_HELP_HELPCONTENTCOMMAND = "org.eclipse.ui.help.helpContentCommand"; public static final String COMMAND_ORG_ECLIPSE_UI_WINDOW_PREFERENCES = "org.eclipse.ui.window.preferences"; - public static final String DIRECTTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_DIRECTTOOLITEM_NEXTPREVINSTREAM = "com.minres.scviewer.e4.application.directtoolitem.nextprevinstream"; public static final String DYNAMICMENUCONTRIBUTION_COM_MINRES_SCVIEWER_E4_APPLICATION_DYNAMICMENUCONTRIBUTION_0 = "com.minres.scviewer.e4.application.dynamicmenucontribution.0"; - public static final String DYNAMICMENUCONTRIBUTION_COM_MINRES_SCVIEWER_E4_APPLICATION_DYNAMICMENUCONTRIBUTION_2 = "com.minres.scviewer.e4.application.dynamicmenucontribution.2"; - public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_APPEND = "com.minres.scviewer.e4.application.handledmenuitem.append"; - public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_APPENDALL = "com.minres.scviewer.e4.application.handledmenuitem.appendall"; + public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_ADD_SEPARATOR = "com.minres.scviewer.e4.application.handledmenuitem.add_separator"; + public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_CHECKFORUPDATE = "com.minres.scviewer.e4.application.handledmenuitem.checkforupdate"; public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_DELETE = "com.minres.scviewer.e4.application.handledmenuitem.delete"; - public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_INSERTALL = "com.minres.scviewer.e4.application.handledmenuitem.insertall"; - public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_INSERTBEFORE = "com.minres.scviewer.e4.application.handledmenuitem.insertbefore"; public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_MOVEDOWN = "com.minres.scviewer.e4.application.handledmenuitem.movedown"; public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_MOVEUP = "com.minres.scviewer.e4.application.handledmenuitem.moveup"; public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_NEXTCHANGE = "com.minres.scviewer.e4.application.handledmenuitem.nextchange"; @@ -58,36 +67,63 @@ public class AppModelId { public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_PREVIOUSEVENT = "com.minres.scviewer.e4.application.handledmenuitem.previousevent"; public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_PREVTX = "com.minres.scviewer.e4.application.handledmenuitem.prevtx"; public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_REMOVE = "com.minres.scviewer.e4.application.handledmenuitem.remove"; + public static final String HANDLEDMENUITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDMENUITEM_SEARCH = "com.minres.scviewer.e4.application.handledmenuitem.search"; + public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_HOVER = "com.minres.scviewer.e4.application.handledtoolitem.hover"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_LOADSETTINGS = "com.minres.scviewer.e4.application.handledtoolitem.loadsettings"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_MOVESTREAMDOWN = "com.minres.scviewer.e4.application.handledtoolitem.movestreamdown"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_MOVESTREAMUP = "com.minres.scviewer.e4.application.handledtoolitem.movestreamup"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_NEXTEVENT = "com.minres.scviewer.e4.application.handledtoolitem.nextevent"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_NEXTTRANSACTION = "com.minres.scviewer.e4.application.handledtoolitem.nexttransaction"; + public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_PANCURSOR = "com.minres.scviewer.e4.application.handledtoolitem.pancursor"; + public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_PANLEFT = "com.minres.scviewer.e4.application.handledtoolitem.panleft"; + public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_PANRIGHT = "com.minres.scviewer.e4.application.handledtoolitem.panright"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_PREVIOUSEVENT = "com.minres.scviewer.e4.application.handledtoolitem.previousevent"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_PREVIOUSTRANSACTION = "com.minres.scviewer.e4.application.handledtoolitem.previoustransaction"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_REMOVESTREAM = "com.minres.scviewer.e4.application.handledtoolitem.removestream"; + public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_SAVESETTINGS = "com.minres.scviewer.e4.application.handledtoolitem.savesettings"; + public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_TXDETAILS = "com.minres.scviewer.e4.application.handledtoolitem.txdetails"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_ZOOMFIT = "com.minres.scviewer.e4.application.handledtoolitem.zoomfit"; + public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_ZOOMFULL = "com.minres.scviewer.e4.application.handledtoolitem.zoomfull"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_ZOOMIN = "com.minres.scviewer.e4.application.handledtoolitem.zoomin"; public static final String HANDLEDTOOLITEM_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLEDTOOLITEM_ZOOMOUT = "com.minres.scviewer.e4.application.handledtoolitem.zoomout"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_ABOUTCOMMAND = "com.minres.scviewer.e4.application.handler.aboutCommand"; - public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_ADDWAVEFORMCOMMAND = "com.minres.scviewer.e4.application.handler.addWaveformCommand"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_ADD_SEPARATOR = "com.minres.scviewer.e4.application.handler.add_separator"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_CHANGEVALUEDISPLAY = "com.minres.scviewer.e4.application.handler.changeValueDisplay"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_CHANGEWAVEDISPLAY = "com.minres.scviewer.e4.application.handler.changeWaveDisplay"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_DELETEWAVEFORMCOMMAND = "com.minres.scviewer.e4.application.handler.deletewaveformCommand"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_ENABLEHOVER = "com.minres.scviewer.e4.application.handler.enablehover"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_ENABLETXDETAILS = "com.minres.scviewer.e4.application.handler.enabletxdetails"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_HELP = "com.minres.scviewer.e4.application.handler.help"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_HELPCONTENT = "com.minres.scviewer.e4.application.handler.helpContent"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_LOADSTORESETTINGS = "com.minres.scviewer.e4.application.handler.loadStoreSettings"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_MOVEWAVEFORMUPCOMMAND = "com.minres.scviewer.e4.application.handler.movewaveformupCommand"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_NAVIGATEEVENTCOMMAND = "com.minres.scviewer.e4.application.handler.navigateEventCommand"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_NAVIGATETRANSCOMMAND = "com.minres.scviewer.e4.application.handler.navigateTransCommand"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_OPENCOMMAND = "com.minres.scviewer.e4.application.handler.openCommand"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_PANCOMMAND = "com.minres.scviewer.e4.application.handler.panCommand"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_PREFERENCES = "com.minres.scviewer.e4.application.handler.preferences"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_QUITCOMMAND = "com.minres.scviewer.e4.application.handler.quitCommand"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_RELOADCOMMAND = "com.minres.scviewer.e4.application.handler.reloadCommand"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_SAVECOMMAND = "com.minres.scviewer.e4.application.handler.saveCommand"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_SELECTALLCOMMAND = "com.minres.scviewer.e4.application.handler.selectallCommand"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_SETRELEATIONTYPE = "com.minres.scviewer.e4.application.handler.setreleationtype"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_SET_LABEL_TEXT = "com.minres.scviewer.e4.application.handler.set_label_text"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_SET_THEM = "com.minres.scviewer.e4.application.handler.set_them"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_TXSEARCH = "com.minres.scviewer.e4.application.handler.txSearch"; + public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_UPDATE = "com.minres.scviewer.e4.application.handler.update"; public static final String HANDLER_COM_MINRES_SCVIEWER_E4_APPLICATION_HANDLER_ZOOMCOMMAND = "com.minres.scviewer.e4.application.handler.zoomCommand"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_0 = "com.minres.scviewer.e4.application.keybinding.0"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_1 = "com.minres.scviewer.e4.application.keybinding.1"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_HELP = "com.minres.scviewer.e4.application.keybinding.help"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_LOAD = "com.minres.scviewer.e4.application.keybinding.load"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_OPEN = "com.minres.scviewer.e4.application.keybinding.open"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_PREFERENCES = "com.minres.scviewer.e4.application.keybinding.preferences"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_QUIT = "com.minres.scviewer.e4.application.keybinding.quit"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_SAVE = "com.minres.scviewer.e4.application.keybinding.save"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_ZOOM_IN = "com.minres.scviewer.e4.application.keybinding.zoom_in"; + public static final String KEYBINDING_COM_MINRES_SCVIEWER_E4_APPLICATION_KEYBINDING_ZOOM_OUT = "com.minres.scviewer.e4.application.keybinding.zoom_out"; public static final String MENUSEPARATOR_COM_MINRES_SCVIEWER_E4_APPLICATION_MENUSEPARATOR_0 = "com.minres.scviewer.e4.application.menuseparator.0"; - public static final String MENU_COM_MINRES_SCVIEWER_E4_APPLICATION_MENU_2 = "com.minres.scviewer.e4.application.menu.2"; + public static final String MENUSEPARATOR_COM_MINRES_SCVIEWER_E4_APPLICATION_MENUSEPARATOR_1 = "com.minres.scviewer.e4.application.menuseparator.1"; public static final String MENU_COM_MINRES_SCVIEWER_E4_APPLICATION_MENU_CURSOR = "com.minres.scviewer.e4.application.menu.cursor"; public static final String MENU_COM_MINRES_SCVIEWER_E4_APPLICATION_MENU_FILE = "com.minres.scviewer.e4.application.menu.file"; public static final String MENU_COM_MINRES_SCVIEWER_E4_APPLICATION_MENU_HELP = "com.minres.scviewer.e4.application.menu.help"; @@ -99,14 +135,6 @@ public class AppModelId { public static final String MENU_MENU_ORG_ECLIPSE_UI_MAIN_MENU = "menu:org.eclipse.ui.main.menu"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_0 = "com.minres.scviewer.e4.application.parameter.0"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_1 = "com.minres.scviewer.e4.application.parameter.1"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_2 = "com.minres.scviewer.e4.application.parameter.2"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_3 = "com.minres.scviewer.e4.application.parameter.3"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_4 = "com.minres.scviewer.e4.application.parameter.4"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_5 = "com.minres.scviewer.e4.application.parameter.5"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_6 = "com.minres.scviewer.e4.application.parameter.6"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_7 = "com.minres.scviewer.e4.application.parameter.7"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_8 = "com.minres.scviewer.e4.application.parameter.8"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_9 = "com.minres.scviewer.e4.application.parameter.9"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_10 = "com.minres.scviewer.e4.application.parameter.10"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_11 = "com.minres.scviewer.e4.application.parameter.11"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_12 = "com.minres.scviewer.e4.application.parameter.12"; @@ -117,41 +145,48 @@ public class AppModelId { public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_17 = "com.minres.scviewer.e4.application.parameter.17"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_18 = "com.minres.scviewer.e4.application.parameter.18"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_19 = "com.minres.scviewer.e4.application.parameter.19"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_2 = "com.minres.scviewer.e4.application.parameter.2"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_20 = "com.minres.scviewer.e4.application.parameter.20"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_21 = "com.minres.scviewer.e4.application.parameter.21"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_22 = "com.minres.scviewer.e4.application.parameter.22"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_23 = "com.minres.scviewer.e4.application.parameter.23"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_24 = "com.minres.scviewer.e4.application.parameter.24"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_25 = "com.minres.scviewer.e4.application.parameter.25"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_26 = "com.minres.scviewer.e4.application.parameter.26"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_27 = "com.minres.scviewer.e4.application.parameter.27"; - public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_28 = "com.minres.scviewer.e4.application.parameter.28"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_29 = "com.minres.scviewer.e4.application.parameter.29"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_3 = "com.minres.scviewer.e4.application.parameter.3"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_30 = "com.minres.scviewer.e4.application.parameter.30"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_31 = "com.minres.scviewer.e4.application.parameter.31"; public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_32 = "com.minres.scviewer.e4.application.parameter.32"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_33 = "com.minres.scviewer.e4.application.parameter.33"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_34 = "com.minres.scviewer.e4.application.parameter.34"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_35 = "com.minres.scviewer.e4.application.parameter.35"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_36 = "com.minres.scviewer.e4.application.parameter.36"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_4 = "com.minres.scviewer.e4.application.parameter.4"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_5 = "com.minres.scviewer.e4.application.parameter.5"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_6 = "com.minres.scviewer.e4.application.parameter.6"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_7 = "com.minres.scviewer.e4.application.parameter.7"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_8 = "com.minres.scviewer.e4.application.parameter.8"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_9 = "com.minres.scviewer.e4.application.parameter.9"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_FIT = "com.minres.scviewer.e4.application.parameter.fit"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_FULL = "com.minres.scviewer.e4.application.parameter.full"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_IN = "com.minres.scviewer.e4.application.parameter.in"; + public static final String PARAMETER_COM_MINRES_SCVIEWER_E4_APPLICATION_PARAMETER_OUT = "com.minres.scviewer.e4.application.parameter.out"; public static final String PARTDESCRIPTOR_COM_MINRES_SCVIEWER_E4_APPLICATION_PARTDESCRIPTOR_WAVEFORMVIEWER = "com.minres.scviewer.e4.application.partdescriptor.waveformviewer"; public static final String PARTSTACK_ORG_ECLIPSE_EDITORSS = "org.eclipse.editorss"; - public static final String PART_COM_MINRES_SCVIEWER_E4_APPLICATION_PARTS_DESIGNBROWSER = "com.minres.scviewer.e4.application.parts.DesignBrowser"; - public static final String PART_COM_MINRES_SCVIEWER_E4_APPLICATION_PARTS_WAVEFORMDETAILS = "com.minres.scviewer.e4.application.parts.WaveformDetails"; - public static final String PART_COM_MINRES_SCVIEWER_E4_APPLICATION_PART_0 = "com.minres.scviewer.e4.application.part.0"; - public static final String POPUPMENU_COM_MINRES_SCVIEWER_E4_APPLICATION_PARTS_DESIGNBROWSER_POPUPMENU = "com.minres.scviewer.e4.application.parts.DesignBrowser.popupmenu"; + public static final String PART_COM_MINRES_SCVIEWER_E4_APPLICATION_DIALOG_ABOUTSCVIEWER = "com.minres.scviewer.e4.application.dialog.aboutscviewer"; + public static final String PART_COM_MINRES_SCVIEWER_E4_APPLICATION_DIALOG_ONLINEHELP = "com.minres.scviewer.e4.application.dialog.onlinehelp"; + public static final String PART_COM_MINRES_SCVIEWER_E4_APPLICATION_PART_CONTAINER = "com.minres.scviewer.e4.application.part.container"; public static final String POPUPMENU_COM_MINRES_SCVIEWER_E4_APPLICATION_POPUPMENU_NAMECONTEXT = "com.minres.scviewer.e4.application.popupmenu.namecontext"; public static final String POPUPMENU_COM_MINRES_SCVIEWER_E4_APPLICATION_POPUPMENU_WAVECONTEXT = "com.minres.scviewer.e4.application.popupmenu.wavecontext"; + public static final String TOOLBARSEPARATOR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBARSEPARATOR_0 = "com.minres.scviewer.e4.application.toolbarseparator.0"; public static final String TOOLBARSEPARATOR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBARSEPARATOR_1 = "com.minres.scviewer.e4.application.toolbarseparator.1"; public static final String TOOLBARSEPARATOR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBARSEPARATOR_2 = "com.minres.scviewer.e4.application.toolbarseparator.2"; - public static final String TOOLBARSEPARATOR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBARSEPARATOR_3 = "com.minres.scviewer.e4.application.toolbarseparator.3"; public static final String TOOLBARSEPARATOR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBARSEPARATOR_4 = "com.minres.scviewer.e4.application.toolbarseparator.4"; public static final String TOOLBAR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBAR_0 = "com.minres.scviewer.e4.application.toolbar.0"; - public static final String TOOLBAR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBAR_1 = "com.minres.scviewer.e4.application.toolbar.1"; + public static final String TOOLBAR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBAR_2 = "com.minres.scviewer.e4.application.toolbar.2"; + public static final String TOOLBAR_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLBAR_3 = "com.minres.scviewer.e4.application.toolbar.3"; public static final String TOOLBAR_TOOLBAR_ORG_ECLIPSE_UI_MAIN_TOOLBAR = "toolbar:org.eclipse.ui.main.toolbar"; public static final String TOOLCONTROL_COM_MINRES_SCVIEWER_E4_APPLICATION_TOOLCONTROL_0 = "com.minres.scviewer.e4.application.toolcontrol.0"; public static final String TOOLCONTROL_ORG_ECLIPSE_UI_HEAPSTATUS = "org.eclipse.ui.HeapStatus"; - public static final String TOOLCONTROL_ORG_ECLIPSE_UI_PROGRESSBAR = "org.eclipse.ui.ProgressBar"; public static final String TOOLCONTROL_ORG_ECLIPSE_UI_STATUSLINE = "org.eclipse.ui.StatusLine"; public static final String TRIMBAR_ORG_ECLIPSE_UI_MAIN_TOOLBAR = "org.eclipse.ui.main.toolbar"; public static final String TRIMBAR_ORG_ECLIPSE_UI_TRIM_STATUS = "org.eclipse.ui.trim.status"; - public static final String WINDOW_COM_MINRES_SCVIEWER_E4_APPLICATION_DIALOG_ABOUTSCVIEWER = "com.minres.scviewer.e4.application.dialog.aboutscviewer"; - - private AppModelId(){} + public static final String TRIMMEDWINDOW_COM_MINRES_SCVIEWER_E4_APPLICATION_TRIMMEDWINDOW_MAIN = "com.minres.scviewer.e4.application.trimmedwindow.main"; + public static final String WINDOW_COM_MINRES_SCVIEWER_E4_APPLICATION_WINDOW_HELP_CONTENT = "com.minres.scviewer.e4.application.window.help_content"; + public static final String WINDOW_COM_MINRES_SCVIEWER_E4_APPLICATION_WINDOW_WEB_HELP = "com.minres.scviewer.e4.application.window.web_help"; } \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddSeparatorHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddSeparatorHandler.java index 50720e1..2af596a 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddSeparatorHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddSeparatorHandler.java @@ -19,7 +19,7 @@ import org.eclipse.e4.ui.model.application.ui.basic.MPart; import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.jface.viewers.IStructuredSelection; -import com.minres.scviewer.database.BlankWaveform; +import com.minres.scviewer.database.EmptyWaveform; import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.e4.application.parts.WaveformViewer; @@ -47,7 +47,7 @@ public class AddSeparatorHandler { Object obj = partService.getActivePart().getObject(); if(obj instanceof WaveformViewer){ ((WaveformViewer)obj).addStreamsToList( - new IWaveform[]{new BlankWaveform()}, "before".equalsIgnoreCase(where)); //$NON-NLS-1$ + new IWaveform[]{new EmptyWaveform()}, "before".equalsIgnoreCase(where)); //$NON-NLS-1$ } } diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SetLabelTextHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SetLabelTextHandler.java new file mode 100644 index 0000000..2047555 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SetLabelTextHandler.java @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * MINRES Technologies GmbH - initial API and implementation + *******************************************************************************/ + +package com.minres.scviewer.e4.application.handlers; + +import org.eclipse.e4.core.di.annotations.CanExecute; +import org.eclipse.e4.core.di.annotations.Evaluate; +import org.eclipse.e4.core.di.annotations.Execute; +import org.eclipse.e4.ui.model.application.ui.basic.MPart; +import org.eclipse.e4.ui.workbench.modeling.EPartService; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Shell; + +import com.minres.scviewer.database.EmptyWaveform; +import com.minres.scviewer.database.ui.TrackEntry; +import com.minres.scviewer.e4.application.parts.TextInputDialog; +import com.minres.scviewer.e4.application.parts.WaveformViewer; + +public class SetLabelTextHandler { + + @Execute + public void execute(Shell shell, EPartService partService) { + MPart part = partService.getActivePart(); + if(part!=null && part.getObject() instanceof WaveformViewer){ + Object sel = ((WaveformViewer)part.getObject()).getSelection(); + if( sel instanceof IStructuredSelection) { + Object o= ((IStructuredSelection)sel).getFirstElement(); + if(o instanceof TrackEntry) { + TrackEntry te = (TrackEntry)o; + if(te.waveform instanceof EmptyWaveform) { + EmptyWaveform waveform= (EmptyWaveform)te.waveform; + TextInputDialog dialog = new TextInputDialog(shell); + dialog.create(); + dialog.setTitle("Change Separator Text"); + dialog.setText(waveform.getName()); + if (dialog.open() == Window.OK) { + waveform.setName(dialog.getText()); + } + } + } + } + } + } + + + @Evaluate + @CanExecute + public Boolean canExecute(MPart activePart){ + if(activePart!=null && activePart.getObject() instanceof WaveformViewer){ + Object sel = ((WaveformViewer)activePart.getObject()).getSelection(); + if( sel instanceof IStructuredSelection) { + if(((IStructuredSelection)sel).isEmpty()) return false; + Object o= ((IStructuredSelection)sel).getFirstElement(); + if(o instanceof TrackEntry) { + TrackEntry te = (TrackEntry)o; + return te.waveform instanceof EmptyWaveform; + } + } + } + return false; + } + +} \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TextInputDialog.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TextInputDialog.java new file mode 100644 index 0000000..26098a2 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TextInputDialog.java @@ -0,0 +1,107 @@ +/******************************************************************************* + * Copyright (c) 2023 MINRES Technologies GmbH and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * MINRES Technologies GmbH - initial API and implementation + *******************************************************************************/ +package com.minres.scviewer.e4.application.parts; + +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.eclipse.swt.layout.RowLayout; + +public class TextInputDialog extends TitleAreaDialog { + + private Text txtLabel; + private String txt = ""; + /** + * Create the dialog. + * @param parentShell + */ + public TextInputDialog(Shell parentShell) { + super(parentShell); + } + + /** + * Create contents of the dialog. + * @param parent + */ + @Override + protected Control createDialogArea(Composite parent) { + Composite area = (Composite) super.createDialogArea(parent); + Composite container = new Composite(area, SWT.NONE); + container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + GridLayout layout = new GridLayout(2, false); + container.setLayout(layout); + + Label lbtFirstName = new Label(container, SWT.NONE); + lbtFirstName.setText("New Label: "); + + GridData dataFirstName = new GridData(); + dataFirstName.grabExcessHorizontalSpace = true; + dataFirstName.horizontalAlignment = GridData.FILL; + + txtLabel = new Text(container, SWT.BORDER); + txtLabel.setLayoutData(dataFirstName); + txtLabel.setText(txt); + + return area; + } + + /** + * Create contents of the button bar. + * @param parent + */ + @Override + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); + createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); + } + + @Override + protected boolean isResizable() { + return true; + } + + // save content of the Text fields because they get disposed + // as soon as the Dialog closes + private void saveInput() { + txt = txtLabel.getText(); + } + /** + * Return the initial size of the dialog. + */ + @Override + protected Point getInitialSize() { + return new Point(400, 250); + } + + @Override + protected void okPressed() { + saveInput(); + super.okPressed(); + } + + public String getText() { + return txt; + } + + public void setText(String text) { + txt=text; + if(txtLabel!=null) + txtLabel.setText(text); + } +} diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java index 7983dd6..8f46d01 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java @@ -17,6 +17,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -31,6 +32,8 @@ import javax.annotation.PostConstruct; import javax.inject.Inject; import javax.inject.Named; +import org.eclipse.core.commands.Command; +import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; @@ -40,6 +43,8 @@ import org.eclipse.core.runtime.jobs.JobGroup; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; +import org.eclipse.e4.core.commands.ECommandService; +import org.eclipse.e4.core.commands.EHandlerService; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Optional; @@ -93,6 +98,7 @@ import com.minres.scviewer.database.tx.ITxRelation; import com.minres.scviewer.database.ui.GotoDirection; import com.minres.scviewer.database.ui.ICursor; import com.minres.scviewer.database.ui.IWaveformView; +import com.minres.scviewer.database.ui.IWaveformviewEventListener; import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.TrackEntry.ValueDisplay; import com.minres.scviewer.database.ui.TrackEntry.WaveDisplay; @@ -101,6 +107,7 @@ import com.minres.scviewer.database.ui.swt.Constants; import com.minres.scviewer.database.ui.swt.IToolTipContentProvider; import com.minres.scviewer.database.ui.swt.IToolTipHelpTextProvider; import com.minres.scviewer.database.ui.swt.WaveformViewFactory; +import com.minres.scviewer.e4.application.AppModelId; import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.internal.status.WaveStatusBarControl; import com.minres.scviewer.e4.application.internal.util.FileMonitor; @@ -238,6 +245,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis @Inject Composite parent; + @Inject ECommandService commandService; + + @Inject EHandlerService handlerService; + private boolean showHover; private SashForm topSash = null; @@ -402,6 +413,13 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis }); waveformPane.addDisposeListener(this); + waveformPane.addEventListner(new IWaveformviewEventListener() { + @Override + public void onTrackEntryDoubleClickEvent(TrackEntry trackEntry) { + ParameterizedCommand command = commandService.createCommand(AppModelId.COMMAND_COM_MINRES_SCVIEWER_E4_APPLICATION_COMMAND_SET_LABEL_TEXT); + handlerService.executeHandler(command); + } + }); waveformPane.getWaveformControl().setData(Constants.HELP_PROVIDER_TAG, new IToolTipHelpTextProvider() { @Override public String getHelpText(Widget widget) { diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java index c5c7553..1d0048b 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2021 MINRES Technologies GmbH and others. + * Copyright (c) 2015-2023 MINRES Technologies GmbH and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at