Preparing milky way disturbance feature

master
Zwarf 2022-06-14 22:55:03 +02:00
rodzic 0dc6550727
commit e3fec8f232
18 zmienionych plików z 346 dodań i 19 usunięć

Wyświetl plik

@ -34,7 +34,6 @@ Some of these formulas are from the excellent book by Jean Meeus "Astronomical A
- GTK 4 is used to create the GUI.
- Libadwaita is used to make the GUI adaptive.
- GDK and Cairo will probably be used for the plots.
- Shumate is used to show a map.
- Libgweather is used for the offline search functionality.

Wyświetl plik

@ -24,3 +24,19 @@ install_data(
'sun.svg',
install_dir: join_paths(get_option('datadir'), 'icons')
)
install_data(
'moon-full.svg',
install_dir: join_paths(get_option('datadir'), 'icons')
)
install_data(
'moon-waxing.svg',
install_dir: join_paths(get_option('datadir'), 'icons')
)
install_data(
'moon-waning.svg',
install_dir: join_paths(get_option('datadir'), 'icons')
)
install_data(
'moon-new.svg',
install_dir: join_paths(get_option('datadir'), 'icons')
)

Wyświetl plik

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Day 14</title>
<defs>
<filter x="-68.3%" y="-67.5%" width="236.6%" height="234.9%" filterUnits="objectBoundingBox" id="filter-1">
<feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.358965253 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
<feMerge>
<feMergeNode in="shadowMatrixOuter1"></feMergeNode>
<feMergeNode in="SourceGraphic"></feMergeNode>
</feMerge>
</filter>
<radialGradient cx="50%" cy="28.9877429%" fx="50%" fy="28.9877429%" r="71.8782602%" gradientTransform="translate(0.500000,0.289877),scale(1.000000,0.987952),rotate(90.000000),translate(-0.500000,-0.289877)" id="radialGradient-2">
<stop stop-color="#AFAFAF" offset="0%"></stop>
<stop stop-color="#575757" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="99.1586538%" id="linearGradient-3">
<stop stop-color="#A7A7A7" stop-opacity="0.93" offset="0%"></stop>
<stop stop-color="#757575" stop-opacity="0.93" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-4">
<stop stop-color="#7C7C7C" offset="0%"></stop>
<stop stop-color="#535353" offset="100%"></stop>
</linearGradient>
</defs>
<g id="Day-14" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" filter="url(#filter-1)" transform="translate(8.625000, 8.625000)">
<ellipse id="Oval" fill="url(#radialGradient-2)" cx="15.375" cy="15.5625" rx="15.375" ry="15.5625"></ellipse>
<path d="M25.1754584,4.43257316 L23.1463068,5.52088758 L21.8118118,6.50275679 L21.1245289,7.02984709 L23.1463068,9.76253186 L21.1245289,9.76253186 C21.2784314,9.82799677 20.9635205,10.0939148 20.1797961,10.5602859 C19.3960717,11.026657 18.8899148,11.4821481 18.6613252,11.9267592 L19.1228616,13.3732575 L20.1797961,13.9642903 C20.3514294,13.9642903 20.6663404,13.9642903 21.1245289,13.9642903 C21.5827175,13.9642903 22.079031,14.2590211 22.6134693,14.8484829 L22.6134693,15.993442 L24.3804529,15.993442 L25.6239231,17.6445031 L25.6239231,19.3017158 L22.6134693,19.970968 L21.1245289,17.6445031 L19.1228616,18.8206462 L19.1228616,22.2226762 L19.735227,23.3411564 L21.1245289,24.5085722 L19.1228616,25.230174 L18.6613252,26.2166258 L17.873663,26.8420631 L16.4733004,25.7373251 L15.375,24.5085722 L14.4733839,25.230174 L13.6021882,25.7373251 L12.1416827,24.5085722 L9.7201959,23.0570414 L8.45355933,24.5085722 L7.34156613,23.0570414 L6.33329846,21.3753528 L4.80852721,21.3753528 L3.69540981,21.3753528 L3.19264676,22.2226762 L2.47155352,23.0570414 L1.39811784,23.0570414 L0,17.6445031 L0,14.8484829 L0.755921836,10.5602859 L2.47155352,7.02984709 L4.80852721,4.43257316 L7.34156613,2.44522771 L11.5066718,0.742292363 L14.4733839,0 L16.9029952,0 L18.6613252,0.742292363 L19.1228616,1.79407267 L21.1245289,2.44522771 L21.8118118,3.97036633 L24.3804529,3.97036633 L25.1754584,4.43257316 Z" id="Path-6" fill="url(#linearGradient-3)"></path>
<path d="M24.3804529,4.38971377 L21.6879639,5.90039429 L21.999548,6.68397815 L21.999548,7.90277469 L20.4181077,8.991711 L18.8519451,10.5602859 L16.8947947,7.90277469 L17.4492134,6.68397815 L15.9791394,5.57071817 L16.8947947,5.08786326 C16.8129117,5.43951779 16.6398317,5.08699217 16.3755548,4.03028639 C16.1112778,2.9735806 16.1112778,2.44522771 16.3755548,2.44522771 L18.4436694,2.44522771 L21.6879639,4.03028639 L24.3804529,4.38971377 Z" id="Path-3" fill-opacity="0.68" fill="#606060"></path>
<path d="M7.3430321,9.74353338 L7.3430321,7.34755185 L10.5690336,4.87518196 L13.0482382,8.03786149 L14.3962919,8.03786149 L13.0482382,9.74353338 C12.8224689,12.6267253 13.1538202,14.0683212 14.0422921,14.0683212 C14.930764,14.0683212 15.048764,13.408902 14.3962919,12.0900635 L14.7949186,10.5602859 L15.9791394,10.5602859 L15.9791394,12.0900635 L17.0783278,13.2879537 L17.0783278,14.56766 L19.0935736,15.5625 L20.5982235,14.56766 L22.2681134,14.56766 L22.6134693,15.5625 L21.3667307,15.5625 L20.1797961,15.9155126 L19.9199751,16.7117609 L18.0030291,16.7117609 L16.5777829,15.5625 L15.9791394,15.9155126 L14.9782507,16.7117609 L14.9782507,17.6445031 L11.6055031,17.0102786 L9.8875689,16.2679042 L10.1683967,14.56766 L6.33329846,12.0900635 L7.3430321,9.74353338 Z" id="Path-4" fill-opacity="0.68" fill="#606060"></path>
<path d="M5.17627486,13.3732575 C5.2932913,14.8149824 5.67896583,15.7907335 6.33329846,16.3005107 C7.31479742,17.0651765 8.84061392,15.8933018 8.84061392,17.2344413 C8.84061392,18.1285342 9.78545027,18.5305155 11.675123,18.4403852 L14.4733839,18.9579136 C14.6717017,20.4010806 14.9722404,21.1226641 15.375,21.1226641 C15.7777596,21.1226641 15.9791394,20.4010806 15.9791394,18.9579136 L19.4980759,18.0461551 L19.4980759,19.862642 L21.8118118,18.0461551 L20.1797961,23.0570414 L21.8118118,23.4869631 C18.1216814,24.8162054 15.9760774,25.2408995 15.375,24.7610456 C14.7739226,24.2811917 14.4733839,24.2811917 14.4733839,24.7610456 L12.7493865,25.230174 L11.2568281,23.0570414 C10.8187946,22.770427 10.3065839,22.770427 9.7201959,23.0570414 C8.84061392,23.4869631 7.34156613,24.5117451 7.34156613,23.0570414 C7.34156613,22.087239 6.74183885,21.1863862 5.5423843,20.3544832 L3.57474887,19.862642 L4.04468845,21.1226641 L2.47155352,18.9579136 C3.52031014,19.1286205 4.04468845,18.824701 4.04468845,18.0461551 C4.04468845,17.2676092 4.42188392,15.7099767 5.17627486,13.3732575 Z" id="Path-5" fill-opacity="0.68" fill="#606060"></path>
<polygon id="Path-7" fill-opacity="0.68" fill="#606060" points="4.80843511 5.56805154 5.53980132 7.09602442 4.1741529 7.95683598 4.80843511 9.87754604 2.47155352 10.5602859 1.7121024 11.9934597 0.640294921 11.2598425"></polygon>
<polygon id="Path-9" fill-opacity="0.68" fill="#606060" points="14.4733839 0 14.4733839 2.44522771 12.8119615 1.82138541 12.8119615 3.43945225 14.8404495 5.56805154 13.8262055 5.56805154 10.5583974 2.78402577 10.5583974 3.43945225 10.0356971 3.9945139 7.47708039 5.56805154 6.8339959 3.9945139 4.81154179 3.9945139 7.47708039 2.78402577 8.80182407 1.82138541 10.5583974 0.859088694"></polygon>
<polygon id="Path-8" fill-opacity="0.68" fill="#606060" points="0 14.4889071 2.47155352 14.4889071 3.09004812 13.3732575 3.09004812 14.4889071 4.3382896 16.0347434 3.09004812 16.0347434 3.09004812 17.6445031 2.1691448 17.6445031 2.1691448 18.8289507 1.01076751 18.8289507 0.640294921 17.2383263 0 16.0347434"></polygon>
<ellipse id="Oval-Copy-2" stroke="url(#linearGradient-4)" stroke-width="2" cx="15.375" cy="15.5625" rx="15.375" ry="15.5625"></ellipse>
</g>
</g>
</svg>

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 7.0 KiB

Wyświetl plik

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Dark Inverted</title>
<defs>
<filter x="-68.3%" y="-67.5%" width="236.6%" height="234.9%" filterUnits="objectBoundingBox" id="filter-1">
<feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.358965253 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
<feMerge>
<feMergeNode in="shadowMatrixOuter1"></feMergeNode>
<feMergeNode in="SourceGraphic"></feMergeNode>
</feMerge>
</filter>
<radialGradient cx="50%" cy="28.9877429%" fx="50%" fy="28.9877429%" r="71.8782602%" gradientTransform="translate(0.500000,0.289877),scale(1.000000,0.987952),rotate(90.000000),translate(-0.500000,-0.289877)" id="radialGradient-2">
<stop stop-color="#AFAFAF" offset="0%"></stop>
<stop stop-color="#575757" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="99.1586538%" id="linearGradient-3">
<stop stop-color="#A7A7A7" stop-opacity="0.93" offset="0%"></stop>
<stop stop-color="#757575" stop-opacity="0.93" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-4">
<stop stop-color="#7C7C7C" offset="0%"></stop>
<stop stop-color="#535353" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="28.9877429%" x2="50%" y2="100%" id="linearGradient-5">
<stop stop-color="#000000" stop-opacity="0.648847247" offset="0%"></stop>
<stop stop-color="#000000" stop-opacity="0.704709353" offset="100%"></stop>
</linearGradient>
</defs>
<g id="Dark-Inverted" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" filter="url(#filter-1)" transform="translate(8.625000, 8.625000)">
<ellipse id="Oval" fill="url(#radialGradient-2)" cx="15.375" cy="15.5625" rx="15.375" ry="15.5625"></ellipse>
<path d="M25.1754584,4.43257316 L23.1463068,5.52088758 L21.8118118,6.50275679 L21.1245289,7.02984709 L23.1463068,9.76253186 L21.1245289,9.76253186 C21.2784314,9.82799677 20.9635205,10.0939148 20.1797961,10.5602859 C19.3960717,11.026657 18.8899148,11.4821481 18.6613252,11.9267592 L19.1228616,13.3732575 L20.1797961,13.9642903 C20.3514294,13.9642903 20.6663404,13.9642903 21.1245289,13.9642903 C21.5827175,13.9642903 22.079031,14.2590211 22.6134693,14.8484829 L22.6134693,15.993442 L24.3804529,15.993442 L25.6239231,17.6445031 L25.6239231,19.3017158 L22.6134693,19.970968 L21.1245289,17.6445031 L19.1228616,18.8206462 L19.1228616,22.2226762 L19.735227,23.3411564 L21.1245289,24.5085722 L19.1228616,25.230174 L18.6613252,26.2166258 L17.873663,26.8420631 L16.4733004,25.7373251 L15.375,24.5085722 L14.4733839,25.230174 L13.6021882,25.7373251 L12.1416827,24.5085722 L9.7201959,23.0570414 L8.45355933,24.5085722 L7.34156613,23.0570414 L6.33329846,21.3753528 L4.80852721,21.3753528 L3.69540981,21.3753528 L3.19264676,22.2226762 L2.47155352,23.0570414 L1.39811784,23.0570414 L0,17.6445031 L0,14.8484829 L0.755921836,10.5602859 L2.47155352,7.02984709 L4.80852721,4.43257316 L7.34156613,2.44522771 L11.5066718,0.742292363 L14.4733839,0 L16.9029952,0 L18.6613252,0.742292363 L19.1228616,1.79407267 L21.1245289,2.44522771 L21.8118118,3.97036633 L24.3804529,3.97036633 L25.1754584,4.43257316 Z" id="Path-6" fill="url(#linearGradient-3)"></path>
<path d="M24.3804529,4.38971377 L21.6879639,5.90039429 L21.999548,6.68397815 L21.999548,7.90277469 L20.4181077,8.991711 L18.8519451,10.5602859 L16.8947947,7.90277469 L17.4492134,6.68397815 L15.9791394,5.57071817 L16.8947947,5.08786326 C16.8129117,5.43951779 16.6398317,5.08699217 16.3755548,4.03028639 C16.1112778,2.9735806 16.1112778,2.44522771 16.3755548,2.44522771 L18.4436694,2.44522771 L21.6879639,4.03028639 L24.3804529,4.38971377 Z" id="Path-3" fill-opacity="0.68" fill="#606060"></path>
<path d="M7.3430321,9.74353338 L7.3430321,7.34755185 L10.5690336,4.87518196 L13.0482382,8.03786149 L14.3962919,8.03786149 L13.0482382,9.74353338 C12.8224689,12.6267253 13.1538202,14.0683212 14.0422921,14.0683212 C14.930764,14.0683212 15.048764,13.408902 14.3962919,12.0900635 L14.7949186,10.5602859 L15.9791394,10.5602859 L15.9791394,12.0900635 L17.0783278,13.2879537 L17.0783278,14.56766 L19.0935736,15.5625 L20.5982235,14.56766 L22.2681134,14.56766 L22.6134693,15.5625 L21.3667307,15.5625 L20.1797961,15.9155126 L19.9199751,16.7117609 L18.0030291,16.7117609 L16.5777829,15.5625 L15.9791394,15.9155126 L14.9782507,16.7117609 L14.9782507,17.6445031 L11.6055031,17.0102786 L9.8875689,16.2679042 L10.1683967,14.56766 L6.33329846,12.0900635 L7.3430321,9.74353338 Z" id="Path-4" fill-opacity="0.68" fill="#606060"></path>
<path d="M5.17627486,13.3732575 C5.2932913,14.8149824 5.67896583,15.7907335 6.33329846,16.3005107 C7.31479742,17.0651765 8.84061392,15.8933018 8.84061392,17.2344413 C8.84061392,18.1285342 9.78545027,18.5305155 11.675123,18.4403852 L14.4733839,18.9579136 C14.6717017,20.4010806 14.9722404,21.1226641 15.375,21.1226641 C15.7777596,21.1226641 15.9791394,20.4010806 15.9791394,18.9579136 L19.4980759,18.0461551 L19.4980759,19.862642 L21.8118118,18.0461551 L20.1797961,23.0570414 L21.8118118,23.4869631 C18.1216814,24.8162054 15.9760774,25.2408995 15.375,24.7610456 C14.7739226,24.2811917 14.4733839,24.2811917 14.4733839,24.7610456 L12.7493865,25.230174 L11.2568281,23.0570414 C10.8187946,22.770427 10.3065839,22.770427 9.7201959,23.0570414 C8.84061392,23.4869631 7.34156613,24.5117451 7.34156613,23.0570414 C7.34156613,22.087239 6.74183885,21.1863862 5.5423843,20.3544832 L3.57474887,19.862642 L4.04468845,21.1226641 L2.47155352,18.9579136 C3.52031014,19.1286205 4.04468845,18.824701 4.04468845,18.0461551 C4.04468845,17.2676092 4.42188392,15.7099767 5.17627486,13.3732575 Z" id="Path-5" fill-opacity="0.68" fill="#606060"></path>
<polygon id="Path-7" fill-opacity="0.68" fill="#606060" points="4.80843511 5.56805154 5.53980132 7.09602442 4.1741529 7.95683598 4.80843511 9.87754604 2.47155352 10.5602859 1.7121024 11.9934597 0.640294921 11.2598425"></polygon>
<polygon id="Path-9" fill-opacity="0.68" fill="#606060" points="14.4733839 0 14.4733839 2.44522771 12.8119615 1.82138541 12.8119615 3.43945225 14.8404495 5.56805154 13.8262055 5.56805154 10.5583974 2.78402577 10.5583974 3.43945225 10.0356971 3.9945139 7.47708039 5.56805154 6.8339959 3.9945139 4.81154179 3.9945139 7.47708039 2.78402577 8.80182407 1.82138541 10.5583974 0.859088694"></polygon>
<polygon id="Path-8" fill-opacity="0.68" fill="#606060" points="0 14.4889071 2.47155352 14.4889071 3.09004812 13.3732575 3.09004812 14.4889071 4.3382896 16.0347434 3.09004812 16.0347434 3.09004812 17.6445031 2.1691448 17.6445031 2.1691448 18.8289507 1.01076751 18.8289507 0.640294921 17.2383263 0 16.0347434"></polygon>
<ellipse id="Oval-Copy-2" stroke="url(#linearGradient-4)" stroke-width="2" cx="15.375" cy="15.5625" rx="15.375" ry="15.5625"></ellipse>
<ellipse id="Oval" stroke-opacity="0.467466128" stroke="#000000" fill="url(#linearGradient-5)" cx="15.375" cy="15.5625" rx="15.875" ry="16.0625"></ellipse>
</g>
</g>
</svg>

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 7.5 KiB

Wyświetl plik

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Day 23</title>
<defs>
<filter x="-63.7%" y="-61.7%" width="230.1%" height="222.3%" filterUnits="objectBoundingBox" id="filter-1">
<feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.358965253 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
<feMerge>
<feMergeNode in="shadowMatrixOuter1"></feMergeNode>
<feMergeNode in="SourceGraphic"></feMergeNode>
</feMerge>
</filter>
<radialGradient cx="50%" cy="28.9877429%" fx="50%" fy="28.9877429%" r="71.8782602%" gradientTransform="translate(0.500000,0.289877),scale(1.000000,0.987952),rotate(90.000000),translate(-0.500000,-0.289877)" id="radialGradient-2">
<stop stop-color="#AFAFAF" offset="0%"></stop>
<stop stop-color="#575757" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="99.1586538%" id="linearGradient-3">
<stop stop-color="#A7A7A7" stop-opacity="0.93" offset="0%"></stop>
<stop stop-color="#757575" stop-opacity="0.93" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-4">
<stop stop-color="#7C7C7C" offset="0%"></stop>
<stop stop-color="#535353" offset="100%"></stop>
</linearGradient>
<radialGradient cx="16.2914734%" cy="50%" fx="16.2914734%" fy="50%" r="52.6021143%" gradientTransform="translate(0.162915,0.500000),scale(1.000000,0.939394),scale(1.000000,1.431715),translate(-0.162915,-0.500000)" id="radialGradient-5">
<stop stop-color="#000000" offset="0%"></stop>
<stop stop-color="#000000" stop-opacity="0.823646684" offset="71.4980332%"></stop>
<stop stop-color="#000000" stop-opacity="0.766986593" offset="82.8015734%"></stop>
<stop stop-color="#000000" stop-opacity="0.683355212" offset="88.4205638%"></stop>
<stop stop-color="#000000" stop-opacity="0.339534823" offset="93.8947771%"></stop>
<stop stop-color="#000000" stop-opacity="0" offset="100%"></stop>
</radialGradient>
</defs>
<g id="Day-23" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" filter="url(#filter-1)" transform="translate(7.759036, 7.980183)">
<ellipse id="Oval" fill="url(#radialGradient-2)" cx="16.2409639" cy="16.2073171" rx="15.375" ry="15.5625"></ellipse>
<path d="M26.0414223,5.07739024 L24.0122706,6.16570466 L22.6777757,7.14757386 L21.9904928,7.67466416 L24.0122706,10.4073489 L21.9904928,10.4073489 C22.1443953,10.4728138 21.8294843,10.7387318 21.04576,11.2051029 C20.2620356,11.671474 19.7558786,12.1269652 19.527289,12.5715763 L19.9888255,14.0180746 L21.04576,14.6091073 C21.2173933,14.6091073 21.5323042,14.6091073 21.9904928,14.6091073 C22.4486814,14.6091073 22.9449948,14.9038382 23.4794331,15.4933 L23.4794331,16.638259 L25.2464167,16.638259 L26.4898869,18.2893202 L26.4898869,19.9465329 L23.4794331,20.6157851 L21.9904928,18.2893202 L19.9888255,19.4654633 L19.9888255,22.8674932 L20.6011909,23.9859734 L21.9904928,25.1533892 L19.9888255,25.8749911 L19.527289,26.8614429 L18.7396269,27.4868802 L17.3392642,26.3821421 L16.2409639,25.1533892 L15.3393477,25.8749911 L14.468152,26.3821421 L13.0076465,25.1533892 L10.5861598,23.7018585 L9.31952319,25.1533892 L8.20752998,23.7018585 L7.19926232,22.0201699 L5.67449106,22.0201699 L4.56137367,22.0201699 L4.05861062,22.8674932 L3.33751737,23.7018585 L2.2640817,23.7018585 L0.865963855,18.2893202 L0.865963855,15.4933 L1.62188569,11.2051029 L3.33751737,7.67466416 L5.67449106,5.07739024 L8.20752998,3.09004478 L12.3726356,1.38710944 L15.3393477,0.644817073 L17.768959,0.644817073 L19.527289,1.38710944 L19.9888255,2.43888974 L21.9904928,3.09004478 L22.6777757,4.6151834 L25.2464167,4.6151834 L26.0414223,5.07739024 Z" id="Path-6" fill="url(#linearGradient-3)"></path>
<path d="M25.2464167,5.03453084 L22.5539277,6.54521136 L22.8655119,7.32879522 L22.8655119,8.54759176 L21.2840716,9.63652808 L19.717909,11.2051029 L17.7607585,8.54759176 L18.3151773,7.32879522 L16.8451032,6.21553524 L17.7607585,5.73268034 C17.6788756,6.08433487 17.5057956,5.73180924 17.2415186,4.67510346 C16.9772417,3.61839768 16.9772417,3.09004478 17.2415186,3.09004478 L19.3096332,3.09004478 L22.5539277,4.67510346 L25.2464167,5.03453084 Z" id="Path-3" fill-opacity="0.68" fill="#606060"></path>
<path d="M8.20899596,10.3883505 L8.20899596,7.99236893 L11.4349974,5.51999903 L13.9142021,8.68267856 L15.2622558,8.68267856 L13.9142021,10.3883505 C13.6884328,13.2715424 14.0197841,14.7131383 14.908256,14.7131383 C15.7967279,14.7131383 15.9147278,14.0537191 15.2622558,12.7348806 L15.6608825,11.2051029 L16.8451032,11.2051029 L16.8451032,12.7348806 L17.9442916,13.9327708 L17.9442916,15.212477 L19.9595375,16.2073171 L21.4641873,15.212477 L23.1340773,15.212477 L23.4794331,16.2073171 L22.2326945,16.2073171 L21.04576,16.5603297 L20.785939,17.356578 L18.868993,17.356578 L17.4437468,16.2073171 L16.8451032,16.5603297 L15.8442145,17.356578 L15.8442145,18.2893202 L12.471467,17.6550957 L10.7535328,16.9127213 L11.0343605,15.212477 L7.19926232,12.7348806 L8.20899596,10.3883505 Z" id="Path-4" fill-opacity="0.68" fill="#606060"></path>
<path d="M6.04223872,14.0180746 C6.15925515,15.4597995 6.54492969,16.4355506 7.19926232,16.9453278 C8.18076127,17.7099936 9.70657778,16.5381189 9.70657778,17.8792583 C9.70657778,18.7733513 10.6514141,19.1753326 12.5410868,19.0852023 L15.3393477,19.6027307 C15.5376656,21.0458977 15.8382043,21.7674812 16.2409639,21.7674812 C16.6437234,21.7674812 16.8451032,21.0458977 16.8451032,19.6027307 L20.3640397,18.6909722 L20.3640397,20.507459 L22.6777757,18.6909722 L21.04576,23.7018585 L22.6777757,24.1317802 C18.9876452,25.4610225 16.8420413,25.8857166 16.2409639,25.4058627 C15.6398864,24.9260088 15.3393477,24.9260088 15.3393477,25.4058627 L13.6153503,25.8749911 L12.1227919,23.7018585 C11.6847585,23.415244 11.1725477,23.415244 10.5861598,23.7018585 C9.70657778,24.1317802 8.20752998,25.1565622 8.20752998,23.7018585 C8.20752998,22.7320561 7.60780271,21.8312033 6.40834815,20.9993003 L4.44071272,20.507459 L4.91065231,21.7674812 L3.33751737,19.6027307 C4.386274,19.7734375 4.91065231,19.469518 4.91065231,18.6909722 C4.91065231,17.9124263 5.28784778,16.3547938 6.04223872,14.0180746 Z" id="Path-5" fill-opacity="0.68" fill="#606060"></path>
<polygon id="Path-7" fill-opacity="0.68" fill="#606060" points="5.67439896 6.21286861 6.40576517 7.74084149 5.04011676 8.60165305 5.67439896 10.5223631 3.33751737 11.2051029 2.57806625 12.6382768 1.50625878 11.9046596"></polygon>
<polygon id="Path-9" fill-opacity="0.68" fill="#606060" points="15.3393477 0.644817073 15.3393477 3.09004478 13.6779254 2.46620248 13.6779254 4.08426932 15.7064134 6.21286861 14.6921694 6.21286861 11.4243613 3.42884284 11.4243613 4.08426932 10.901661 4.63933097 8.34304424 6.21286861 7.69995976 4.63933097 5.67750565 4.63933097 8.34304424 3.42884284 9.66778793 2.46620248 11.4243613 1.50390577"></polygon>
<polygon id="Path-8" fill-opacity="0.68" fill="#606060" points="0.865963855 15.1337242 3.33751737 15.1337242 3.95601198 14.0180746 3.95601198 15.1337242 5.20425346 16.6795605 3.95601198 16.6795605 3.95601198 18.2893202 3.03510866 18.2893202 3.03510866 19.4737678 1.87673136 19.4737678 1.50625878 17.8831433 0.865963855 16.6795605"></polygon>
<ellipse id="Oval-Copy-2" stroke="url(#linearGradient-4)" stroke-width="2" cx="16.2409639" cy="16.2073171" rx="15.375" ry="15.5625"></ellipse>
<ellipse id="Oval" fill="url(#radialGradient-5)" transform="translate(15.500000, 16.500000) scale(-1, 1) translate(-15.500000, -16.500000) " cx="15.5" cy="16.5" rx="15.5" ry="16.5"></ellipse>
</g>
</g>
</svg>

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 8.1 KiB

Wyświetl plik

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Day 6</title>
<defs>
<filter x="-63.7%" y="-61.7%" width="230.1%" height="222.3%" filterUnits="objectBoundingBox" id="filter-1">
<feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.358965253 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
<feMerge>
<feMergeNode in="shadowMatrixOuter1"></feMergeNode>
<feMergeNode in="SourceGraphic"></feMergeNode>
</feMerge>
</filter>
<radialGradient cx="50%" cy="28.9877429%" fx="50%" fy="28.9877429%" r="71.8782602%" gradientTransform="translate(0.500000,0.289877),scale(1.000000,0.987952),rotate(90.000000),translate(-0.500000,-0.289877)" id="radialGradient-2">
<stop stop-color="#AFAFAF" offset="0%"></stop>
<stop stop-color="#575757" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="99.1586538%" id="linearGradient-3">
<stop stop-color="#A7A7A7" stop-opacity="0.93" offset="0%"></stop>
<stop stop-color="#757575" stop-opacity="0.93" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-4">
<stop stop-color="#7C7C7C" offset="0%"></stop>
<stop stop-color="#535353" offset="100%"></stop>
</linearGradient>
<radialGradient cx="16.2914734%" cy="50%" fx="16.2914734%" fy="50%" r="52.6021143%" gradientTransform="translate(0.162915,0.500000),scale(1.000000,0.939394),scale(1.000000,1.431715),translate(-0.162915,-0.500000)" id="radialGradient-5">
<stop stop-color="#000000" offset="0%"></stop>
<stop stop-color="#000000" stop-opacity="0.823646684" offset="71.4980332%"></stop>
<stop stop-color="#000000" stop-opacity="0.766986593" offset="82.8015734%"></stop>
<stop stop-color="#000000" stop-opacity="0.683355212" offset="88.4205638%"></stop>
<stop stop-color="#000000" stop-opacity="0.339534823" offset="93.8947771%"></stop>
<stop stop-color="#000000" stop-opacity="0" offset="100%"></stop>
</radialGradient>
</defs>
<g id="Day-6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" filter="url(#filter-1)" transform="translate(7.759036, 7.980183)">
<ellipse id="Oval" fill="url(#radialGradient-2)" cx="16.2409639" cy="16.2073171" rx="15.375" ry="15.5625"></ellipse>
<path d="M26.0414223,5.07739024 L24.0122706,6.16570466 L22.6777757,7.14757386 L21.9904928,7.67466416 L24.0122706,10.4073489 L21.9904928,10.4073489 C22.1443953,10.4728138 21.8294843,10.7387318 21.04576,11.2051029 C20.2620356,11.671474 19.7558786,12.1269652 19.527289,12.5715763 L19.9888255,14.0180746 L21.04576,14.6091073 C21.2173933,14.6091073 21.5323042,14.6091073 21.9904928,14.6091073 C22.4486814,14.6091073 22.9449948,14.9038382 23.4794331,15.4933 L23.4794331,16.638259 L25.2464167,16.638259 L26.4898869,18.2893202 L26.4898869,19.9465329 L23.4794331,20.6157851 L21.9904928,18.2893202 L19.9888255,19.4654633 L19.9888255,22.8674932 L20.6011909,23.9859734 L21.9904928,25.1533892 L19.9888255,25.8749911 L19.527289,26.8614429 L18.7396269,27.4868802 L17.3392642,26.3821421 L16.2409639,25.1533892 L15.3393477,25.8749911 L14.468152,26.3821421 L13.0076465,25.1533892 L10.5861598,23.7018585 L9.31952319,25.1533892 L8.20752998,23.7018585 L7.19926232,22.0201699 L5.67449106,22.0201699 L4.56137367,22.0201699 L4.05861062,22.8674932 L3.33751737,23.7018585 L2.2640817,23.7018585 L0.865963855,18.2893202 L0.865963855,15.4933 L1.62188569,11.2051029 L3.33751737,7.67466416 L5.67449106,5.07739024 L8.20752998,3.09004478 L12.3726356,1.38710944 L15.3393477,0.644817073 L17.768959,0.644817073 L19.527289,1.38710944 L19.9888255,2.43888974 L21.9904928,3.09004478 L22.6777757,4.6151834 L25.2464167,4.6151834 L26.0414223,5.07739024 Z" id="Path-6" fill="url(#linearGradient-3)"></path>
<path d="M25.2464167,5.03453084 L22.5539277,6.54521136 L22.8655119,7.32879522 L22.8655119,8.54759176 L21.2840716,9.63652808 L19.717909,11.2051029 L17.7607585,8.54759176 L18.3151773,7.32879522 L16.8451032,6.21553524 L17.7607585,5.73268034 C17.6788756,6.08433487 17.5057956,5.73180924 17.2415186,4.67510346 C16.9772417,3.61839768 16.9772417,3.09004478 17.2415186,3.09004478 L19.3096332,3.09004478 L22.5539277,4.67510346 L25.2464167,5.03453084 Z" id="Path-3" fill-opacity="0.68" fill="#606060"></path>
<path d="M8.20899596,10.3883505 L8.20899596,7.99236893 L11.4349974,5.51999903 L13.9142021,8.68267856 L15.2622558,8.68267856 L13.9142021,10.3883505 C13.6884328,13.2715424 14.0197841,14.7131383 14.908256,14.7131383 C15.7967279,14.7131383 15.9147278,14.0537191 15.2622558,12.7348806 L15.6608825,11.2051029 L16.8451032,11.2051029 L16.8451032,12.7348806 L17.9442916,13.9327708 L17.9442916,15.212477 L19.9595375,16.2073171 L21.4641873,15.212477 L23.1340773,15.212477 L23.4794331,16.2073171 L22.2326945,16.2073171 L21.04576,16.5603297 L20.785939,17.356578 L18.868993,17.356578 L17.4437468,16.2073171 L16.8451032,16.5603297 L15.8442145,17.356578 L15.8442145,18.2893202 L12.471467,17.6550957 L10.7535328,16.9127213 L11.0343605,15.212477 L7.19926232,12.7348806 L8.20899596,10.3883505 Z" id="Path-4" fill-opacity="0.68" fill="#606060"></path>
<path d="M6.04223872,14.0180746 C6.15925515,15.4597995 6.54492969,16.4355506 7.19926232,16.9453278 C8.18076127,17.7099936 9.70657778,16.5381189 9.70657778,17.8792583 C9.70657778,18.7733513 10.6514141,19.1753326 12.5410868,19.0852023 L15.3393477,19.6027307 C15.5376656,21.0458977 15.8382043,21.7674812 16.2409639,21.7674812 C16.6437234,21.7674812 16.8451032,21.0458977 16.8451032,19.6027307 L20.3640397,18.6909722 L20.3640397,20.507459 L22.6777757,18.6909722 L21.04576,23.7018585 L22.6777757,24.1317802 C18.9876452,25.4610225 16.8420413,25.8857166 16.2409639,25.4058627 C15.6398864,24.9260088 15.3393477,24.9260088 15.3393477,25.4058627 L13.6153503,25.8749911 L12.1227919,23.7018585 C11.6847585,23.415244 11.1725477,23.415244 10.5861598,23.7018585 C9.70657778,24.1317802 8.20752998,25.1565622 8.20752998,23.7018585 C8.20752998,22.7320561 7.60780271,21.8312033 6.40834815,20.9993003 L4.44071272,20.507459 L4.91065231,21.7674812 L3.33751737,19.6027307 C4.386274,19.7734375 4.91065231,19.469518 4.91065231,18.6909722 C4.91065231,17.9124263 5.28784778,16.3547938 6.04223872,14.0180746 Z" id="Path-5" fill-opacity="0.68" fill="#606060"></path>
<polygon id="Path-7" fill-opacity="0.68" fill="#606060" points="5.67439896 6.21286861 6.40576517 7.74084149 5.04011676 8.60165305 5.67439896 10.5223631 3.33751737 11.2051029 2.57806625 12.6382768 1.50625878 11.9046596"></polygon>
<polygon id="Path-9" fill-opacity="0.68" fill="#606060" points="15.3393477 0.644817073 15.3393477 3.09004478 13.6779254 2.46620248 13.6779254 4.08426932 15.7064134 6.21286861 14.6921694 6.21286861 11.4243613 3.42884284 11.4243613 4.08426932 10.901661 4.63933097 8.34304424 6.21286861 7.69995976 4.63933097 5.67750565 4.63933097 8.34304424 3.42884284 9.66778793 2.46620248 11.4243613 1.50390577"></polygon>
<polygon id="Path-8" fill-opacity="0.68" fill="#606060" points="0.865963855 15.1337242 3.33751737 15.1337242 3.95601198 14.0180746 3.95601198 15.1337242 5.20425346 16.6795605 3.95601198 16.6795605 3.95601198 18.2893202 3.03510866 18.2893202 3.03510866 19.4737678 1.87673136 19.4737678 1.50625878 17.8831433 0.865963855 16.6795605"></polygon>
<ellipse id="Oval-Copy-2" stroke="url(#linearGradient-4)" stroke-width="2" cx="16.2409639" cy="16.2073171" rx="15.375" ry="15.5625"></ellipse>
<ellipse id="Oval" fill="url(#radialGradient-5)" cx="15.5" cy="16.5" rx="15.5" ry="16.5"></ellipse>
</g>
</g>
</svg>

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 8.0 KiB

Wyświetl plik

@ -66,7 +66,7 @@ double
}
int
double
picplanner_get_illumination (GDateTime *date_time)
{
double illumination;
@ -88,7 +88,7 @@ picplanner_get_illumination (GDateTime *date_time)
g_free (coordinates_moon);
g_free (coordinates_sun);
return (int)round (illumination*100);
return illumination*100.;
}

Wyświetl plik

@ -23,7 +23,7 @@
double
*picplanner_get_coordinates_rotational_moon (GDateTime *date_time);
int
double
picplanner_get_illumination (GDateTime *date_time);
double

Wyświetl plik

@ -9,6 +9,10 @@
<file>window/milky-way-page/milky-way-view.ui</file>
<file>../data/icons/location-icon-symbolic-red.svg</file>
<file>../data/icons/sun.svg</file>
<file>../data/icons/moon-full.svg</file>
<file>../data/icons/moon-waxing.svg</file>
<file>../data/icons/moon-waning.svg</file>
<file>../data/icons/moon-new.svg</file>
</gresource>
<gresource prefix="/de/zwarf/picplanner/icons/scalable/actions/">
<file alias="milky-way-symbolic.svg">../data/icons/milky-way-symbolic.svg</file>

Wyświetl plik

@ -18,7 +18,6 @@
/* TODO:
* Error handling for no rise and set
* Visibility feature
*/
@ -35,6 +34,9 @@ struct _PicplannerMilkyway
GtkWidget *label_upper_elevation;
GtkWidget *label_set_time;
GtkWidget *label_set_azimuth;
GtkWidget *label_disturbance_sun;
GtkWidget *label_disturbance_moon;
GtkWidget *label_visibility_time;
};
G_DEFINE_TYPE (PicplannerMilkyway, picplanner_milkyway, GTK_TYPE_BOX)
@ -119,6 +121,65 @@ picplanner_milky_way_set_rise_upper_set (PicplannerMilkyway *milky_way,
g_date_time_unref (date_time_set);
}
void
picplanner_milky_way_set_disturbance (PicplannerMilkyway *milky_way,
GDateTime *date_time_noon,
int *dark_blue_golden_index_sun,
int *rise_upper_set_index_moon,
int *rise_upper_set_index_milky_way,
double illumination_moon)
{
char *char_label_disturbance_sun;
char *char_label_visibility_time;
GDateTime *date_time_dark_end;
GDateTime *date_time_dark_begin;
GDateTime *date_time_rise_moon;
GDateTime *date_time_set_moon;
GDateTime *date_time_rise_milky_way;
GDateTime *date_time_set_milky_way;
date_time_dark_end = g_date_time_add_minutes (date_time_noon,
dark_blue_golden_index_sun[0]*24*60/NUM_DATA_POINTS-12*60);
date_time_dark_begin = g_date_time_add_minutes (date_time_noon,
dark_blue_golden_index_sun[7]*24*60/NUM_DATA_POINTS-12*60);
char_label_disturbance_sun = g_strdup_printf ("%02d:%02d - %02d:%02d",
g_date_time_get_hour (date_time_dark_end),
g_date_time_get_minute (date_time_dark_end),
g_date_time_get_hour (date_time_dark_begin),
g_date_time_get_minute (date_time_dark_begin));
date_time_rise_moon = g_date_time_add_minutes (date_time_noon,
rise_upper_set_index_moon[0]*24*60/NUM_DATA_POINTS-12*60);
date_time_set_moon = g_date_time_add_minutes (date_time_noon,
rise_upper_set_index_moon[2]*24*60/NUM_DATA_POINTS-12*60);
date_time_rise_milky_way = g_date_time_add_minutes (date_time_noon,
rise_upper_set_index_milky_way[0]*24*60/NUM_DATA_POINTS-12*60);
date_time_set_milky_way = g_date_time_add_minutes (date_time_noon,
rise_upper_set_index_milky_way[2]*24*60/NUM_DATA_POINTS-12*60);
/*
gint64 time_diff_dark;
gint64 time_diff_dark_moon_rise;
gint64 time_diff_dark_moon_set;
time_diff_dark = g_date_time_difference (date_time_dark_end, date_time_dark_begin);
time_diff_dark_moon_rise = g_date_time_difference (date_time_rise_moon, date_time)
g_print ("time_diff: %ld\n", time_diff_dark/1000/1000/60);
g_print ("Begin: %02d:%02d, End: %02d:%02d\n",
g_date_time_get_hour (date_time_dark_begin),
g_date_time_get_minute (date_time_dark_begin),
g_date_time_get_hour (date_time_dark_end),
g_date_time_get_minute (date_time_dark_end));
*/
g_date_time_unref (date_time_dark_end);
g_date_time_unref (date_time_dark_begin);
}
static void
picplanner_milkyway_init (PicplannerMilkyway *self)
@ -138,6 +199,9 @@ picplanner_milkyway_class_init (PicplannerMilkywayClass *class)
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_upper_elevation);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_set_time);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_set_azimuth);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_disturbance_sun);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_disturbance_moon);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_visibility_time);
}
PicplannerMilkyway *

