Skip to content

2466 waveform view 4.5.x #2534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berryma4 merged 7 commits into from
Oct 18, 2018
Merged

2466 waveform view 4.5.x #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
63c0c39
Avoid invalid thread access exceptions.
willrogers Sep 25, 2018
9eb17c1
Use new generic getAdapter() method to avoid warnings.
willrogers Sep 25, 2018
13d9c9b
Avoid null values for empty lists.
willrogers Sep 25, 2018
7fb7bb5
Use merged PlotSampleArray for defining the slider in WaveformView.
willrogers Sep 26, 2018
79e4283
Make variables final where possible.
willrogers Sep 27, 2018
60acd70
Simplify sample selection.
willrogers Sep 27, 2018
7c5fef7
Tidy resetting the waveform view slider.
willrogers Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/data/TimeDataSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
public class TimeDataSearch extends PlotDataSearch<Instant>
{
/** Find a sample that's bigger or equal to given value
/** Find the sample closest to given value
* @param data Data, must already be locked
* @param time Time near which to look for sample.
* @return Returns index of sample closest to time
Expand Down
9 changes: 5 additions & 4 deletions ...io.trends.databrowser2/src/org/csstudio/trends/databrowser2/editor/DataBrowserEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,18 +275,19 @@ public void scrollEnabled(final boolean scroll_enabled)

@Override
public void changedAnnotations()
{ setDirty(true); }
{
site.getShell().getDisplay().asyncExec(() -> setDirty(true));
}
};
model.addListener(model_listener);
}

/** Provide custom property sheet for this editor */
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(final Class adapter)
public <T> T getAdapter(final Class<T> adapter)
{
if (adapter == IPropertySheetPage.class)
return new DataBrowserPropertySheetPage(model, plot.getPlot().getUndoableActionManager());
return adapter.cast(new DataBrowserPropertySheetPage(model, plot.getPlot().getUndoableActionManager()));
return super.getAdapter(adapter);
}

Expand Down
Loading