← Back to branch summary

~helioviewer/jhelioviewer/trunk

~helioviewer/jhelioviewer/trunk

Viewing all changes in revision 502.

Committer: Daniel Mueller
Date: 2014-03-18 09:37:47 UTC
mfrom: (499.1.9 stereo-masks)
Revision ID: daniel.mueller@esa.int-20140318093747-b3uggn7qj1xe6wz1

Merged Andre's stereo-masks branch into trunk

files added:
config/resource-loader/ffmpeg-1-2-1.xml

config/resource-loader/jogl2.xml

lib/commons-cli-1.1.jar

lib/logback-classic-1.0.0.jar

lib/logback-core-1.0.0.jar

lib/slf4j-api-1.6.4.jar

resources/licenses/JOGL2.txt

resources/licenses/MP4Box.txt

resources/licenses/Xuggler.txt

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/io/FixedSizedInputStream.java

files removed:
config/resource-loader/ffmpeg.xml

config/resource-loader/jogl.xml

resources/licenses/JOGL.txt

files modified:
.bzrignore

build-resources/mac/bundle.sh *

build-resources/windows/JHelioviewer.bat *

build-resources/windows/windows-setup.nsi *

build.xml

config/resource-loader/mp4box.xml

lib/gluegen-rt.jar

lib/jogl.jar

mechanic/install.sh *

resources/images/1uparrow1.png *

resources/images/ToBeImplemented/border_inside.png *

resources/images/ToBeImplemented/error.png *

resources/images/ToBeImplemented/move_layer_up.png *

resources/images/agt_back.png *

resources/images/agt_forward.png *

resources/images/agt_pause-queue.png *

resources/images/button_cancel.png *

resources/images/button_ok.png *

resources/images/download_dm.png *

resources/images/edit_add.png *

resources/images/edit_add_small.png *

resources/images/info.png *

resources/images/layer-image-time.png *

resources/images/layer-image.png *

resources/images/layer-movie-time.png *

resources/images/layer_visible_dm.png *

resources/images/play_dm.png *

resources/images/unused/new/14_layer_novisible.png *

resources/images/unused/new/14_layer_visible.png *

resources/images/unused/new/2leftarrow.png *

resources/images/unused/new/2rightarrow.png *

resources/images/unused/new/cal.png *

resources/images/unused/new/connect_established.png *

resources/images/unused/new/connect_no.png *

resources/images/unused/new/fileclose.png *

resources/images/unused/new/fileimport.png *

resources/images/unused/new/move_task_down.png *

resources/images/unused/new/player_pause.png *

resources/images/unused/new/player_play.png *

resources/images/unused/new/remove.png *

resources/images/unused/new/tab_right.png *

resources/images/unused/new/viewmag+.png *

resources/images/unused/new/viewmag-.png *

resources/images/unused/new/viewmag.png *

resources/images/unused/new/viewmag1.png *

resources/images/unused/new/viewmagfit.png *

resources/images/unused/old/download.png *

resources/licenses/GlueGen.txt

resources/settings/defaults.properties

src/basegui/src/org/helioviewer/jhv/gui/components/calendar/JHVCalendar.java

src/idlColorTables/convert.sh *

src/jhv/.classpath

src/jhv/src/org/helioviewer/jhv/JHVGlobals.java

src/jhv/src/org/helioviewer/jhv/JHVSplashScreen.java

src/jhv/src/org/helioviewer/jhv/JHVUpdate.java

src/jhv/src/org/helioviewer/jhv/JavaHelioViewer.java

src/jhv/src/org/helioviewer/jhv/Settings.java

src/jhv/src/org/helioviewer/jhv/gui/actions/ShowDialogAction.java

src/jhv/src/org/helioviewer/jhv/gui/components/BasicImagePanel.java

src/jhv/src/org/helioviewer/jhv/gui/components/TopToolBar.java

src/jhv/src/org/helioviewer/jhv/gui/components/statusplugins/MetaDataStatusPanel.java

src/jhv/src/org/helioviewer/jhv/gui/components/statusplugins/PositionStatusPanel.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/AboutDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/DateFormatInfoDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/ExportMovieDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/HelpDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/MetaDataDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/NewVersionDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/OpenRemoteFileDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/PreferencesDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/TextDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/observation/ObservationDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/plugins/PluginsDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/pluginsOLD/AbstractPluginDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/pluginsOLD/FilterPluginDialog.java

src/jhv/src/org/helioviewer/jhv/gui/interfaces/ShowableDialog.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/SOHOLUTFilterPlugin/SOHOLUTFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/channelMixer/ChannelMixerFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/contrast/ContrastFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/gammacorrection/GammaCorrectionFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/opacity/OpacityFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/sharpen/SharpenGLFilter.java

src/jhv/src/org/helioviewer/jhv/io/DataSources.java

src/jhv/src/org/helioviewer/jhv/io/FileDownloader.java

src/jhv/src/org/helioviewer/jhv/layers/LayersModel.java

src/jhv/src/org/helioviewer/jhv/opengl/GLInfo.java

src/jhv/src/org/helioviewer/jhv/opengl/GLInitPanel.java

src/viewmodel/src/org/helioviewer/viewmodel/filter/GLFilter.java

src/viewmodel/src/org/helioviewer/viewmodel/filter/StandardFilter.java

src/viewmodel/src/org/helioviewer/viewmodel/metadata/HelioviewerMetaData.java

src/viewmodel/src/org/helioviewer/viewmodel/metadata/HelioviewerOcculterMetaData.java

src/viewmodel/src/org/helioviewer/viewmodel/metadata/MetaDataContainer.java

src/viewmodel/src/org/helioviewer/viewmodel/metadata/OcculterMetaData.java

src/viewmodel/src/org/helioviewer/viewmodel/renderer/GLCommonRenderGraphics.java

src/viewmodel/src/org/helioviewer/viewmodel/renderer/physical/GLPhysicalRenderGraphics.java

src/viewmodel/src/org/helioviewer/viewmodel/renderer/screen/GLScreenRenderGraphics.java

src/viewmodel/src/org/helioviewer/viewmodel/view/AbstractLayeredView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/ViewHelper.java

src/viewmodel/src/org/helioviewer/viewmodel/view/bufferedimage/BufferedImageComponentView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/bufferedimage/BufferedImageHelioviewerGeometryView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/bufferedimage/BufferedImageLayeredView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/fitsview/FITSImage.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/J2KReader.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/JHVJP2View.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/JP2Image.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/io/http/HTTPSocket.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/io/jpip/JPIPDataInputStream.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/io/jpip/JPIPSocket.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/kakadu/JHV_Kdu_cache.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/AbstractGLView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLComponentView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLFilterView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLHelioviewerGeometryView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLLayeredView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLOverlayView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLScalePowerOfTwoView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLSceneSaver.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLSolarRotationTrackingView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLSynchronizeOverviewChainView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLTextureHelper.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLFragmentShaderProgram.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLScalePowerOfTwoVertexShaderProgram.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLShaderBuilder.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLShaderHelper.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLSingleChannelLookupFragmentShaderProgram.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLTextureCoordinate.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLVertexShaderProgram.java

website/imgs/body_bg.jpg *

website/imgs/db_first_bg.jpg *

website/imgs/db_second_bg.jpg *

website/imgs/db_second_bg.psd *

website/imgs/nav_tab_bg.png *

Show diffs side-by-side

added added

removed removed

config/resource-loader/ffmpeg-1-2-1.xml

config/resource-loader/ffmpeg.xml

config/resource-loader/jogl.xml

config/resource-loader/jogl2.xml

config/resource-loader/mp4box.xml

lib/commons-cli-1.1.jar

lib/gluegen-rt.jar

lib/logback-classic-1.0.0.jar

lib/logback-core-1.0.0.jar

lib/slf4j-api-1.6.4.jar

resources/licenses/GlueGen.txt

resources/licenses/JOGL.txt

resources/licenses/JOGL2.txt

resources/licenses/MP4Box.txt

resources/licenses/Xuggler.txt

resources/settings/defaults.properties

src/basegui/src/org/helioviewer/jhv/gui/components/calendar/JHVCalendar.java

src/jhv/.classpath

src/jhv/src/org/helioviewer/jhv/JHVGlobals.java

src/jhv/src/org/helioviewer/jhv/JHVSplashScreen.java

src/jhv/src/org/helioviewer/jhv/JHVUpdate.java

src/jhv/src/org/helioviewer/jhv/JavaHelioViewer.java

src/jhv/src/org/helioviewer/jhv/Settings.java

src/jhv/src/org/helioviewer/jhv/gui/actions/ShowDialogAction.java

src/jhv/src/org/helioviewer/jhv/gui/components/BasicImagePanel.java

src/jhv/src/org/helioviewer/jhv/gui/components/TopToolBar.java

src/jhv/src/org/helioviewer/jhv/gui/components/statusplugins/MetaDataStatusPanel.java

src/jhv/src/org/helioviewer/jhv/gui/components/statusplugins/PositionStatusPanel.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/AboutDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/DateFormatInfoDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/ExportMovieDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/HelpDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/MetaDataDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/NewVersionDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/OpenRemoteFileDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/PreferencesDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/TextDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/observation/ObservationDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/plugins/PluginsDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/pluginsOLD/AbstractPluginDialog.java

src/jhv/src/org/helioviewer/jhv/gui/dialogs/pluginsOLD/FilterPluginDialog.java

src/jhv/src/org/helioviewer/jhv/gui/interfaces/ShowableDialog.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/SOHOLUTFilterPlugin/SOHOLUTFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/channelMixer/ChannelMixerFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/contrast/ContrastFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/gammacorrection/GammaCorrectionFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/opacity/OpacityFilter.java

src/jhv/src/org/helioviewer/jhv/internal_plugins/filter/sharpen/SharpenGLFilter.java

src/jhv/src/org/helioviewer/jhv/io/DataSources.java

src/jhv/src/org/helioviewer/jhv/io/FileDownloader.java

src/jhv/src/org/helioviewer/jhv/layers/LayersModel.java

src/jhv/src/org/helioviewer/jhv/opengl/GLInfo.java

src/jhv/src/org/helioviewer/jhv/opengl/GLInitPanel.java

src/viewmodel/src/org/helioviewer/viewmodel/filter/GLFilter.java

src/viewmodel/src/org/helioviewer/viewmodel/filter/StandardFilter.java

src/viewmodel/src/org/helioviewer/viewmodel/metadata/HelioviewerMetaData.java

src/viewmodel/src/org/helioviewer/viewmodel/metadata/HelioviewerOcculterMetaData.java

src/viewmodel/src/org/helioviewer/viewmodel/metadata/MetaDataContainer.java

src/viewmodel/src/org/helioviewer/viewmodel/metadata/OcculterMetaData.java

src/viewmodel/src/org/helioviewer/viewmodel/renderer/GLCommonRenderGraphics.java

src/viewmodel/src/org/helioviewer/viewmodel/renderer/physical/GLPhysicalRenderGraphics.java

src/viewmodel/src/org/helioviewer/viewmodel/renderer/screen/GLScreenRenderGraphics.java

src/viewmodel/src/org/helioviewer/viewmodel/view/AbstractLayeredView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/ViewHelper.java

src/viewmodel/src/org/helioviewer/viewmodel/view/bufferedimage/BufferedImageComponentView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/bufferedimage/BufferedImageHelioviewerGeometryView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/bufferedimage/BufferedImageLayeredView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/fitsview/FITSImage.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/J2KReader.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/JHVJP2View.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/JP2Image.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/io/FixedSizedInputStream.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/io/http/HTTPSocket.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/io/jpip/JPIPDataInputStream.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/io/jpip/JPIPSocket.java

src/viewmodel/src/org/helioviewer/viewmodel/view/jp2view/kakadu/JHV_Kdu_cache.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/AbstractGLView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLComponentView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLFilterView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLHelioviewerGeometryView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLLayeredView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLOverlayView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLScalePowerOfTwoView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLSceneSaver.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLSolarRotationTrackingView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLSynchronizeOverviewChainView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLTextureHelper.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/GLView.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLFragmentShaderProgram.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLScalePowerOfTwoVertexShaderProgram.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLShaderBuilder.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLShaderHelper.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLSingleChannelLookupFragmentShaderProgram.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLTextureCoordinate.java

src/viewmodel/src/org/helioviewer/viewmodel/view/opengl/shader/GLVertexShaderProgram.java

Older »