Wyświetl plik

@ -33,6 +33,14 @@ picplanner_milky_way_set_rise_upper_set (PicplannerMilkyway *milky_way,
double *coordinates_array,
int *index_rise_upper_set);
void
picplanner_milky_way_set_disturbance (PicplannerMilkyway *milky_way,
GDateTime *date_time_noon,
int *dark_blue_golden_index_sun,
int *rise_upper_set_index_moon,
int *rise_upper_set_index_milky_way,
double illumination_moon);
PicplannerMilkyway *picplanner_milkyway_new ();

Wyświetl plik

@ -181,13 +181,13 @@
<child>
<object class="AdwActionRow">
<property name="title">Visibility Rating</property>
<property name="title">Milky Way visibility time</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="label_visibility">
<object class="GtkLabel" id="label_visibility_time">
<property name="label">Feature will be available soon!</property>
</object>
</child>

Wyświetl plik

@ -37,6 +37,7 @@ struct _PicplannerMoon
GtkWidget *label_set_time;
GtkWidget *label_set_azimuth;
GtkWidget *label_illumination;
GtkWidget *label_phase;
};
G_DEFINE_TYPE (PicplannerMoon, picplanner_moon, GTK_TYPE_BOX)
@ -124,12 +125,15 @@ picplanner_moon_set_rise_upper_set (PicplannerMoon *moon,
void
picplanner_moon_set_illumination_intensity (PicplannerMoon *moon,
int illumination)
double illumination,
char *phase)
{
char *char_label_illumination;
char_label_illumination = g_strdup_printf ("%d%%", illumination);
char_label_illumination = g_strdup_printf ("%d%%", (int)round(illumination));
gtk_label_set_text (GTK_LABEL (moon->label_illumination), char_label_illumination);
gtk_label_set_text (GTK_LABEL (moon->label_phase), phase);
g_free (char_label_illumination);
}
@ -153,6 +157,7 @@ picplanner_moon_class_init (PicplannerMoonClass *class)
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_set_time);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_set_azimuth);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_illumination);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_phase);
}
PicplannerMoon *

