Skip to content

Commit

Permalink
Update with RHESSI backend
Browse files Browse the repository at this point in the history
  • Loading branch information
dgarciabriseno committed Jun 10, 2024
1 parent 6b6066d commit 90805c5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion api
Submodule api updated 52 files
+10 −3 .github/workflows/php.yml
+6 −1 composer.json
+149 −137 composer.lock
+21 −9 docroot/index.php
+ docroot/resources/images/color-tables/RHESSI.png
+2 −2 docs/src/requirements.txt
+1 −0 docs/src/source/appendix/data_sources.rst
+81 −0 docs/src/source/appendix/data_sources/rhessi.rst
+2 −0 docs/src/source/appendix/helioviewer_event_format.rst
+0 −0 install/__test__/README.md
+0 −0 install/__test__/__init__.py
+0 −0 install/__test__/test_jp2.py
+189 −0 install/database/2024_04_03_rhessi.sql
+25 −31 install/downloader.py
+ install/helioviewer/__test__/__tdata__/2012_07_05__03_25_52_200__RHESSI_RHESSI_Back_Projection_25-50keV.jp2
+ install/helioviewer/__test__/__tdata__/2024_04_16__11_15_41_129__SDO_AIA_AIA_304.jp2
+ install/helioviewer/__test__/__tdata__/2024_04_16__13_00_13_908__SOHO_EIT_EIT_171.jp2
+1 −0 install/helioviewer/__test__/__tdata__/README.md
+ install/helioviewer/__test__/__tdata__/iris_1330A_20240415_060002.jp2
+34 −0 install/helioviewer/__test__/test_jp2parser.py
+144 −1 install/helioviewer/db.py
+8 −12 install/helioviewer/hvpull/browser/localbrowser.py
+0 −0 install/helioviewer/hvpull/downloader/__test__/__init__.py
+0 −0 install/helioviewer/hvpull/downloader/__test__/test_downloader_interface.py
+2 −0 install/helioviewer/hvpull/downloader/__test__/test_localmove.py
+0 −0 install/helioviewer/hvpull/downloader/__test__/test_urllib_downloader.py
+1 −1 install/helioviewer/hvpull/downloader/localmove.py
+6 −3 install/helioviewer/hvpull/net/daemon.py
+23 −0 install/helioviewer/hvpull/servers/rhessi.py
+3 −1 install/helioviewer/jp2.py
+59 −25 install/helioviewer/jp2parser.py
+2 −2 install/test_requirements.txt
+12 −2 management/data/get_jp2_info.py
+3 −4 scripts/gen_color_tables/gen_rgb.py
+7 −9 scripts/gen_color_tables/gen_rgb.sh
+2 −2 scripts/hv_stats/requirements.txt
+11 −1 settings/Config.Example.ini
+2 −0 src/Config.php
+1 −0 src/Helper/ErrorHandler.php
+4 −9 src/Helper/EventInterface.php
+6 −23 src/Image/Composite/HelioviewerCompositeImage.php
+48 −0 src/Image/Factory.php
+47 −0 src/Image/ImageType/RHESSIImage.php
+13 −16 src/Image/JPEG2000/JP2ImageXMLBox.php
+7 −3 src/Module/SolarEvents.php
+6 −35 src/Module/WebClient.php
+21 −0 src/Request/RequestException.php
+68 −0 src/Request/RequestParams.php
+16 −0 tests/unit_tests/jpeg2000/JP2ImageXMLBoxTest.php
+6 −1 tests/unit_tests/movies/reQueueMovieTest.php
+68 −0 tests/unit_tests/request/MockPhpStream.php
+118 −0 tests/unit_tests/request/RequestParamsTest.php
4 changes: 2 additions & 2 deletions compose/dockerfiles/db.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM mariadb
WORKDIR /root
RUN apt update
RUN apt install -y python3 python3-pip python3-dev default-libmysqlclient-dev build-essential pkg-config expect
RUN python3 -m pip install numpy sunpy glymur matplotlib scipy mysqlclient
RUN python3 -m pip install --break-system-packages numpy sunpy glymur matplotlib scipy mysqlclient

COPY api/install .
COPY compose/2021_06_01__00_01_21_347__SDO_AIA_AIA_171.jp2 img/2021_06_01__00_01_21_347__SDO_AIA_AIA_171.jp2
Expand All @@ -19,7 +19,7 @@ RUN mkdir -p /tmp/jp2
RUN cp img/* /tmp/jp2
RUN <<EOF
MARIADB_ROOT_PASSWORD=helioviewer docker-entrypoint.sh mariadbd &
sleep 5
sleep 10
./headless_setup.sh
mariadb -phelioviewer -e "CREATE USER 'helioviewer'@'%' IDENTIFIED BY 'helioviewer'"
mariadb -phelioviewer -e "GRANT ALL ON helioviewer.* to 'helioviewer'@'%'"
Expand Down
2 changes: 1 addition & 1 deletion helioviewer.org
Submodule helioviewer.org updated 35 files
+3 −0 .github/workflows/ci.yml
+0 −3 .gitignore
+2 −0 .htaccess
+49 −30 index.php
+1 −1 resources/css/dialogs.css
+9 −1 resources/css/helioviewer-web.css
+0 −4 resources/css/media-manager.css
+6 −6 resources/js/Events/EventMarker.js
+9 −24 resources/js/HelioviewerClient.js
+6 −7 resources/js/HelioviewerEmbeddedClient.js
+237 −246 resources/js/HelioviewerWebClient.js
+4 −4 resources/js/Image/JP2Image.js
+2 −2 resources/js/Media/MovieManager.js
+19 −19 resources/js/Media/MovieManagerUI.js
+16 −16 resources/js/Media/ScreenshotManagerUI.js
+7 −7 resources/js/Media/VideoPlayer.jsx
+5 −1 resources/js/Tiling/Manager/TileLayerManager.js
+13 −2 resources/js/UI/EventLayerAccordion.js
+26 −26 resources/js/UI/ImagePresets.js
+1 −1 resources/js/UI/ImageScale.js
+1 −1 resources/js/UI/ImageSelectTool.js
+4 −1 resources/js/UI/MessageConsole.js
+2 −2 resources/js/UI/TileLayerAccordion.js
+3 −21 resources/js/UI/TimeControls.js
+1 −1 resources/js/UI/TimeSelector.js
+7 −7 resources/js/UI/Timeline.js
+13 −13 resources/js/UI/TimelineEvents.js
+3 −3 resources/js/UI/UserVideoGallery.js
+2 −2 resources/js/UI/ZoomControls.js
+60 −9 resources/js/Utility/SettingsLoader.js
+1 −1 resources/js/Utility/Tutorial.js
+30 −8 resources/js/Utility/UserSettings.js
+8 −8 resources/js/Viewport/CelestialBodiesSatellites.js
+1 −1 resources/js/Viewport/Helper/MouseCoordinates.js
+2 −2 resources/js/test/VideoPlayer.test.js

0 comments on commit 90805c5

Please sign in to comment.