[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
[ice-build] [eclipse/ice] 1fbea8: Merge remote-tracking branch 'origin/master' into ...
|
Branch: refs/heads/mccaskey/moosecomposite_468384
Home: https://github.com/eclipse/ice
Commit: 1fbea88b883a24497436ba8ed38b92dfc520c96a
https://github.com/eclipse/ice/commit/1fbea88b883a24497436ba8ed38b92dfc520c96a
Author: Jay Jay Billings <billingsjj@xxxxxxxx>
Date: 2015-07-02 (Thu, 02 Jul 2015)
Changed paths:
M org.eclipse.ice.target.mars/mars.target
M repository/org.eclipse.ice.repository/ice.product
A src/org.eclipse.ice.viz.service.visit/icons/thread_obj.gif
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/widgets/ComboDialog.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/widgets/TimeSliderComposite.java
M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/paraview/web/HttpParaViewWebClient.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/paraview/web/IParaViewWebClient.java
A tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/ComboDialogTester.java
M tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/TimeSliderCompositeTester.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into jay/reflectivity
Commit: aadd7eab5cad1aae7ccd82da7551b78ad3c52273
https://github.com/eclipse/ice/commit/aadd7eab5cad1aae7ccd82da7551b78ad3c52273
Author: Jordan Deyton <jordan.deyton@xxxxxxxxx>
Date: 2015-07-02 (Thu, 02 Jul 2015)
Changed paths:
A src/org.eclipse.ice.viz.service.paraview.web/.classpath
A src/org.eclipse.ice.viz.service.paraview.web/.gitignore
A src/org.eclipse.ice.viz.service.paraview.web/.project
A src/org.eclipse.ice.viz.service.paraview.web/.settings/org.eclipse.jdt.core.prefs
A src/org.eclipse.ice.viz.service.paraview.web/META-INF/MANIFEST.MF
A src/org.eclipse.ice.viz.service.paraview.web/build.properties
A src/org.eclipse.ice.viz.service.paraview.web/pom.xml
A src/org.eclipse.ice.viz.service.paraview.web/src/org/eclipse/ice/viz/service/paraview/web/HttpParaViewWebClient.java
A src/org.eclipse.ice.viz.service.paraview.web/src/org/eclipse/ice/viz/service/paraview/web/IParaViewWebClient.java
R src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/paraview/web/HttpParaViewWebClient.java
R src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/paraview/web/IParaViewWebClient.java
Log Message:
-----------
Moving ParaView web interface to the bundle viz.service.paraview.web
Signed-off-by: Jordan Deyton <jordan.deyton@xxxxxxxxx>
Commit: 1a60d85f0e1df2ec3e5264bbdb86eba8ac72a1cc
https://github.com/eclipse/ice/commit/1a60d85f0e1df2ec3e5264bbdb86eba8ac72a1cc
Author: Jordan Deyton <jordan.deyton@xxxxxxxxx>
Date: 2015-07-02 (Thu, 02 Jul 2015)
Changed paths:
A src/org.eclipse.ice.viz.service.visit/icons/loop.gif
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/widgets/TimeSliderComposite.java
M tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/TimeSliderCompositeTester.java
Log Message:
-----------
Adding ability to toggle looped playback.
This includes a public method that can be accessed from the UI thread as
well as an entry in the play options Menu. Test code has been added.
Signed-off-by: Jordan Deyton <jordan.deyton@xxxxxxxxx>
Commit: 9ccb198cf942bed7a8cc2435f84460feb012a6f3
https://github.com/eclipse/ice/commit/9ccb198cf942bed7a8cc2435f84460feb012a6f3
Author: Jordan Deyton <jordan.deyton@xxxxxxxxx>
Date: 2015-07-02 (Thu, 02 Jul 2015)
Changed paths:
A src/org.eclipse.ice.viz.service.visit/icons/skip_backward.gif
A src/org.eclipse.ice.viz.service.visit/icons/skip_forward.gif
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/widgets/TimeSliderComposite.java
M tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/TimeSliderCompositeTester.java
Log Message:
-----------
Added buttons to the options menu to skip to first and last timestep.
These have test code prepared, although I haven't yet figured out how to
click items in a general context Menu yet.
Signed-off-by: Jordan Deyton <jordan.deyton@xxxxxxxxx>
Commit: 1141b286adac841ed595d227c4158ea88cbcd794
https://github.com/eclipse/ice/commit/1141b286adac841ed595d227c4158ea88cbcd794
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M org.eclipse.ice.target.mars/mars.target
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/IPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlotEditor.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/SeriesProvider.java
M tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/FakePlot.java
M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
Log Message:
-----------
CSVPlot/ICEResourcePage update:
Committing the new CSVPlot implementation that makes it possible for CSV
VizResources to updated dynamically. This also adds to
ICEResourcePage.update with code to handle updated VizResources.
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: 1e28b81f9a1768cbc8bf75f337d0f25f280265d2
https://github.com/eclipse/ice/commit/1e28b81f9a1768cbc8bf75f337d0f25f280265d2
Author: Jordan Deyton <jordan.deyton@xxxxxxxxx>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M org.eclipse.ice.target.mars/mars.target
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/IPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlotEditor.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/SeriesProvider.java
M tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/FakePlot.java
M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
Log Message:
-----------
Merge branch 'master' of https://github.com/eclipse/ice
Commit: ff8a7c946f0f79105dca52ddbb28fe9db3f5d551
https://github.com/eclipse/ice/commit/ff8a7c946f0f79105dca52ddbb28fe9db3f5d551
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
A src/org.eclipse.ice.viz.service.visit/icons/loop.gif
A src/org.eclipse.ice.viz.service.visit/icons/skip_backward.gif
A src/org.eclipse.ice.viz.service.visit/icons/skip_forward.gif
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/widgets/TimeSliderComposite.java
M tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/TimeSliderCompositeTester.java
Log Message:
-----------
Merge branch 'jordan/bug468388-visit-time-slider'
Commit: 4e1205821a3e442c65079518df628299403f76ac
https://github.com/eclipse/ice/commit/4e1205821a3e442c65079518df628299403f76ac
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M org.eclipse.ice.target.mars/mars.target
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
A src/org.eclipse.ice.viz.service.paraview.web/.classpath
A src/org.eclipse.ice.viz.service.paraview.web/.gitignore
A src/org.eclipse.ice.viz.service.paraview.web/.project
A src/org.eclipse.ice.viz.service.paraview.web/.settings/org.eclipse.jdt.core.prefs
A src/org.eclipse.ice.viz.service.paraview.web/META-INF/MANIFEST.MF
A src/org.eclipse.ice.viz.service.paraview.web/build.properties
A src/org.eclipse.ice.viz.service.paraview.web/pom.xml
A src/org.eclipse.ice.viz.service.paraview.web/src/org/eclipse/ice/viz/service/paraview/web/HttpParaViewWebClient.java
A src/org.eclipse.ice.viz.service.paraview.web/src/org/eclipse/ice/viz/service/paraview/web/IParaViewWebClient.java
A src/org.eclipse.ice.viz.service.visit/icons/loop.gif
A src/org.eclipse.ice.viz.service.visit/icons/skip_backward.gif
A src/org.eclipse.ice.viz.service.visit/icons/skip_forward.gif
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/widgets/TimeSliderComposite.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
R src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/paraview/web/HttpParaViewWebClient.java
R src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/paraview/web/IParaViewWebClient.java
M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
M tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/TimeSliderCompositeTester.java
Log Message:
-----------
Merging master into moose_composite.
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Compare: https://github.com/eclipse/ice/compare/62bf3e11f98b...4e1205821a3e