Wyświetl plik

@ -36,7 +36,8 @@ picplanner_moon_set_rise_upper_set (PicplannerMoon *moon,
void
picplanner_moon_set_illumination_intensity (PicplannerMoon *moon,
int illumination);
double illumination,
char *phase);
PicplannerMoon *picplanner_moon_new ();

Wyświetl plik

@ -160,8 +160,8 @@
<object class="AdwActionRow">
<property name="title">Phase Trend</property>
<child>
<object class="GtkLabel" id="label-phase-trend">
<property name="label">Feature will be available soon!</property>
<object class="GtkLabel" id="label_phase">
<property name="label">--</property>
</object>
</child>
</object>

Wyświetl plik

@ -460,7 +460,8 @@ void
picplanner_overview_update_map_moon (PicplannerOverview *overview,
double *array_coordinates_moon,
int current_index,
int *rise_upper_set_moon)
int *rise_upper_set_moon,
int phase_moon_index)
{
int moon_stroke_width = 6;
static GdkRGBA moon_color = {0.8, 0.8, 0.8, 0.8};
@ -479,7 +480,15 @@ picplanner_overview_update_map_moon (PicplannerOverview *overview,
if (array_coordinates_moon[current_index*2+1]<0)
visible_moon = FALSE;
image_moon = gtk_image_new_from_icon_name ("weather-clear-night-symbolic");
if (phase_moon_index == 0)
image_moon = gtk_image_new_from_icon_name ("moon-full");
else if (phase_moon_index == 1)
image_moon = gtk_image_new_from_icon_name ("moon-waxing");
else if (phase_moon_index == 2)
image_moon = gtk_image_new_from_icon_name ("moon-waning");
else
image_moon = gtk_image_new_from_icon_name ("moon-new");
gtk_image_set_pixel_size (GTK_IMAGE (image_moon), ICON_SIZE_LARGE);
gtk_widget_set_visible (image_moon, visible_moon);

Wyświetl plik

@ -71,7 +71,8 @@ void
picplanner_overview_update_map_moon (PicplannerOverview *overview,
double *array_coordinates_moon,
int current_index,
int *rise_upper_set_moon);
int *rise_upper_set_moon,
int phase_moon_index);
void
picplanner_overview_update_map_milky_way (PicplannerOverview *overview,

Wyświetl plik

@ -215,7 +215,9 @@ static void
calculate_positions (PicplannerWindow *window)
{
int current_index;
int illumination;
int phase_moon_index;
char *phase_moon;
int *rise_upper_set_index_sun;
int *rise_upper_set_index_moon;
@ -228,8 +230,10 @@ calculate_positions (PicplannerWindow *window)
GDateTime *date_time;
GDateTime *date_time_noon;
GDateTime *date_time_later;
double longitude, latitude;
double illumination_moon, illumination_moon_later;
longitude = gtk_spin_button_get_value (GTK_SPIN_BUTTON (window->east_entry));
latitude = gtk_spin_button_get_value (GTK_SPIN_BUTTON (window->north_entry));
@ -300,9 +304,32 @@ calculate_positions (PicplannerWindow *window)
rise_upper_set_index_moon);
illumination = picplanner_get_illumination (date_time);
date_time_later = g_date_time_add_hours (date_time, 1);
illumination_moon = picplanner_get_illumination (date_time);
illumination_moon_later = picplanner_get_illumination (date_time_later);
if (illumination_moon > 99.5)
{
phase_moon_index = 0;
phase_moon = g_strdup_printf ("Full Moon");
}
else if (illumination_moon_later >= illumination_moon && illumination_moon > 0.5)
{
phase_moon_index = 1;
phase_moon = g_strdup_printf ("Waxing Moon");
}
else if (illumination_moon_later < illumination_moon && illumination_moon > 0.5)
{
phase_moon_index = 2;
phase_moon = g_strdup_printf ("Waning Moon");
}
else
{
phase_moon_index = 3;
phase_moon = g_strdup_printf ("New Moon");
}
picplanner_moon_set_illumination_intensity (PICPLANNER_MOON (window->moon_box),
illumination);
illumination_moon,
phase_moon);
/* Milky Way */
@ -322,6 +349,14 @@ calculate_positions (PicplannerWindow *window)
array_coordinates_milky_way,
rise_upper_set_index_milky_way);
/*
picplanner_milky_way_set_disturbance (PICPLANNER_MILKYWAY (window->milky_way_box),
date_time_noon,
dark_blue_golden_index,
rise_upper_set_index_moon,
rise_upper_set_index_milky_way,
illumination_moon);
*/
/*
* Update Shumate Map
@ -343,7 +378,8 @@ calculate_positions (PicplannerWindow *window)
picplanner_overview_update_map_moon (PICPLANNER_OVERVIEW (window->overview_box),
array_coordinates_moon,
current_index,
rise_upper_set_index_moon);
rise_upper_set_index_moon,
phase_moon_index);
}
if (g_settings_get_boolean (window->settings, "milky-way-visible"))
@ -361,6 +397,7 @@ calculate_positions (PicplannerWindow *window)
g_free (array_coordinates_sun);
g_free (array_coordinates_moon);
g_free (array_coordinates_milky_way);
g_free (phase_moon);
g_date_time_unref (date_time_noon);
/*
* TODO: