summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Fedoskin <afedoskin3@gmail.com>2016-06-23 00:19:53 (GMT)
committerArtem Fedoskin <afedoskin3@gmail.com>2016-06-23 00:19:53 (GMT)
commit037bb68e09f7a4d38fbf646c8ab01c33f6499a56 (patch)
treecbf6700656b3910eed64778fe91d2726bc9b2bda
parent6e2f41f3cd75ea2f132fd131f2f83b0a0d2960bd (diff)
DSO images are now included in KStars Lite package for Android. Added
support for DSO labels and filled ellipses on Android.
-rw-r--r--kstars/CMakeLists.txt4
-rw-r--r--kstars/auxiliary/kspaths.cpp10
-rw-r--r--kstars/kstarslite/res/CMakeLists.txt3
-rw-r--r--kstars/kstarslite/res/dso/m1.pngbin0 -> 25855 bytes
-rw-r--r--kstars/kstarslite/res/dso/m10.pngbin0 -> 29123 bytes
-rw-r--r--kstars/kstarslite/res/dso/m100.pngbin0 -> 10752 bytes
-rw-r--r--kstars/kstarslite/res/dso/m101.pngbin0 -> 67722 bytes
-rw-r--r--kstars/kstarslite/res/dso/m102.pngbin0 -> 9530 bytes
-rw-r--r--kstars/kstarslite/res/dso/m103.pngbin0 -> 3599 bytes
-rw-r--r--kstars/kstarslite/res/dso/m104.pngbin0 -> 13445 bytes
-rw-r--r--kstars/kstarslite/res/dso/m105.pngbin0 -> 3320 bytes
-rw-r--r--kstars/kstarslite/res/dso/m106.pngbin0 -> 15150 bytes
-rw-r--r--kstars/kstarslite/res/dso/m107.pngbin0 -> 4863 bytes
-rw-r--r--kstars/kstarslite/res/dso/m108.pngbin0 -> 12038 bytes
-rw-r--r--kstars/kstarslite/res/dso/m109.pngbin0 -> 12309 bytes
-rw-r--r--kstars/kstarslite/res/dso/m11.pngbin0 -> 38881 bytes
-rw-r--r--kstars/kstarslite/res/dso/m110.pngbin0 -> 10003 bytes
-rw-r--r--kstars/kstarslite/res/dso/m12.pngbin0 -> 36196 bytes
-rw-r--r--kstars/kstarslite/res/dso/m13.pngbin0 -> 46910 bytes
-rw-r--r--kstars/kstarslite/res/dso/m14.pngbin0 -> 6015 bytes
-rw-r--r--kstars/kstarslite/res/dso/m15.pngbin0 -> 20117 bytes
-rw-r--r--kstars/kstarslite/res/dso/m16.pngbin0 -> 96376 bytes
-rw-r--r--kstars/kstarslite/res/dso/m17.pngbin0 -> 35238 bytes
-rw-r--r--kstars/kstarslite/res/dso/m19.pngbin0 -> 6006 bytes
-rw-r--r--kstars/kstarslite/res/dso/m2.pngbin0 -> 28346 bytes
-rw-r--r--kstars/kstarslite/res/dso/m20.pngbin0 -> 66578 bytes
-rw-r--r--kstars/kstarslite/res/dso/m22.pngbin0 -> 29879 bytes
-rw-r--r--kstars/kstarslite/res/dso/m27.pngbin0 -> 26476 bytes
-rw-r--r--kstars/kstarslite/res/dso/m28.pngbin0 -> 24094 bytes
-rw-r--r--kstars/kstarslite/res/dso/m3.pngbin0 -> 6908 bytes
-rw-r--r--kstars/kstarslite/res/dso/m30.pngbin0 -> 38266 bytes
-rw-r--r--kstars/kstarslite/res/dso/m31.pngbin0 -> 62013 bytes
-rw-r--r--kstars/kstarslite/res/dso/m32.pngbin0 -> 5764 bytes
-rw-r--r--kstars/kstarslite/res/dso/m33.pngbin0 -> 62577 bytes
-rw-r--r--kstars/kstarslite/res/dso/m4.pngbin0 -> 10189 bytes
-rw-r--r--kstars/kstarslite/res/dso/m42.pngbin0 -> 104048 bytes
-rw-r--r--kstars/kstarslite/res/dso/m45.pngbin0 -> 91140 bytes
-rw-r--r--kstars/kstarslite/res/dso/m49.pngbin0 -> 7825 bytes
-rw-r--r--kstars/kstarslite/res/dso/m5.pngbin0 -> 32847 bytes
-rw-r--r--kstars/kstarslite/res/dso/m50.pngbin0 -> 10283 bytes
-rw-r--r--kstars/kstarslite/res/dso/m51.pngbin0 -> 21849 bytes
-rw-r--r--kstars/kstarslite/res/dso/m53.pngbin0 -> 7002 bytes
-rw-r--r--kstars/kstarslite/res/dso/m54.pngbin0 -> 4252 bytes
-rw-r--r--kstars/kstarslite/res/dso/m55.pngbin0 -> 5373 bytes
-rw-r--r--kstars/kstarslite/res/dso/m56.pngbin0 -> 4906 bytes
-rw-r--r--kstars/kstarslite/res/dso/m57.pngbin0 -> 4443 bytes
-rw-r--r--kstars/kstarslite/res/dso/m58.pngbin0 -> 16610 bytes
-rw-r--r--kstars/kstarslite/res/dso/m59.pngbin0 -> 6749 bytes
-rw-r--r--kstars/kstarslite/res/dso/m6.pngbin0 -> 85239 bytes
-rw-r--r--kstars/kstarslite/res/dso/m60.pngbin0 -> 7405 bytes
-rw-r--r--kstars/kstarslite/res/dso/m61.pngbin0 -> 47312 bytes
-rw-r--r--kstars/kstarslite/res/dso/m62.pngbin0 -> 27366 bytes
-rw-r--r--kstars/kstarslite/res/dso/m63.pngbin0 -> 10946 bytes
-rw-r--r--kstars/kstarslite/res/dso/m64.pngbin0 -> 19805 bytes
-rw-r--r--kstars/kstarslite/res/dso/m65.pngbin0 -> 21578 bytes
-rw-r--r--kstars/kstarslite/res/dso/m66.pngbin0 -> 19316 bytes
-rw-r--r--kstars/kstarslite/res/dso/m67.pngbin0 -> 5281 bytes
-rw-r--r--kstars/kstarslite/res/dso/m68.pngbin0 -> 5578 bytes
-rw-r--r--kstars/kstarslite/res/dso/m69.pngbin0 -> 3375 bytes
-rw-r--r--kstars/kstarslite/res/dso/m70.pngbin0 -> 3904 bytes
-rw-r--r--kstars/kstarslite/res/dso/m71.pngbin0 -> 12329 bytes
-rw-r--r--kstars/kstarslite/res/dso/m72.pngbin0 -> 3514 bytes
-rw-r--r--kstars/kstarslite/res/dso/m73.pngbin0 -> 4115 bytes
-rw-r--r--kstars/kstarslite/res/dso/m74.pngbin0 -> 10196 bytes
-rw-r--r--kstars/kstarslite/res/dso/m75.pngbin0 -> 4733 bytes
-rw-r--r--kstars/kstarslite/res/dso/m76.pngbin0 -> 16207 bytes
-rw-r--r--kstars/kstarslite/res/dso/m77.pngbin0 -> 11136 bytes
-rw-r--r--kstars/kstarslite/res/dso/m78.pngbin0 -> 50645 bytes
-rw-r--r--kstars/kstarslite/res/dso/m79.pngbin0 -> 4589 bytes
-rw-r--r--kstars/kstarslite/res/dso/m8.pngbin0 -> 19167 bytes
-rw-r--r--kstars/kstarslite/res/dso/m80.pngbin0 -> 4165 bytes
-rw-r--r--kstars/kstarslite/res/dso/m81.pngbin0 -> 57105 bytes
-rw-r--r--kstars/kstarslite/res/dso/m82.pngbin0 -> 7873 bytes
-rw-r--r--kstars/kstarslite/res/dso/m83.pngbin0 -> 124627 bytes
-rw-r--r--kstars/kstarslite/res/dso/m84.pngbin0 -> 10694 bytes
-rw-r--r--kstars/kstarslite/res/dso/m85.pngbin0 -> 14263 bytes
-rw-r--r--kstars/kstarslite/res/dso/m86.pngbin0 -> 11206 bytes
-rw-r--r--kstars/kstarslite/res/dso/m87.pngbin0 -> 12876 bytes
-rw-r--r--kstars/kstarslite/res/dso/m88.pngbin0 -> 29536 bytes
-rw-r--r--kstars/kstarslite/res/dso/m89.pngbin0 -> 18363 bytes
-rw-r--r--kstars/kstarslite/res/dso/m9.pngbin0 -> 7888 bytes
-rw-r--r--kstars/kstarslite/res/dso/m90.pngbin0 -> 25471 bytes
-rw-r--r--kstars/kstarslite/res/dso/m91.pngbin0 -> 22286 bytes
-rw-r--r--kstars/kstarslite/res/dso/m92.pngbin0 -> 4931 bytes
-rw-r--r--kstars/kstarslite/res/dso/m93.pngbin0 -> 7384 bytes
-rw-r--r--kstars/kstarslite/res/dso/m94.pngbin0 -> 68448 bytes
-rw-r--r--kstars/kstarslite/res/dso/m95.pngbin0 -> 17270 bytes
-rw-r--r--kstars/kstarslite/res/dso/m96.pngbin0 -> 30059 bytes
-rw-r--r--kstars/kstarslite/res/dso/m97.pngbin0 -> 10231 bytes
-rw-r--r--kstars/kstarslite/res/dso/m98.pngbin0 -> 27128 bytes
-rw-r--r--kstars/kstarslite/res/dso/m99.pngbin0 -> 16905 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc1055.pngbin0 -> 45682 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc185.pngbin0 -> 59334 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc1999.pngbin0 -> 96235 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc2024.pngbin0 -> 23216 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc2301.pngbin0 -> 45774 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc2353.pngbin0 -> 22264 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc2362.pngbin0 -> 50757 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc2392.pngbin0 -> 18910 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc2419.pngbin0 -> 13677 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc246.pngbin0 -> 63825 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc247.pngbin0 -> 17507 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc253.pngbin0 -> 15262 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc2683.pngbin0 -> 11171 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc2841.pngbin0 -> 21564 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc288.pngbin0 -> 46210 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc3190.pngbin0 -> 8428 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc3198.pngbin0 -> 19051 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc3242.pngbin0 -> 42136 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc3675.pngbin0 -> 30648 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc3726.pngbin0 -> 59281 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc3945.pngbin0 -> 51872 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc3953.pngbin0 -> 41239 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc40.pngbin0 -> 29214 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc4051.pngbin0 -> 51646 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc4088.pngbin0 -> 24151 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc457.pngbin0 -> 19517 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc4725.pngbin0 -> 9665 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc5248.pngbin0 -> 81829 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc5566.pngbin0 -> 25423 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc5746.pngbin0 -> 14684 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc5897.pngbin0 -> 145687 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc5907.pngbin0 -> 6521 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc6229.pngbin0 -> 7062 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc663.pngbin0 -> 41840 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc6712.pngbin0 -> 4102 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc6781.pngbin0 -> 16440 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc6946.pngbin0 -> 21907 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc7008.pngbin0 -> 29010 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc7331.pngbin0 -> 5235 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc7479.pngbin0 -> 37329 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc752.pngbin0 -> 22371 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc7662.pngbin0 -> 3304 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc7686.pngbin0 -> 24608 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc772.pngbin0 -> 30676 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc891.pngbin0 -> 10308 bytes
-rw-r--r--kstars/kstarslite/res/dso/ngc936.pngbin0 -> 60261 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m1.pngbin0 -> 75976 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m10.pngbin0 -> 89395 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m100.pngbin0 -> 29794 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m101.pngbin0 -> 58886 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m102.pngbin0 -> 25144 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m103.pngbin0 -> 60256 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m104.pngbin0 -> 26827 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m106.pngbin0 -> 51415 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m107.pngbin0 -> 95116 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m108.pngbin0 -> 41120 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m109.pngbin0 -> 52591 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m11.pngbin0 -> 106755 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m110.pngbin0 -> 31049 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m12.pngbin0 -> 77141 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m13.pngbin0 -> 85385 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m14.pngbin0 -> 62041 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m15.pngbin0 -> 58162 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m16.pngbin0 -> 74101 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m17.pngbin0 -> 59386 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m18.pngbin0 -> 83065 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m19.pngbin0 -> 81660 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m2.pngbin0 -> 76372 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m20.pngbin0 -> 79137 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m21.pngbin0 -> 76639 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m22.pngbin0 -> 98754 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m23.pngbin0 -> 89850 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m24.pngbin0 -> 92131 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m25.pngbin0 -> 104280 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m26.pngbin0 -> 104017 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m27.pngbin0 -> 64819 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m28.pngbin0 -> 86708 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m29.pngbin0 -> 54944 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m3.pngbin0 -> 94150 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m30.pngbin0 -> 66509 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m31.pngbin0 -> 56850 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m32.pngbin0 -> 33416 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m33.pngbin0 -> 72968 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m34.pngbin0 -> 61294 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m35.pngbin0 -> 95078 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m36.pngbin0 -> 70695 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m37.pngbin0 -> 74015 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m38.pngbin0 -> 99916 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m39.pngbin0 -> 94841 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m4.pngbin0 -> 95399 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m41.pngbin0 -> 76917 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m42.pngbin0 -> 38688 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m43.pngbin0 -> 41894 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m44.pngbin0 -> 55305 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m45.pngbin0 -> 69519 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m46.pngbin0 -> 86777 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m47.pngbin0 -> 86185 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m48.pngbin0 -> 93395 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m49.pngbin0 -> 32337 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m5.pngbin0 -> 91011 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m50.pngbin0 -> 79846 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m51.pngbin0 -> 59136 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m52.pngbin0 -> 87468 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m53.pngbin0 -> 79374 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m54.pngbin0 -> 72523 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m55.pngbin0 -> 63917 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m56.pngbin0 -> 62239 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m57.pngbin0 -> 29759 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m58.pngbin0 -> 43907 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m59.pngbin0 -> 30554 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m6.pngbin0 -> 67094 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m60.pngbin0 -> 45249 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m61.pngbin0 -> 49696 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m62.pngbin0 -> 59561 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m63.pngbin0 -> 54964 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m64.pngbin0 -> 40239 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m65.pngbin0 -> 26473 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m66.pngbin0 -> 40200 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m67.pngbin0 -> 58787 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m68.pngbin0 -> 75340 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m69.pngbin0 -> 77724 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m7.pngbin0 -> 95656 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m70.pngbin0 -> 80361 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m71.pngbin0 -> 83819 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m72.pngbin0 -> 65117 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m73.pngbin0 -> 66063 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m74.pngbin0 -> 64923 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m75.pngbin0 -> 54047 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m76.pngbin0 -> 53451 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m77.pngbin0 -> 40158 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m78.pngbin0 -> 36181 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m79.pngbin0 -> 74817 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m8.pngbin0 -> 61871 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m80.pngbin0 -> 57091 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m81.pngbin0 -> 42258 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m82.pngbin0 -> 33747 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m83.pngbin0 -> 64682 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m84.pngbin0 -> 56060 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m85.pngbin0 -> 13626 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m86.pngbin0 -> 56197 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m87.pngbin0 -> 42619 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m88.pngbin0 -> 42318 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m89.pngbin0 -> 35780 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m9.pngbin0 -> 78686 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m90.pngbin0 -> 51979 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m91.pngbin0 -> 50071 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m92.pngbin0 -> 55910 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m93.pngbin0 -> 95571 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m94.pngbin0 -> 45818 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m95.pngbin0 -> 43852 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m96.pngbin0 -> 21665 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m97.pngbin0 -> 32565 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-m99.pngbin0 -> 53160 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc1055.pngbin0 -> 50303 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc185.pngbin0 -> 67439 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc1999.pngbin0 -> 80461 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2024.pngbin0 -> 22107 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2301.pngbin0 -> 74034 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2353.pngbin0 -> 52110 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2360.pngbin0 -> 70591 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2362.pngbin0 -> 54631 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2392.pngbin0 -> 66551 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2419.pngbin0 -> 24303 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc246.pngbin0 -> 34915 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc247.pngbin0 -> 47535 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc253.pngbin0 -> 60211 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2683.pngbin0 -> 77453 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc2841.pngbin0 -> 48001 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc288.pngbin0 -> 51766 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc3190.pngbin0 -> 45650 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc3198.pngbin0 -> 70679 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc3242.pngbin0 -> 49756 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc3675.pngbin0 -> 32282 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc3726.pngbin0 -> 56718 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc3945.pngbin0 -> 75614 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc3953.pngbin0 -> 64368 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc40.pngbin0 -> 64880 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc4051.pngbin0 -> 61499 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc4088.pngbin0 -> 78987 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc457.pngbin0 -> 84446 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc4725.pngbin0 -> 26083 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc5248.pngbin0 -> 76266 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc5566.pngbin0 -> 73502 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc5746.pngbin0 -> 67680 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc5897.pngbin0 -> 94293 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc5907.pngbin0 -> 50396 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc6229.pngbin0 -> 24971 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc663.pngbin0 -> 71992 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc6712.pngbin0 -> 27293 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc6781.pngbin0 -> 73533 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc6946.pngbin0 -> 91646 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc7008.pngbin0 -> 64367 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc7331.pngbin0 -> 24410 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc7479.pngbin0 -> 63854 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc752.pngbin0 -> 50993 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc7662.pngbin0 -> 17202 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc7686.pngbin0 -> 46183 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc772.pngbin0 -> 47872 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc891.pngbin0 -> 85046 bytes
-rw-r--r--kstars/kstarslite/res/dso/thumb-ngc936.pngbin0 -> 77003 bytes
-rw-r--r--kstars/kstarslite/skyitems/deepskyitem.cpp154
-rw-r--r--kstars/kstarslite/skyitems/deepskyitem.h14
-rw-r--r--kstars/kstarslite/skyitems/deepstaritem.cpp9
-rw-r--r--kstars/kstarslite/skyitems/labelsitem.cpp102
-rw-r--r--kstars/kstarslite/skyitems/labelsitem.h11
-rw-r--r--kstars/kstarslite/skyitems/lines/milkywayitem.cpp116
-rw-r--r--kstars/kstarslite/skyitems/lines/milkywayitem.h66
-rw-r--r--kstars/kstarslite/skyitems/skynodes/deepskynode.cpp24
-rw-r--r--kstars/kstarslite/skyitems/skynodes/deepskynode.h9
-rw-r--r--kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp73
-rw-r--r--kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h18
-rw-r--r--kstars/kstarslite/skyitems/skynodes/labelnode.cpp16
-rw-r--r--kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.cpp45
-rw-r--r--kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.h10
-rw-r--r--kstars/kstarslite/skyitems/typedeflite.h10
-rw-r--r--kstars/main.cpp1
-rw-r--r--kstars/skycomponents/milkyway.cpp6
-rw-r--r--kstars/skymaplite.cpp1
-rw-r--r--kstars/skymaplite.h5
310 files changed, 473 insertions, 234 deletions
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index 5cf4525..320cbe5 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -563,6 +563,7 @@ if(BUILD_KSTARS_LITE)
kstarslite/skyitems/lines/linesitem.cpp
kstarslite/skyitems/lines/equatoritem.cpp
kstarslite/skyitems/lines/eclipticitem.cpp
+ kstarslite/skyitems/lines/milkywayitem.cpp
#SkyNodes
kstarslite/skyitems/skynodes/planetnode.cpp
kstarslite/skyitems/skynodes/skynode.cpp
@@ -621,6 +622,9 @@ if(BUILD_KSTARS_LITE)
kstarslite/qml/modules/Splash.qml
)
add_subdirectory(kstarslite/qml)
+if(ANDROID)
+ add_subdirectory(kstarslite/res)
+endif()
ADD_CUSTOM_TARGET(kstarsliteqml SOURCES ${kstarsliteqml_SRCS})
endif(BUILD_KSTARS_LITE)
diff --git a/kstars/auxiliary/kspaths.cpp b/kstars/auxiliary/kspaths.cpp
index 4ef0988..5439e80 100644
--- a/kstars/auxiliary/kspaths.cpp
+++ b/kstars/auxiliary/kspaths.cpp
@@ -1,4 +1,6 @@
#include "auxiliary/kspaths.h"
+#include <QFileInfo>
+#include <QDebug>
QString KSPaths::locate(QStandardPaths::StandardLocation location, const QString &fileName,
QStandardPaths::LocateOptions options) {
@@ -6,6 +8,9 @@ QString KSPaths::locate(QStandardPaths::StandardLocation location, const QString
QString file = QStandardPaths::locate(location,fileName,options);
if(file.isEmpty()) {
file = "/data/data/org.kde.kstars/qt-reserved-files/share/kstars/" + fileName;
+ if (!QFileInfo(file).exists()) {
+ return QString();
+ }
}
return file;
#else
@@ -18,7 +23,10 @@ QStringList KSPaths::locateAll(QStandardPaths::StandardLocation location, const
#ifdef ANDROID
QStringList file = QStandardPaths::locateAll(location,fileName,options);
if(file.isEmpty()) {
- file[0] = "/data/data/org.kde.kstars/qt-reserved-files/share/kstars/" + fileName;
+ QString f = "/data/data/org.kde.kstars/qt-reserved-files/share/kstars/" + fileName;
+ if (QFileInfo(f).exists()) {
+ file[0] = f;
+ }
}
return file;
#else
diff --git a/kstars/kstarslite/res/CMakeLists.txt b/kstars/kstarslite/res/CMakeLists.txt
new file mode 100644
index 0000000..8ff4632
--- /dev/null
+++ b/kstars/kstarslite/res/CMakeLists.txt
@@ -0,0 +1,3 @@
+#install_files
+install( DIRECTORY dso/
+ DESTINATION ${KDE_INSTALL_DATADIR}/kstars ) \ No newline at end of file
diff --git a/kstars/kstarslite/res/dso/m1.png b/kstars/kstarslite/res/dso/m1.png
new file mode 100644
index 0000000..cc940ab
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m1.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m10.png b/kstars/kstarslite/res/dso/m10.png
new file mode 100644
index 0000000..d000e81
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m10.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m100.png b/kstars/kstarslite/res/dso/m100.png
new file mode 100644
index 0000000..7053e1d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m100.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m101.png b/kstars/kstarslite/res/dso/m101.png
new file mode 100644
index 0000000..27dcd43
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m101.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m102.png b/kstars/kstarslite/res/dso/m102.png
new file mode 100644
index 0000000..def5d73
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m102.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m103.png b/kstars/kstarslite/res/dso/m103.png
new file mode 100644
index 0000000..9ecd1bc
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m103.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m104.png b/kstars/kstarslite/res/dso/m104.png
new file mode 100644
index 0000000..fe893c1
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m104.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m105.png b/kstars/kstarslite/res/dso/m105.png
new file mode 100644
index 0000000..f4bb101
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m105.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m106.png b/kstars/kstarslite/res/dso/m106.png
new file mode 100644
index 0000000..9677f29
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m106.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m107.png b/kstars/kstarslite/res/dso/m107.png
new file mode 100644
index 0000000..8cca463
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m107.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m108.png b/kstars/kstarslite/res/dso/m108.png
new file mode 100644
index 0000000..526f120
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m108.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m109.png b/kstars/kstarslite/res/dso/m109.png
new file mode 100644
index 0000000..1311ee9
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m109.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m11.png b/kstars/kstarslite/res/dso/m11.png
new file mode 100644
index 0000000..e3069f0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m11.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m110.png b/kstars/kstarslite/res/dso/m110.png
new file mode 100644
index 0000000..41fdd12
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m110.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m12.png b/kstars/kstarslite/res/dso/m12.png
new file mode 100644
index 0000000..40d5dc3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m12.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m13.png b/kstars/kstarslite/res/dso/m13.png
new file mode 100644
index 0000000..a4fd0d6
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m13.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m14.png b/kstars/kstarslite/res/dso/m14.png
new file mode 100644
index 0000000..6b31526
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m14.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m15.png b/kstars/kstarslite/res/dso/m15.png
new file mode 100644
index 0000000..e4f72a8
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m15.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m16.png b/kstars/kstarslite/res/dso/m16.png
new file mode 100644
index 0000000..3da3e99
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m16.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m17.png b/kstars/kstarslite/res/dso/m17.png
new file mode 100644
index 0000000..1be5081
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m17.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m19.png b/kstars/kstarslite/res/dso/m19.png
new file mode 100644
index 0000000..c578321
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m19.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m2.png b/kstars/kstarslite/res/dso/m2.png
new file mode 100644
index 0000000..fc07b8a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m2.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m20.png b/kstars/kstarslite/res/dso/m20.png
new file mode 100644
index 0000000..a166ecc
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m20.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m22.png b/kstars/kstarslite/res/dso/m22.png
new file mode 100644
index 0000000..9ad15fa
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m22.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m27.png b/kstars/kstarslite/res/dso/m27.png
new file mode 100644
index 0000000..fa6f1f5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m27.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m28.png b/kstars/kstarslite/res/dso/m28.png
new file mode 100644
index 0000000..4b172fb
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m28.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m3.png b/kstars/kstarslite/res/dso/m3.png
new file mode 100644
index 0000000..7e6f04c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m3.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m30.png b/kstars/kstarslite/res/dso/m30.png
new file mode 100644
index 0000000..2129f8c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m30.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m31.png b/kstars/kstarslite/res/dso/m31.png
new file mode 100644
index 0000000..9817095
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m31.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m32.png b/kstars/kstarslite/res/dso/m32.png
new file mode 100644
index 0000000..342f18e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m32.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m33.png b/kstars/kstarslite/res/dso/m33.png
new file mode 100644
index 0000000..44e051c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m33.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m4.png b/kstars/kstarslite/res/dso/m4.png
new file mode 100644
index 0000000..c8df088
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m4.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m42.png b/kstars/kstarslite/res/dso/m42.png
new file mode 100644
index 0000000..c6daf05
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m42.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m45.png b/kstars/kstarslite/res/dso/m45.png
new file mode 100644
index 0000000..e2db9f3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m45.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m49.png b/kstars/kstarslite/res/dso/m49.png
new file mode 100644
index 0000000..3786958
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m49.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m5.png b/kstars/kstarslite/res/dso/m5.png
new file mode 100644
index 0000000..b5040a1
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m5.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m50.png b/kstars/kstarslite/res/dso/m50.png
new file mode 100644
index 0000000..0e38d1f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m50.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m51.png b/kstars/kstarslite/res/dso/m51.png
new file mode 100644
index 0000000..18bb1a4
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m51.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m53.png b/kstars/kstarslite/res/dso/m53.png
new file mode 100644
index 0000000..6fa2cd6
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m53.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m54.png b/kstars/kstarslite/res/dso/m54.png
new file mode 100644
index 0000000..fd32eb4
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m54.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m55.png b/kstars/kstarslite/res/dso/m55.png
new file mode 100644
index 0000000..3155b8c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m55.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m56.png b/kstars/kstarslite/res/dso/m56.png
new file mode 100644
index 0000000..8d67b0b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m56.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m57.png b/kstars/kstarslite/res/dso/m57.png
new file mode 100644
index 0000000..11f016e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m57.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m58.png b/kstars/kstarslite/res/dso/m58.png
new file mode 100644
index 0000000..93e7ba0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m58.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m59.png b/kstars/kstarslite/res/dso/m59.png
new file mode 100644
index 0000000..e286f67
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m59.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m6.png b/kstars/kstarslite/res/dso/m6.png
new file mode 100644
index 0000000..c78b265
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m6.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m60.png b/kstars/kstarslite/res/dso/m60.png
new file mode 100644
index 0000000..379fd72
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m60.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m61.png b/kstars/kstarslite/res/dso/m61.png
new file mode 100644
index 0000000..d741529
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m61.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m62.png b/kstars/kstarslite/res/dso/m62.png
new file mode 100644
index 0000000..8913703
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m62.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m63.png b/kstars/kstarslite/res/dso/m63.png
new file mode 100644
index 0000000..023e6be
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m63.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m64.png b/kstars/kstarslite/res/dso/m64.png
new file mode 100644
index 0000000..fc460af
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m64.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m65.png b/kstars/kstarslite/res/dso/m65.png
new file mode 100644
index 0000000..44b3bbb
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m65.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m66.png b/kstars/kstarslite/res/dso/m66.png
new file mode 100644
index 0000000..4e65c48
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m66.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m67.png b/kstars/kstarslite/res/dso/m67.png
new file mode 100644
index 0000000..a539825
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m67.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m68.png b/kstars/kstarslite/res/dso/m68.png
new file mode 100644
index 0000000..24fead1
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m68.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m69.png b/kstars/kstarslite/res/dso/m69.png
new file mode 100644
index 0000000..3355984
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m69.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m70.png b/kstars/kstarslite/res/dso/m70.png
new file mode 100644
index 0000000..26bb9db
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m70.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m71.png b/kstars/kstarslite/res/dso/m71.png
new file mode 100644
index 0000000..d77a1ed
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m71.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m72.png b/kstars/kstarslite/res/dso/m72.png
new file mode 100644
index 0000000..3fc134b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m72.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m73.png b/kstars/kstarslite/res/dso/m73.png
new file mode 100644
index 0000000..d0699e7
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m73.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m74.png b/kstars/kstarslite/res/dso/m74.png
new file mode 100644
index 0000000..fd61b31
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m74.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m75.png b/kstars/kstarslite/res/dso/m75.png
new file mode 100644
index 0000000..a6ef683
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m75.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m76.png b/kstars/kstarslite/res/dso/m76.png
new file mode 100644
index 0000000..bae61fd
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m76.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m77.png b/kstars/kstarslite/res/dso/m77.png
new file mode 100644
index 0000000..8f146bf
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m77.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m78.png b/kstars/kstarslite/res/dso/m78.png
new file mode 100644
index 0000000..81f5a3d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m78.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m79.png b/kstars/kstarslite/res/dso/m79.png
new file mode 100644
index 0000000..df8e899
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m79.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m8.png b/kstars/kstarslite/res/dso/m8.png
new file mode 100644
index 0000000..3515007
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m8.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m80.png b/kstars/kstarslite/res/dso/m80.png
new file mode 100644
index 0000000..7858407
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m80.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m81.png b/kstars/kstarslite/res/dso/m81.png
new file mode 100644
index 0000000..eaf3e8d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m81.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m82.png b/kstars/kstarslite/res/dso/m82.png
new file mode 100644
index 0000000..92e7d6a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m82.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m83.png b/kstars/kstarslite/res/dso/m83.png
new file mode 100644
index 0000000..d57e2e9
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m83.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m84.png b/kstars/kstarslite/res/dso/m84.png
new file mode 100644
index 0000000..0404ac5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m84.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m85.png b/kstars/kstarslite/res/dso/m85.png
new file mode 100644
index 0000000..686cf33
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m85.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m86.png b/kstars/kstarslite/res/dso/m86.png
new file mode 100644
index 0000000..f552d7f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m86.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m87.png b/kstars/kstarslite/res/dso/m87.png
new file mode 100644
index 0000000..c559e5a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m87.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m88.png b/kstars/kstarslite/res/dso/m88.png
new file mode 100644
index 0000000..af7cf00
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m88.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m89.png b/kstars/kstarslite/res/dso/m89.png
new file mode 100644
index 0000000..8c88ae3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m89.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m9.png b/kstars/kstarslite/res/dso/m9.png
new file mode 100644
index 0000000..71631a5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m9.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m90.png b/kstars/kstarslite/res/dso/m90.png
new file mode 100644
index 0000000..0129417
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m90.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m91.png b/kstars/kstarslite/res/dso/m91.png
new file mode 100644
index 0000000..4378a2a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m91.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m92.png b/kstars/kstarslite/res/dso/m92.png
new file mode 100644
index 0000000..6032a7f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m92.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m93.png b/kstars/kstarslite/res/dso/m93.png
new file mode 100644
index 0000000..a855780
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m93.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m94.png b/kstars/kstarslite/res/dso/m94.png
new file mode 100644
index 0000000..9fd5a4d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m94.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m95.png b/kstars/kstarslite/res/dso/m95.png
new file mode 100644
index 0000000..1da2165
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m95.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m96.png b/kstars/kstarslite/res/dso/m96.png
new file mode 100644
index 0000000..1654761
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m96.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m97.png b/kstars/kstarslite/res/dso/m97.png
new file mode 100644
index 0000000..d92e76f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m97.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m98.png b/kstars/kstarslite/res/dso/m98.png
new file mode 100644
index 0000000..83c394f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m98.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/m99.png b/kstars/kstarslite/res/dso/m99.png
new file mode 100644
index 0000000..afc2c3f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/m99.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc1055.png b/kstars/kstarslite/res/dso/ngc1055.png
new file mode 100644
index 0000000..f9e6e31
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc1055.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc185.png b/kstars/kstarslite/res/dso/ngc185.png
new file mode 100644
index 0000000..b5adecb
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc185.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc1999.png b/kstars/kstarslite/res/dso/ngc1999.png
new file mode 100644
index 0000000..bff170b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc1999.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc2024.png b/kstars/kstarslite/res/dso/ngc2024.png
new file mode 100644
index 0000000..484d6b2
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc2024.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc2301.png b/kstars/kstarslite/res/dso/ngc2301.png
new file mode 100644
index 0000000..44332c2
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc2301.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc2353.png b/kstars/kstarslite/res/dso/ngc2353.png
new file mode 100644
index 0000000..4741b9f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc2353.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc2362.png b/kstars/kstarslite/res/dso/ngc2362.png
new file mode 100644
index 0000000..618b64a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc2362.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc2392.png b/kstars/kstarslite/res/dso/ngc2392.png
new file mode 100644
index 0000000..98bab31
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc2392.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc2419.png b/kstars/kstarslite/res/dso/ngc2419.png
new file mode 100644
index 0000000..afb26b4
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc2419.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc246.png b/kstars/kstarslite/res/dso/ngc246.png
new file mode 100644
index 0000000..490aff3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc246.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc247.png b/kstars/kstarslite/res/dso/ngc247.png
new file mode 100644
index 0000000..a694655
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc247.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc253.png b/kstars/kstarslite/res/dso/ngc253.png
new file mode 100644
index 0000000..e578ee7
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc253.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc2683.png b/kstars/kstarslite/res/dso/ngc2683.png
new file mode 100644
index 0000000..53dca85
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc2683.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc2841.png b/kstars/kstarslite/res/dso/ngc2841.png
new file mode 100644
index 0000000..b22c75e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc2841.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc288.png b/kstars/kstarslite/res/dso/ngc288.png
new file mode 100644
index 0000000..85b6289
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc288.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc3190.png b/kstars/kstarslite/res/dso/ngc3190.png
new file mode 100644
index 0000000..118a675
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc3190.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc3198.png b/kstars/kstarslite/res/dso/ngc3198.png
new file mode 100644
index 0000000..74c36e7
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc3198.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc3242.png b/kstars/kstarslite/res/dso/ngc3242.png
new file mode 100644
index 0000000..b1aff6e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc3242.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc3675.png b/kstars/kstarslite/res/dso/ngc3675.png
new file mode 100644
index 0000000..aefac20
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc3675.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc3726.png b/kstars/kstarslite/res/dso/ngc3726.png
new file mode 100644
index 0000000..1cb78ca
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc3726.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc3945.png b/kstars/kstarslite/res/dso/ngc3945.png
new file mode 100644
index 0000000..c166524
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc3945.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc3953.png b/kstars/kstarslite/res/dso/ngc3953.png
new file mode 100644
index 0000000..1a82fe5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc3953.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc40.png b/kstars/kstarslite/res/dso/ngc40.png
new file mode 100644
index 0000000..030a409
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc40.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc4051.png b/kstars/kstarslite/res/dso/ngc4051.png
new file mode 100644
index 0000000..656d986
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc4051.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc4088.png b/kstars/kstarslite/res/dso/ngc4088.png
new file mode 100644
index 0000000..9bd84e3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc4088.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc457.png b/kstars/kstarslite/res/dso/ngc457.png
new file mode 100644
index 0000000..826a0aa
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc457.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc4725.png b/kstars/kstarslite/res/dso/ngc4725.png
new file mode 100644
index 0000000..84a0f33
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc4725.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc5248.png b/kstars/kstarslite/res/dso/ngc5248.png
new file mode 100644
index 0000000..26d6d6e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc5248.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc5566.png b/kstars/kstarslite/res/dso/ngc5566.png
new file mode 100644
index 0000000..0f385ee
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc5566.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc5746.png b/kstars/kstarslite/res/dso/ngc5746.png
new file mode 100644
index 0000000..f1580a5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc5746.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc5897.png b/kstars/kstarslite/res/dso/ngc5897.png
new file mode 100644
index 0000000..ddec3c2
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc5897.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc5907.png b/kstars/kstarslite/res/dso/ngc5907.png
new file mode 100644
index 0000000..6b493aa
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc5907.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc6229.png b/kstars/kstarslite/res/dso/ngc6229.png
new file mode 100644
index 0000000..db90bc9
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc6229.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc663.png b/kstars/kstarslite/res/dso/ngc663.png
new file mode 100644
index 0000000..4f0710c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc663.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc6712.png b/kstars/kstarslite/res/dso/ngc6712.png
new file mode 100644
index 0000000..7676f37
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc6712.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc6781.png b/kstars/kstarslite/res/dso/ngc6781.png
new file mode 100644
index 0000000..60b29d5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc6781.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc6946.png b/kstars/kstarslite/res/dso/ngc6946.png
new file mode 100644
index 0000000..4fd4d3f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc6946.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc7008.png b/kstars/kstarslite/res/dso/ngc7008.png
new file mode 100644
index 0000000..8b09a5a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc7008.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc7331.png b/kstars/kstarslite/res/dso/ngc7331.png
new file mode 100644
index 0000000..90d6b95
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc7331.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc7479.png b/kstars/kstarslite/res/dso/ngc7479.png
new file mode 100644
index 0000000..12fef50
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc7479.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc752.png b/kstars/kstarslite/res/dso/ngc752.png
new file mode 100644
index 0000000..be568fd
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc752.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc7662.png b/kstars/kstarslite/res/dso/ngc7662.png
new file mode 100644
index 0000000..721ba3a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc7662.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc7686.png b/kstars/kstarslite/res/dso/ngc7686.png
new file mode 100644
index 0000000..ef62e07
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc7686.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc772.png b/kstars/kstarslite/res/dso/ngc772.png
new file mode 100644
index 0000000..399f6bd
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc772.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc891.png b/kstars/kstarslite/res/dso/ngc891.png
new file mode 100644
index 0000000..32bfeb5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc891.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/ngc936.png b/kstars/kstarslite/res/dso/ngc936.png
new file mode 100644
index 0000000..56d8d16
--- /dev/null
+++ b/kstars/kstarslite/res/dso/ngc936.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m1.png b/kstars/kstarslite/res/dso/thumb-m1.png
new file mode 100644
index 0000000..83beed1
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m1.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m10.png b/kstars/kstarslite/res/dso/thumb-m10.png
new file mode 100644
index 0000000..991ca03
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m10.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m100.png b/kstars/kstarslite/res/dso/thumb-m100.png
new file mode 100644
index 0000000..0c5fa59
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m100.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m101.png b/kstars/kstarslite/res/dso/thumb-m101.png
new file mode 100644
index 0000000..8cb3abb
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m101.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m102.png b/kstars/kstarslite/res/dso/thumb-m102.png
new file mode 100644
index 0000000..c215345
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m102.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m103.png b/kstars/kstarslite/res/dso/thumb-m103.png
new file mode 100644
index 0000000..3342a56
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m103.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m104.png b/kstars/kstarslite/res/dso/thumb-m104.png
new file mode 100644
index 0000000..fe789c3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m104.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m106.png b/kstars/kstarslite/res/dso/thumb-m106.png
new file mode 100644
index 0000000..cd911e8
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m106.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m107.png b/kstars/kstarslite/res/dso/thumb-m107.png
new file mode 100644
index 0000000..9c9076c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m107.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m108.png b/kstars/kstarslite/res/dso/thumb-m108.png
new file mode 100644
index 0000000..d410432
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m108.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m109.png b/kstars/kstarslite/res/dso/thumb-m109.png
new file mode 100644
index 0000000..e0d68b8
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m109.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m11.png b/kstars/kstarslite/res/dso/thumb-m11.png
new file mode 100644
index 0000000..2e17f4d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m11.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m110.png b/kstars/kstarslite/res/dso/thumb-m110.png
new file mode 100644
index 0000000..b30f5ac
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m110.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m12.png b/kstars/kstarslite/res/dso/thumb-m12.png
new file mode 100644
index 0000000..65907a1
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m12.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m13.png b/kstars/kstarslite/res/dso/thumb-m13.png
new file mode 100644
index 0000000..1374d6d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m13.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m14.png b/kstars/kstarslite/res/dso/thumb-m14.png
new file mode 100644
index 0000000..85d4c51
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m14.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m15.png b/kstars/kstarslite/res/dso/thumb-m15.png
new file mode 100644
index 0000000..9b2a750
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m15.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m16.png b/kstars/kstarslite/res/dso/thumb-m16.png
new file mode 100644
index 0000000..1f70450
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m16.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m17.png b/kstars/kstarslite/res/dso/thumb-m17.png
new file mode 100644
index 0000000..5c8d7d2
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m17.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m18.png b/kstars/kstarslite/res/dso/thumb-m18.png
new file mode 100644
index 0000000..e01db92
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m18.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m19.png b/kstars/kstarslite/res/dso/thumb-m19.png
new file mode 100644
index 0000000..724a07c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m19.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m2.png b/kstars/kstarslite/res/dso/thumb-m2.png
new file mode 100644
index 0000000..c64360b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m2.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m20.png b/kstars/kstarslite/res/dso/thumb-m20.png
new file mode 100644
index 0000000..c8922ab
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m20.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m21.png b/kstars/kstarslite/res/dso/thumb-m21.png
new file mode 100644
index 0000000..f2888b5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m21.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m22.png b/kstars/kstarslite/res/dso/thumb-m22.png
new file mode 100644
index 0000000..0655fd6
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m22.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m23.png b/kstars/kstarslite/res/dso/thumb-m23.png
new file mode 100644
index 0000000..20a6f1e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m23.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m24.png b/kstars/kstarslite/res/dso/thumb-m24.png
new file mode 100644
index 0000000..bcb61ef
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m24.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m25.png b/kstars/kstarslite/res/dso/thumb-m25.png
new file mode 100644
index 0000000..e8712cb
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m25.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m26.png b/kstars/kstarslite/res/dso/thumb-m26.png
new file mode 100644
index 0000000..8b519dc
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m26.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m27.png b/kstars/kstarslite/res/dso/thumb-m27.png
new file mode 100644
index 0000000..9c97a76
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m27.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m28.png b/kstars/kstarslite/res/dso/thumb-m28.png
new file mode 100644
index 0000000..a4b8dc1
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m28.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m29.png b/kstars/kstarslite/res/dso/thumb-m29.png
new file mode 100644
index 0000000..95e10cd
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m29.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m3.png b/kstars/kstarslite/res/dso/thumb-m3.png
new file mode 100644
index 0000000..794a106
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m3.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m30.png b/kstars/kstarslite/res/dso/thumb-m30.png
new file mode 100644
index 0000000..04ec033
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m30.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m31.png b/kstars/kstarslite/res/dso/thumb-m31.png
new file mode 100644
index 0000000..15243dd
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m31.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m32.png b/kstars/kstarslite/res/dso/thumb-m32.png
new file mode 100644
index 0000000..623dfac
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m32.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m33.png b/kstars/kstarslite/res/dso/thumb-m33.png
new file mode 100644
index 0000000..8913943
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m33.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m34.png b/kstars/kstarslite/res/dso/thumb-m34.png
new file mode 100644
index 0000000..9099fa0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m34.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m35.png b/kstars/kstarslite/res/dso/thumb-m35.png
new file mode 100644
index 0000000..cf46375
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m35.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m36.png b/kstars/kstarslite/res/dso/thumb-m36.png
new file mode 100644
index 0000000..06d84f2
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m36.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m37.png b/kstars/kstarslite/res/dso/thumb-m37.png
new file mode 100644
index 0000000..bd85e63
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m37.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m38.png b/kstars/kstarslite/res/dso/thumb-m38.png
new file mode 100644
index 0000000..ada3aa0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m38.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m39.png b/kstars/kstarslite/res/dso/thumb-m39.png
new file mode 100644
index 0000000..bc6759b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m39.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m4.png b/kstars/kstarslite/res/dso/thumb-m4.png
new file mode 100644
index 0000000..a0e7777
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m4.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m41.png b/kstars/kstarslite/res/dso/thumb-m41.png
new file mode 100644
index 0000000..4c1bc50
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m41.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m42.png b/kstars/kstarslite/res/dso/thumb-m42.png
new file mode 100644
index 0000000..dc37208
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m42.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m43.png b/kstars/kstarslite/res/dso/thumb-m43.png
new file mode 100644
index 0000000..13b775d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m43.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m44.png b/kstars/kstarslite/res/dso/thumb-m44.png
new file mode 100644
index 0000000..ff6e705
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m44.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m45.png b/kstars/kstarslite/res/dso/thumb-m45.png
new file mode 100644
index 0000000..88aa9c0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m45.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m46.png b/kstars/kstarslite/res/dso/thumb-m46.png
new file mode 100644
index 0000000..d380ea6
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m46.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m47.png b/kstars/kstarslite/res/dso/thumb-m47.png
new file mode 100644
index 0000000..1225465
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m47.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m48.png b/kstars/kstarslite/res/dso/thumb-m48.png
new file mode 100644
index 0000000..eee737e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m48.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m49.png b/kstars/kstarslite/res/dso/thumb-m49.png
new file mode 100644
index 0000000..2ddc2a3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m49.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m5.png b/kstars/kstarslite/res/dso/thumb-m5.png
new file mode 100644
index 0000000..8e73b1c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m5.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m50.png b/kstars/kstarslite/res/dso/thumb-m50.png
new file mode 100644
index 0000000..0de8d2e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m50.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m51.png b/kstars/kstarslite/res/dso/thumb-m51.png
new file mode 100644
index 0000000..64f89f0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m51.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m52.png b/kstars/kstarslite/res/dso/thumb-m52.png
new file mode 100644
index 0000000..ecea721
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m52.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m53.png b/kstars/kstarslite/res/dso/thumb-m53.png
new file mode 100644
index 0000000..7782e92
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m53.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m54.png b/kstars/kstarslite/res/dso/thumb-m54.png
new file mode 100644
index 0000000..4124c9b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m54.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m55.png b/kstars/kstarslite/res/dso/thumb-m55.png
new file mode 100644
index 0000000..8b3b079
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m55.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m56.png b/kstars/kstarslite/res/dso/thumb-m56.png
new file mode 100644
index 0000000..dd57726
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m56.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m57.png b/kstars/kstarslite/res/dso/thumb-m57.png
new file mode 100644
index 0000000..1aa9438
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m57.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m58.png b/kstars/kstarslite/res/dso/thumb-m58.png
new file mode 100644
index 0000000..50f8b58
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m58.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m59.png b/kstars/kstarslite/res/dso/thumb-m59.png
new file mode 100644
index 0000000..1662f72
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m59.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m6.png b/kstars/kstarslite/res/dso/thumb-m6.png
new file mode 100644
index 0000000..df9dd44
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m6.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m60.png b/kstars/kstarslite/res/dso/thumb-m60.png
new file mode 100644
index 0000000..6c639bd
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m60.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m61.png b/kstars/kstarslite/res/dso/thumb-m61.png
new file mode 100644
index 0000000..777211a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m61.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m62.png b/kstars/kstarslite/res/dso/thumb-m62.png
new file mode 100644
index 0000000..35117a3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m62.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m63.png b/kstars/kstarslite/res/dso/thumb-m63.png
new file mode 100644
index 0000000..4ed0773
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m63.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m64.png b/kstars/kstarslite/res/dso/thumb-m64.png
new file mode 100644
index 0000000..b0bdd09
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m64.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m65.png b/kstars/kstarslite/res/dso/thumb-m65.png
new file mode 100644
index 0000000..f725e0b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m65.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m66.png b/kstars/kstarslite/res/dso/thumb-m66.png
new file mode 100644
index 0000000..7215dd5
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m66.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m67.png b/kstars/kstarslite/res/dso/thumb-m67.png
new file mode 100644
index 0000000..9889947
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m67.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m68.png b/kstars/kstarslite/res/dso/thumb-m68.png
new file mode 100644
index 0000000..a97505c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m68.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m69.png b/kstars/kstarslite/res/dso/thumb-m69.png
new file mode 100644
index 0000000..c051257
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m69.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m7.png b/kstars/kstarslite/res/dso/thumb-m7.png
new file mode 100644
index 0000000..5dc4bce
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m7.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m70.png b/kstars/kstarslite/res/dso/thumb-m70.png
new file mode 100644
index 0000000..f3faf96
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m70.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m71.png b/kstars/kstarslite/res/dso/thumb-m71.png
new file mode 100644
index 0000000..dde7b2c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m71.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m72.png b/kstars/kstarslite/res/dso/thumb-m72.png
new file mode 100644
index 0000000..f96efc9
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m72.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m73.png b/kstars/kstarslite/res/dso/thumb-m73.png
new file mode 100644
index 0000000..475772f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m73.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m74.png b/kstars/kstarslite/res/dso/thumb-m74.png
new file mode 100644
index 0000000..fdbd5f7
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m74.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m75.png b/kstars/kstarslite/res/dso/thumb-m75.png
new file mode 100644
index 0000000..198ba34
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m75.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m76.png b/kstars/kstarslite/res/dso/thumb-m76.png
new file mode 100644
index 0000000..c863d6e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m76.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m77.png b/kstars/kstarslite/res/dso/thumb-m77.png
new file mode 100644
index 0000000..3b9c4cb
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m77.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m78.png b/kstars/kstarslite/res/dso/thumb-m78.png
new file mode 100644
index 0000000..f016bc9
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m78.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m79.png b/kstars/kstarslite/res/dso/thumb-m79.png
new file mode 100644
index 0000000..3c2b23f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m79.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m8.png b/kstars/kstarslite/res/dso/thumb-m8.png
new file mode 100644
index 0000000..8fe426b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m8.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m80.png b/kstars/kstarslite/res/dso/thumb-m80.png
new file mode 100644
index 0000000..e097881
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m80.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m81.png b/kstars/kstarslite/res/dso/thumb-m81.png
new file mode 100644
index 0000000..39067aa
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m81.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m82.png b/kstars/kstarslite/res/dso/thumb-m82.png
new file mode 100644
index 0000000..a98fb80
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m82.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m83.png b/kstars/kstarslite/res/dso/thumb-m83.png
new file mode 100644
index 0000000..e1e2ee2
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m83.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m84.png b/kstars/kstarslite/res/dso/thumb-m84.png
new file mode 100644
index 0000000..c740f81
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m84.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m85.png b/kstars/kstarslite/res/dso/thumb-m85.png
new file mode 100644
index 0000000..5c749d0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m85.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m86.png b/kstars/kstarslite/res/dso/thumb-m86.png
new file mode 100644
index 0000000..7720d7c
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m86.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m87.png b/kstars/kstarslite/res/dso/thumb-m87.png
new file mode 100644
index 0000000..a8dd963
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m87.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m88.png b/kstars/kstarslite/res/dso/thumb-m88.png
new file mode 100644
index 0000000..4a6bd0a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m88.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m89.png b/kstars/kstarslite/res/dso/thumb-m89.png
new file mode 100644
index 0000000..1db26bb
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m89.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m9.png b/kstars/kstarslite/res/dso/thumb-m9.png
new file mode 100644
index 0000000..a8d250b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m9.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m90.png b/kstars/kstarslite/res/dso/thumb-m90.png
new file mode 100644
index 0000000..76e79fa
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m90.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m91.png b/kstars/kstarslite/res/dso/thumb-m91.png
new file mode 100644
index 0000000..ab0077f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m91.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m92.png b/kstars/kstarslite/res/dso/thumb-m92.png
new file mode 100644
index 0000000..4aeafb7
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m92.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m93.png b/kstars/kstarslite/res/dso/thumb-m93.png
new file mode 100644
index 0000000..f1c6fc3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m93.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m94.png b/kstars/kstarslite/res/dso/thumb-m94.png
new file mode 100644
index 0000000..15f3bc8
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m94.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m95.png b/kstars/kstarslite/res/dso/thumb-m95.png
new file mode 100644
index 0000000..64cac51
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m95.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m96.png b/kstars/kstarslite/res/dso/thumb-m96.png
new file mode 100644
index 0000000..21c2eb0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m96.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m97.png b/kstars/kstarslite/res/dso/thumb-m97.png
new file mode 100644
index 0000000..1885f82
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m97.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-m99.png b/kstars/kstarslite/res/dso/thumb-m99.png
new file mode 100644
index 0000000..1477000
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-m99.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc1055.png b/kstars/kstarslite/res/dso/thumb-ngc1055.png
new file mode 100644
index 0000000..f1fbd93
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc1055.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc185.png b/kstars/kstarslite/res/dso/thumb-ngc185.png
new file mode 100644
index 0000000..28147d9
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc185.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc1999.png b/kstars/kstarslite/res/dso/thumb-ngc1999.png
new file mode 100644
index 0000000..6c87abb
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc1999.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2024.png b/kstars/kstarslite/res/dso/thumb-ngc2024.png
new file mode 100644
index 0000000..d7e8260
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2024.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2301.png b/kstars/kstarslite/res/dso/thumb-ngc2301.png
new file mode 100644
index 0000000..e4bcff1
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2301.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2353.png b/kstars/kstarslite/res/dso/thumb-ngc2353.png
new file mode 100644
index 0000000..e1e40e3
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2353.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2360.png b/kstars/kstarslite/res/dso/thumb-ngc2360.png
new file mode 100644
index 0000000..f5a3fd9
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2360.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2362.png b/kstars/kstarslite/res/dso/thumb-ngc2362.png
new file mode 100644
index 0000000..300362a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2362.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2392.png b/kstars/kstarslite/res/dso/thumb-ngc2392.png
new file mode 100644
index 0000000..8467886
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2392.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2419.png b/kstars/kstarslite/res/dso/thumb-ngc2419.png
new file mode 100644
index 0000000..654939a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2419.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc246.png b/kstars/kstarslite/res/dso/thumb-ngc246.png
new file mode 100644
index 0000000..78213ff
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc246.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc247.png b/kstars/kstarslite/res/dso/thumb-ngc247.png
new file mode 100644
index 0000000..32266bc
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc247.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc253.png b/kstars/kstarslite/res/dso/thumb-ngc253.png
new file mode 100644
index 0000000..5902cb0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc253.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2683.png b/kstars/kstarslite/res/dso/thumb-ngc2683.png
new file mode 100644
index 0000000..6837031
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2683.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc2841.png b/kstars/kstarslite/res/dso/thumb-ngc2841.png
new file mode 100644
index 0000000..14e887f
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc2841.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc288.png b/kstars/kstarslite/res/dso/thumb-ngc288.png
new file mode 100644
index 0000000..98a4963
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc288.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc3190.png b/kstars/kstarslite/res/dso/thumb-ngc3190.png
new file mode 100644
index 0000000..3491197
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc3190.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc3198.png b/kstars/kstarslite/res/dso/thumb-ngc3198.png
new file mode 100644
index 0000000..44a0e49
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc3198.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc3242.png b/kstars/kstarslite/res/dso/thumb-ngc3242.png
new file mode 100644
index 0000000..e2f3ed2
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc3242.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc3675.png b/kstars/kstarslite/res/dso/thumb-ngc3675.png
new file mode 100644
index 0000000..09d8731
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc3675.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc3726.png b/kstars/kstarslite/res/dso/thumb-ngc3726.png
new file mode 100644
index 0000000..767b551
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc3726.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc3945.png b/kstars/kstarslite/res/dso/thumb-ngc3945.png
new file mode 100644
index 0000000..4e0a8e1
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc3945.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc3953.png b/kstars/kstarslite/res/dso/thumb-ngc3953.png
new file mode 100644
index 0000000..7f83b83
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc3953.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc40.png b/kstars/kstarslite/res/dso/thumb-ngc40.png
new file mode 100644
index 0000000..cdba36e
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc40.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc4051.png b/kstars/kstarslite/res/dso/thumb-ngc4051.png
new file mode 100644
index 0000000..c5a89ce
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc4051.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc4088.png b/kstars/kstarslite/res/dso/thumb-ngc4088.png
new file mode 100644
index 0000000..da107db
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc4088.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc457.png b/kstars/kstarslite/res/dso/thumb-ngc457.png
new file mode 100644
index 0000000..40f2070
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc457.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc4725.png b/kstars/kstarslite/res/dso/thumb-ngc4725.png
new file mode 100644
index 0000000..e12ae1b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc4725.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc5248.png b/kstars/kstarslite/res/dso/thumb-ngc5248.png
new file mode 100644
index 0000000..1f8ee58
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc5248.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc5566.png b/kstars/kstarslite/res/dso/thumb-ngc5566.png
new file mode 100644
index 0000000..e82facd
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc5566.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc5746.png b/kstars/kstarslite/res/dso/thumb-ngc5746.png
new file mode 100644
index 0000000..8873f52
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc5746.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc5897.png b/kstars/kstarslite/res/dso/thumb-ngc5897.png
new file mode 100644
index 0000000..21fba7d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc5897.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc5907.png b/kstars/kstarslite/res/dso/thumb-ngc5907.png
new file mode 100644
index 0000000..9892dd0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc5907.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc6229.png b/kstars/kstarslite/res/dso/thumb-ngc6229.png
new file mode 100644
index 0000000..e69ecad
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc6229.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc663.png b/kstars/kstarslite/res/dso/thumb-ngc663.png
new file mode 100644
index 0000000..3d2e9fe
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc663.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc6712.png b/kstars/kstarslite/res/dso/thumb-ngc6712.png
new file mode 100644
index 0000000..70a6289
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc6712.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc6781.png b/kstars/kstarslite/res/dso/thumb-ngc6781.png
new file mode 100644
index 0000000..2b94366
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc6781.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc6946.png b/kstars/kstarslite/res/dso/thumb-ngc6946.png
new file mode 100644
index 0000000..20461e0
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc6946.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc7008.png b/kstars/kstarslite/res/dso/thumb-ngc7008.png
new file mode 100644
index 0000000..3b8178d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc7008.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc7331.png b/kstars/kstarslite/res/dso/thumb-ngc7331.png
new file mode 100644
index 0000000..76e2075
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc7331.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc7479.png b/kstars/kstarslite/res/dso/thumb-ngc7479.png
new file mode 100644
index 0000000..12dc065
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc7479.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc752.png b/kstars/kstarslite/res/dso/thumb-ngc752.png
new file mode 100644
index 0000000..3b6078d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc752.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc7662.png b/kstars/kstarslite/res/dso/thumb-ngc7662.png
new file mode 100644
index 0000000..f69074a
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc7662.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc7686.png b/kstars/kstarslite/res/dso/thumb-ngc7686.png
new file mode 100644
index 0000000..65d59c9
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc7686.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc772.png b/kstars/kstarslite/res/dso/thumb-ngc772.png
new file mode 100644
index 0000000..68c841d
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc772.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc891.png b/kstars/kstarslite/res/dso/thumb-ngc891.png
new file mode 100644
index 0000000..39705f7
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc891.png
Binary files differ
diff --git a/kstars/kstarslite/res/dso/thumb-ngc936.png b/kstars/kstarslite/res/dso/thumb-ngc936.png
new file mode 100644
index 0000000..3adaa2b
--- /dev/null
+++ b/kstars/kstarslite/res/dso/thumb-ngc936.png
Binary files differ
diff --git a/kstars/kstarslite/skyitems/deepskyitem.cpp b/kstars/kstarslite/skyitems/deepskyitem.cpp
index 8bb5a81..3da3fe8 100644
--- a/kstars/kstarslite/skyitems/deepskyitem.cpp
+++ b/kstars/kstarslite/skyitems/deepskyitem.cpp
@@ -28,11 +28,21 @@
#include "skymesh.h"
#include "rootnode.h"
-DSOIndexNode::DSOIndexNode(DeepSkyIndex *index)
- :m_index(index), m_trixImage(new QSGNode), m_trixSymbol(new QSGNode)
+DSOIndexNode::DSOIndexNode(DeepSkyIndex *index, LabelsItem::label_t labelType, QString colorString)
+ :m_index(index), m_trixels(new QSGNode), m_labelType(labelType)
{
- appendChildNode(m_trixImage);
- appendChildNode(m_trixSymbol);
+ m_color = KStarsData::Instance()->colorScheme()->colorNamed( colorString );
+ appendChildNode(m_trixels);
+}
+
+void DSOIndexNode::hide() {
+ SkyOpacityNode::hide();
+ SkyMapLite::Instance()->rootNode()->labelsItem()->hideLabels(m_labelType);
+}
+
+void DSOIndexNode::show() {
+ SkyOpacityNode::show();
+ SkyMapLite::Instance()->rootNode()->labelsItem()->showLabels(m_labelType);
}
DSOTrixelNode::DSOTrixelNode(Trixel trixelID)
@@ -44,20 +54,19 @@ DSOTrixelNode::DSOTrixelNode(Trixel trixelID)
DeepSkyItem::DeepSkyItem(DeepSkyComponent *dsoComp, RootNode *rootNode)
:SkyItem(LabelsItem::label_t::DEEP_SKY_LABEL, rootNode), m_dsoComp(dsoComp),
m_skyMesh(SkyMesh::Instance())
-
- /*,m_starLabels(rootNode->labelsItem()->getLabelNode(labelType())), m_stars(new SkyOpacityNode),
- m_deepStars(new SkyOpacityNode)*/
{
- m_Messier = new DSOIndexNode(&(m_dsoComp->m_MessierIndex));
+ m_Messier = new DSOIndexNode(&(m_dsoComp->m_MessierIndex), LabelsItem::label_t::DSO_MESSIER_LABEL,
+ "MessColor");
appendChildNode(m_Messier);
- m_NGC = new DSOIndexNode(&(m_dsoComp->m_NGCIndex));
+ m_NGC = new DSOIndexNode(&(m_dsoComp->m_NGCIndex), LabelsItem::label_t::DSO_NGC_LABEL, "NGCColor");
appendChildNode(m_NGC);
- m_IC = new DSOIndexNode(&(m_dsoComp->m_ICIndex));
+ m_IC = new DSOIndexNode(&(m_dsoComp->m_ICIndex), LabelsItem::label_t::DSO_IC_LABEL, "ICColor");
appendChildNode(m_IC);
- m_other = new DSOIndexNode(&(m_dsoComp->m_OtherIndex));
+ m_other = new DSOIndexNode(&(m_dsoComp->m_OtherIndex), LabelsItem::label_t::DSO_OTHER_LABEL,
+ "NGCColor");
appendChildNode(m_other);
QSGNode *n = firstChild();
@@ -65,8 +74,10 @@ DeepSkyItem::DeepSkyItem(DeepSkyComponent *dsoComp, RootNode *rootNode)
while(n != 0 ) {
DSOIndexNode *indexNode = static_cast<DSOIndexNode *>(n);
DeepSkyIndex *index = indexNode->m_index;
+
QMap<int, DeepSkyList* > result;
QHashIterator<int, DeepSkyList*> it(*index);
+
while (it.hasNext()) {
it.next();
result.insert(it.key(), it.value());
@@ -77,22 +88,26 @@ DeepSkyItem::DeepSkyItem(DeepSkyComponent *dsoComp, RootNode *rootNode)
while(i != result.constEnd()) {
DeepSkyList *dsoList = i.value();
- DSOTrixelNode *trixelImage = new DSOTrixelNode(i.key());
- DSOTrixelNode *trixelSymbol = new DSOTrixelNode(i.key());
+ DSOTrixelNode *trixel = new DSOTrixelNode(i.key());
+ trixel->m_labels = rootNode->labelsItem()->addTrixel(indexNode->m_labelType, i.key());
- indexNode->m_trixImage->appendChildNode(trixelImage);
- indexNode->m_trixSymbol->appendChildNode(trixelSymbol);
+ indexNode->m_trixels->appendChildNode(trixel);
+ QSGNode *symbols = new QSGNode;
for(int c = 0; c < dsoList->size(); ++c) {
DeepSkyObject *dso = dsoList->at(c);
if(dso) {
- DSOSymbolNode *dsoSymbol = new DSOSymbolNode(dso);
- trixelSymbol->appendChildNode(dsoSymbol);
+ DSOSymbolNode *dsoSymbol = new DSOSymbolNode(dso, indexNode->m_color);
+ symbols->appendChildNode(dsoSymbol);
- DeepSkyNode *dsoNode = new DeepSkyNode(dso, dsoSymbol);
- trixelImage->appendChildNode(dsoNode);
+ DeepSkyNode *dsoNode = new DeepSkyNode(dso, dsoSymbol,i.key(), indexNode->m_labelType);
+ trixel->appendChildNode(dsoNode);
}
}
+
+ trixel->m_symbols = symbols;
+ trixel->appendChildNode(symbols);
+
++i;
}
n = n->nextSibling();
@@ -133,61 +148,6 @@ void DeepSkyItem::update() {
void DeepSkyItem::updateDeepSkyNode(DSOIndexNode *indexNode, bool drawObject, const QString& colorString,
MeshIterator *region, bool drawImage)
{
-#ifndef KSTARS_LITE
- //adjust maglimit for ZoomLevel
- double lgmin = log10(MINZOOM);
- double lgmax = log10(MAXZOOM);
- double lgz = log10(Options::zoomFactor());
- if ( lgz <= 0.75 * lgmax )
- maglim -= (Options::magLimitDrawDeepSky() - Options::magLimitDrawDeepSkyZoomOut() )*(0.75*lgmax - lgz)/(0.75*lgmax - lgmin);
- m_zoomMagLimit = maglim;
-
- double labelMagLim = Options::deepSkyLabelDensity();
- labelMagLim += ( Options::magLimitDrawDeepSky() - labelMagLim ) * ( lgz - lgmin) / (lgmax - lgmin );
- if ( labelMagLim > Options::magLimitDrawDeepSky() ) labelMagLim = Options::magLimitDrawDeepSky();
-
- ////
- //DrawID drawID = m_skyMesh->drawID();
- MeshIterator region( m_skyMesh, DRAW_BUF );
-
- while ( region.hasNext() ) {
-
- Trixel trixel = region.next();
- DeepSkyList* dsList = dsIndex->value( trixel );
- if ( dsList == 0 ) continue;
- for (int j = 0; j < dsList->size(); j++ ) {
- DeepSkyObject *obj = dsList->at( j );
-
- //if ( obj->drawID == drawID ) continue; // only draw each line once
- //obj->drawID = drawID;
-
- if ( obj->updateID != updateID ) {
- obj->updateID = updateID;
- if ( obj->updateNumID != updateNumID) {
- obj->updateCoords( data->updateNum() );
- }
- obj->EquatorialToHorizontal( data->lst(), data->geo()->lat() );
- }
-
- float mag = obj->mag();
- float size = obj->a() * dms::PI * Options::zoomFactor() / 10800.0;
-
- //only draw objects if flags set, it's bigger than 1 pixel (unless
- //zoom > 2000.), and it's brighter than maglim (unless mag is
- //undefined (=99.9)
- bool sizeCriterion = (size > 1.0 || Options::zoomFactor() > 2000.);
- bool magCriterion = ( mag < (float)maglim ) || ( showUnknownMagObjects && ( std::isnan( mag ) || mag > 36.0 ) );
- if ( sizeCriterion && magCriterion )
- {
-
- bool drawn = skyp->drawDeepSkyObject(obj, drawImage);
- if ( drawn && !( m_hideLabels || mag > labelMagLim ) )
- addLabel( proj->toScreen(obj), obj );
- //FIXME: find a better way to do above
- }
- }
- }
-#endif
if ( ! ( drawObject || drawImage ) ) {
indexNode->hide();
return;
@@ -241,44 +201,41 @@ void DeepSkyItem::updateDeepSkyNode(DSOIndexNode *indexNode, bool drawObject, co
show();
}*/
- DSOTrixelNode *trixelImg = static_cast<DSOTrixelNode *>(indexNode->m_trixImage->firstChild());
- DSOTrixelNode *trixelSymbol = static_cast<DSOTrixelNode *>(indexNode->m_trixSymbol->firstChild());
- while( trixelImg != 0 ) {
- if(trixelImg->trixel < regionID) {
- trixelImg->hide();
- trixelSymbol->hide();
+ DSOTrixelNode *trixel = static_cast<DSOTrixelNode *>(indexNode->m_trixels->firstChild());
+ while( trixel != 0 ) {
+ if(trixel->trixel < regionID) {
+ trixel->hide();
+ trixel->m_labels->hide();
//label->hide();
- trixelImg = static_cast<DSOTrixelNode *>(trixelImg->nextSibling());
- trixelSymbol = static_cast<DSOTrixelNode *>(trixelSymbol->nextSibling());
+ trixel = static_cast<DSOTrixelNode *>(trixel->nextSibling());
//label = static_cast<TrixelNode *>(label->nextSibling());
continue;
- } else if(trixelImg->trixel > regionID) {
+ } else if(trixel->trixel > regionID) {
if (region->hasNext()) {
regionID = region->next();
} else {
- while(trixelImg != 0) {
- trixelImg->hide();
- trixelSymbol->hide();
+ while(trixel != 0) {
+ trixel->hide();
+ trixel->m_labels->hide();
- trixelImg = static_cast<DSOTrixelNode *>(trixelImg->nextSibling());
- trixelSymbol = static_cast<DSOTrixelNode *>(trixelSymbol->nextSibling());
+ trixel = static_cast<DSOTrixelNode *>(trixel->nextSibling());
}
break;
}
continue;
} else {
- trixelImg->show();
- trixelSymbol->show();
- //label->show();
+ trixel->show();
+ trixel->m_labels->show();
+
if(region->hasNext()) {
regionID = region->next();
}
}
- QSGNode *n = trixelImg->firstChild();
+ QSGNode *n = trixel->firstChild();
- while(n != 0) {
+ while(n != 0 && n != trixel->m_symbols) {
DeepSkyNode *dsoNode = static_cast<DeepSkyNode *>(n);
n = n->nextSibling();
@@ -304,18 +261,19 @@ void DeepSkyItem::updateDeepSkyNode(DSOIndexNode *indexNode, bool drawObject, co
bool magCriterion = ( mag < (float)maglim ) || ( showUnknownMagObjects && ( std::isnan( mag ) || mag > 36.0 ) );
if ( sizeCriterion && magCriterion )
{
- dsoNode->update(drawImage);
+ bool drawLabel = false;
+ if ( !( m_hideLabels || mag > labelMagLim ) ) drawLabel = true;
+
+ dsoNode->update(drawImage, drawLabel);
/*bool drawn = skyp->drawDeepSkyObject(obj, drawImage);
- if ( drawn && !( m_hideLabels || mag > labelMagLim ) )
- addLabel( proj->toScreen(obj), obj );
+
//FIXME: find a better way to do above*/
} else {
dsoNode->hide();
}
}
- trixelImg = static_cast<DSOTrixelNode *>(trixelImg->nextSibling());
- trixelSymbol = static_cast<DSOTrixelNode *>(trixelSymbol->nextSibling());
+ trixel = static_cast<DSOTrixelNode *>(trixel->nextSibling());
//label = static_cast<TrixelNode *>(label->nextSibling());
}
region->reset();
diff --git a/kstars/kstarslite/skyitems/deepskyitem.h b/kstars/kstarslite/skyitems/deepskyitem.h
index cd1d6ea..4f7be8d 100644
--- a/kstars/kstarslite/skyitems/deepskyitem.h
+++ b/kstars/kstarslite/skyitems/deepskyitem.h
@@ -23,15 +23,23 @@
class DSOIndexNode : public SkyOpacityNode {
public:
- DSOIndexNode(DeepSkyIndex *index);
- QSGNode *m_trixImage;
- QSGNode *m_trixSymbol;
+ DSOIndexNode(DeepSkyIndex *index, LabelsItem::label_t labelType, QString colorString);
+
+ QSGNode *m_trixels;
DeepSkyIndex *m_index;
+
+ LabelsItem::label_t m_labelType;
+ QColor m_color;
+
+ virtual void hide();
+ virtual void show();
};
class DSOTrixelNode : public TrixelNode {
public:
DSOTrixelNode(Trixel trixelID);
+ TrixelNode *m_labels;
+ QSGNode *m_symbols;
Trixel trixel;
};
diff --git a/kstars/kstarslite/skyitems/deepstaritem.cpp b/kstars/kstarslite/skyitems/deepstaritem.cpp
index ffb9b9a..e7a8140 100644
--- a/kstars/kstarslite/skyitems/deepstaritem.cpp
+++ b/kstars/kstarslite/skyitems/deepstaritem.cpp
@@ -37,11 +37,10 @@ DeepStarItem::DeepStarItem(DeepStarComponent *deepStarComp, RootNode *rootNode)
//Test
Options::setShowStarMagnitudes(false);
Options::setShowStarNames(true);
-
- for(int c = 0; c < m_starBlockList->size(); ++c) {
- TrixelNode *trixel = new TrixelNode;
- appendChildNode(trixel);
- if(m_staticStars) {
+ if(m_staticStars) {
+ for(int c = 0; c < m_starBlockList->size(); ++c) {
+ TrixelNode *trixel = new TrixelNode;
+ appendChildNode(trixel);
int blockCount = m_starBlockList->at( c )->getBlockCount();
for( int i = 0; i < blockCount; ++i ) {
diff --git a/kstars/kstarslite/skyitems/labelsitem.cpp b/kstars/kstarslite/skyitems/labelsitem.cpp
index 1913486..a16f7db 100644
--- a/kstars/kstarslite/skyitems/labelsitem.cpp
+++ b/kstars/kstarslite/skyitems/labelsitem.cpp
@@ -36,7 +36,9 @@ LabelsItem::LabelsItem()
int trixelNum = SkyMesh::Instance()->size();
for(int i = 0; i < trixelNum; ++i) {
- stars->appendChildNode(new TrixelNode);
+ TrixelNode *trixel = new TrixelNode;
+ trixel->m_trixel = i;
+ stars->appendChildNode(trixel);
}
m_labelsLists.insert(label_t::STAR_LABEL, stars);
@@ -120,9 +122,19 @@ LabelNode *LabelsItem::addLabel(SkyObject *skyObject, label_t labelType) {
}
LabelNode *LabelsItem::addLabel(SkyObject *skyObject, label_t labelType, Trixel trixel) {
- Q_ASSERT(labelType == STAR_LABEL);
- LabelNode *label = new LabelNode(skyObject, labelType);
- m_labelsLists.value(labelType)->childAtIndex(trixel)->appendChildNode(label);
+ Q_ASSERT(labelType == STAR_LABEL || labelType == DSO_MESSIER_LABEL || labelType == DSO_NGC_LABEL
+ || labelType == DSO_IC_LABEL || labelType == DSO_OTHER_LABEL);
+ TrixelNode *triNode = static_cast<TrixelNode *>(m_labelsLists.value(labelType)->firstChild());
+ LabelNode *label = 0;
+
+ while(triNode != 0) {
+ if(triNode->m_trixel == trixel) {
+ label = new LabelNode(skyObject, labelType);
+ triNode->appendChildNode(label);
+ break;
+ }
+ triNode = static_cast<TrixelNode *>(triNode->nextSibling());
+ }
return label;
}
@@ -138,6 +150,13 @@ GuideLabelNode *LabelsItem::addGuideLabel(QString name, label_t labelType) {
return label;
}
+TrixelNode *LabelsItem::addTrixel(label_t labelType, Trixel trixel) {
+ TrixelNode *triNode = new TrixelNode;
+ triNode->m_trixel = trixel;
+ getLabelNode(labelType)->appendChildNode(triNode);
+ return triNode;
+}
+
void LabelsItem::update() {
SkyLabeler * skyLabeler = SkyLabeler::Instance();
skyLabeler->reset();
@@ -154,21 +173,26 @@ void LabelsItem::update() {
updateChildLabels(label_t::SATURN_MOON_LABEL);
updateChildLabels(label_t::ASTEROID_LABEL);
- if(getLabelNode(label_t::COMET_LABEL)->visible()) {
- updateChildLabels(label_t::COMET_LABEL);
- }
+ updateChildLabels(label_t::COMET_LABEL);
updateChildLabels(label_t::CONSTEL_NAME_LABEL);
- if(getLabelNode(label_t::STAR_LABEL)->visible()) {
- updateChildLabels(label_t::STAR_LABEL);
- }
+ updateChildLabels(label_t::DSO_MESSIER_LABEL);
+ updateChildLabels(label_t::DSO_NGC_LABEL);
+ updateChildLabels(label_t::DSO_IC_LABEL);
+ updateChildLabels(label_t::DSO_OTHER_LABEL);
+
+ updateChildLabels(label_t::STAR_LABEL);
}
void LabelsItem::hideLabels(label_t labelType) {
if (labelType != NO_LABEL) m_labelsLists[labelType]->hide();
}
+void LabelsItem::showLabels(label_t labelType) {
+ if (labelType != NO_LABEL) m_labelsLists[labelType]->show();
+}
+
void LabelsItem::setRootNode(RootNode *rootNode) {
//Remove from previous parent if had any
if(m_rootNode && parent() == m_rootNode) m_rootNode->removeChildNode(this);
@@ -227,10 +251,10 @@ void LabelsItem::deleteLabel(LabelNode *label) {
void LabelsItem::updateChildLabels(label_t labelType) {
LabelTypeNode *node = m_labelsLists[labelType];
- node->show();
+ if(node->visible()) {
- QSGNode *n = node->firstChild();
- /*if( labelType == label_t::HORIZON_LABEL
+ QSGNode *n = node->firstChild();
+ /*if( labelType == label_t::HORIZON_LABEL
|| labelType == label_t::ECLIPTIC_LABEL || labelType == label_t::EQUATOR_LABEL) {
while( n != 0) {
GuideLabelNode *label = static_cast<GuideLabelNode *>(n);
@@ -246,44 +270,44 @@ void LabelsItem::updateChildLabels(label_t labelType) {
n = n->nextSibling();
}
} else {*/
- while( n != 0) {
- /*
+ while( n != 0) {
+ /*
* int max = int( m_zoomMagLimit * 10.0 );
if ( max < 0 ) max = 0;
if ( max > MAX_LINENUMBER_MAG ) max = MAX_LINENUMBER_MAG;
*/
- if(labelType == STAR_LABEL || labelType == DSO_NGC_LABEL || labelType == DSO_MESSIER_LABEL
- || labelType == DSO_IC_LABEL || labelType == DSO_OTHER_LABEL) {
- TrixelNode *trixel = static_cast<TrixelNode *>(n);
-
- if(trixel->visible()) {
- QSGNode *l = trixel->firstChild();
-
- while(l != 0) {
- LabelNode *label = static_cast<LabelNode *>(l);
- l = l->nextSibling();
+ if(labelType == STAR_LABEL || labelType == DSO_NGC_LABEL || labelType == DSO_MESSIER_LABEL
+ || labelType == DSO_IC_LABEL || labelType == DSO_OTHER_LABEL) {
+ TrixelNode *trixel = static_cast<TrixelNode *>(n);
+ if(trixel->visible()) {
+ QSGNode *l = trixel->firstChild();
+
+ while(l != 0) {
+ LabelNode *label = static_cast<LabelNode *>(l);
+ l = l->nextSibling();
+
+ if(skyLabeler->markText(label->labelPos, label->name())) {
+ label->update();
+ } else {
+ label->hide();
+ }
+ }
+ }
+ } else {
+ LabelNode *label = static_cast<LabelNode *>(n);
+ //n = n->nextSibling();
+ if(label->visible()) {
+ if(label->zoomFont()) skyLabeler->resetFont();
if(skyLabeler->markText(label->labelPos, label->name())) {
label->update();
} else {
label->hide();
}
+ skyLabeler->useStdFont();
}
}
- } else {
- LabelNode *label = static_cast<LabelNode *>(n);
- //n = n->nextSibling();
-
- if(label->visible()) {
- if(label->zoomFont()) skyLabeler->resetFont();
- if(skyLabeler->markText(label->labelPos, label->name())) {
- label->update();
- } else {
- label->hide();
- }
- skyLabeler->useStdFont();
- }
+ n = n->nextSibling();
}
- n = n->nextSibling();
}
}
diff --git a/kstars/kstarslite/skyitems/labelsitem.h b/kstars/kstarslite/skyitems/labelsitem.h
index 99e333d..f72462f 100644
--- a/kstars/kstarslite/skyitems/labelsitem.h
+++ b/kstars/kstarslite/skyitems/labelsitem.h
@@ -158,6 +158,17 @@ public:
void hideLabels(label_t labelType);
/**
+ * @short shows all labels of type labelType
+ */
+
+ void showLabels(label_t labelType);
+
+ /**
+ * @short adds trixel to the node corresponding to labelType
+ */
+ TrixelNode *addTrixel(label_t labelType, Trixel trixel);
+
+ /**
* @short sets m_rootNode and appends to it this node
* @param rootNode
*/
diff --git a/kstars/kstarslite/skyitems/lines/milkywayitem.cpp b/kstars/kstarslite/skyitems/lines/milkywayitem.cpp
new file mode 100644
index 0000000..baec4dd
--- /dev/null
+++ b/kstars/kstarslite/skyitems/lines/milkywayitem.cpp
@@ -0,0 +1,116 @@
+/** *************************************************************************
+ linesitem.cpp - K Desktop Planetarium
+ -------------------
+ begin : 1/06/2016
+ copyright : (C) 2016 by Artem Fedoskin
+ email : afedoskin3@gmail.com
+ ***************************************************************************/
+/** *************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include "Options.h"
+#include "projections/projector.h"
+#include <QSGNode>
+
+#include "linesitem.h"
+#include "linelist.h"
+#include "linelistindex.h"
+#include "../skynodes/nodes/linenode.h"
+
+LinesItem::LinesItem(RootNode *rootNode)
+ :SkyItem(LabelsItem::label_t::NO_LABEL, rootNode)
+{
+
+}
+
+void LinesItem::addLinesComponent(LineListIndex *linesComp, QString color, int width, Qt::PenStyle style) {
+ LineIndexNode *node = new LineIndexNode;
+ appendChildNode(node);
+
+ m_lineIndexes.insert(node, linesComp);
+ LineListHash *trixels = linesComp->lineIndex();
+
+ QHash< Trixel, LineListList *>::const_iterator i = trixels->begin();
+ while( i != trixels->end()) {
+ LineListList *linesList = *i;
+
+ if(linesList->size()) {
+ TrixelNode *trixel = new TrixelNode;
+ node->appendChildNode(trixel);
+
+ QColor schemeColor = KStarsData::Instance()->colorScheme()->colorNamed(color);
+ for(int c = 0; c < linesList->size(); ++c) {
+ //LineNode * ln = new LineNode(linesList->at(c), schemeColor, width, style);
+ /*trixel->appendChildNode(ln);*/
+ trixel->appendChildNode(new LineNode(linesList->at(c), schemeColor, width, style));
+ }
+ }
+ ++i;
+ }
+}
+
+void LinesItem::update() {
+ QMap< LineIndexNode *, LineListIndex *>::const_iterator i = m_lineIndexes.begin();
+ while( i != m_lineIndexes.end()) {
+ //QVector<Trixel> visTrixels;
+ SkyMesh * mesh = SkyMesh::Instance();
+ SkyMapLite *map = SkyMapLite::Instance();
+ double radius = map->projector()->fov();
+ if ( radius > 180.0 )
+ radius = 180.0;
+ if(mesh) {
+ //mesh->aperture(map->focus(), radius);
+ }
+
+ /*MeshIterator region (mesh,DRAW_BUF);
+ while ( region.hasNext() ) {
+ visTrixels.append(region.next());
+ }*/
+
+ DrawID drawID = SkyMesh::Instance()->drawID();
+ //UpdateID updateID = KStarsData::Instance()->updateID();
+
+ LineIndexNode * node = i.key();
+ if(i.value()->selected()) {
+ node->show();
+
+ QSGNode *n = node->firstChild();
+ while(n != 0) {
+ TrixelNode * trixel = static_cast<TrixelNode *>(n);
+ trixel->show();
+
+ n = n->nextSibling();
+
+ //if(visTrixels.contains(c)) {
+
+ QSGNode *l = trixel->firstChild();
+ while(l != 0) {
+ LineNode * lines = static_cast<LineNode *>(l);
+ l = l->nextSibling();
+
+ LineList * lineList = lines->lineList();
+ if ( lineList->drawID == drawID ) {
+ lines->hide();
+ continue;
+ }
+ lineList->drawID = drawID;
+ lines->updateGeometry();
+ }
+
+ /* } else {
+ trixel->hide();
+ }*/
+ }
+ } else {
+ node->hide();
+ }
+ ++i;
+ }
+}
+
diff --git a/kstars/kstarslite/skyitems/lines/milkywayitem.h b/kstars/kstarslite/skyitems/lines/milkywayitem.h
new file mode 100644
index 0000000..c8d84b7
--- /dev/null
+++ b/kstars/kstarslite/skyitems/lines/milkywayitem.h
@@ -0,0 +1,66 @@
+/** *************************************************************************
+ linesitem.h - K Desktop Planetarium
+ -------------------
+ begin : 1/06/2016
+ copyright : (C) 2016 by Artem Fedoskin
+ email : afedoskin3@gmail.com
+ ***************************************************************************/
+/** *************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#ifndef MILKYWAYITEM_H_
+#define MILKYWAYITEM_H_
+
+#include "../skyitem.h"
+#include "../skyopacitynode.h"
+#include "../typedeflite.h"
+
+class LineListIndex;
+
+ /** @class LinesItem
+ *
+ * Class that handles lines (Constellation lines and boundaries and both coordinate grids) in
+ * SkyMapLite.
+ *
+ * To display lines component use addLinesComponent.
+ *
+ *@note see RootNode::RootNode() for example of adding lines
+ *@short Class that handles most of the lines in SkyMapLite
+ *@author Artem Fedoskin
+ *@version 1.0
+ */
+
+class MilkyWayItem : public SkyItem {
+public:
+ /**
+ * @short Constructor.
+ * @param rootNode parent RootNode that instantiated this object
+ */
+ MilkyWayItem(RootNode *rootNode);
+
+ /**
+ * @short adds LinesListIndex that is needed to be displayed to m_lineIndexes
+ * @param linesComp LineListIndex derived object
+ * @param color desired color of lines specified as name of entry in ColorScheme
+ * @param width thickness of lines
+ * @param style desired style (currently supports only Qt::SolidLine)
+ */
+ void addLinesComponent(LineListIndex *linesComp, QString color, int width, Qt::PenStyle style);
+
+ /**
+ * @short updates all trixels that are associated with LineListIndex or hide them if selected()
+ * of this LineListIndex returns false
+ */
+
+ virtual void update();
+private:
+ QMap<LineIndexNode *, LineListIndex *> m_lineIndexes;
+ //QMap<QSGOpacityNode *, QVector<TrixelNode *> > m_trixelNodes;
+};
+#endif
+
diff --git a/kstars/kstarslite/skyitems/skynodes/deepskynode.cpp b/kstars/kstarslite/skyitems/skynodes/deepskynode.cpp
index 6d3e529..3d19f6a 100644
--- a/kstars/kstarslite/skyitems/skynodes/deepskynode.cpp
+++ b/kstars/kstarslite/skyitems/skynodes/deepskynode.cpp
@@ -27,8 +27,10 @@
#include "../labelsitem.h"
#include "labelnode.h"
-DeepSkyNode::DeepSkyNode(DeepSkyObject * skyObject, DSOSymbolNode *symbol)
- :m_dso(skyObject),m_objImg(0), m_symbol(symbol)//, m_label(0), m_labelType(labelType), m_rootNode(parentNode), m_trixel(trixel)
+DeepSkyNode::DeepSkyNode(DeepSkyObject * skyObject, DSOSymbolNode *symbol, Trixel trixel,
+ LabelsItem::label_t labelType)
+ :m_dso(skyObject),m_objImg(0), m_symbol(symbol), m_trixel(trixel), m_labelType(labelType),
+ m_label(0)
{
}
@@ -47,7 +49,7 @@ void DeepSkyNode::changePos(QPointF pos) {
markDirty(QSGNode::DirtyMatrix);
}
-void DeepSkyNode::update(bool drawImage) {
+void DeepSkyNode::update(bool drawImage, bool drawLabel) {
const Projector *proj = projector();
if( !proj->checkVisibility(m_dso) ) {
hide();
@@ -95,14 +97,22 @@ void DeepSkyNode::update(bool drawImage) {
} else {
hide();
}
+ //Draw symbol
m_symbol->update(size, pos, m_angle);
- //Draw Symbol
- //drawDeepSkySymbol(pos, obj->type(), size, obj->e(), positionAngle);
+
+ // Draw label
+ if(drawLabel) {
+ if(!m_label) {
+ m_label = SkyMapLite::Instance()->rootNode()->labelsItem()->addLabel(m_dso, m_labelType, m_trixel);
+ }
+ m_label->setLabelPos(pos);
+ } else if(m_label) {
+ m_label->hide();
+ }
}
void DeepSkyNode::hide() {
- //if(m_label) m_label->hide();
SkyNode::hide();
+ if(m_label) m_label->hide();
m_symbol->hide();
- //m_point->hide();
}
diff --git a/kstars/kstarslite/skyitems/skynodes/deepskynode.h b/kstars/kstarslite/skyitems/skynodes/deepskynode.h
index 18033ac..d897a38 100644
--- a/kstars/kstarslite/skyitems/skynodes/deepskynode.h
+++ b/kstars/kstarslite/skyitems/skynodes/deepskynode.h
@@ -45,7 +45,7 @@ public:
* @param spType spectral class of PointNode
* @param size initial size of PointNode
*/
- DeepSkyNode(DeepSkyObject *skyObject, DSOSymbolNode *symbol);
+ DeepSkyNode(DeepSkyObject *skyObject, DSOSymbolNode *symbol, Trixel trixel, LabelsItem::label_t labelType);
/**
* @short changePos changes the position m_point
@@ -53,21 +53,20 @@ public:
*/
void changePos(QPointF pos);
- void update(bool drawImage);
+ void update(bool drawImage, bool drawLabel);
virtual void hide() override;
DeepSkyObject *dsObject() { return m_dso; }
private:
- //RootNode *m_rootNode;
QSGSimpleTextureNode *m_objImg;
+ Trixel m_trixel; //Trixel to which this object belongs. Used only in stars. By default -1 for all
LabelNode *m_label;
LabelsItem::label_t m_labelType;
+
DeepSkyObject *m_dso;
DSOSymbolNode *m_symbol;
float m_angle;
-
- short m_trixel; //Trixel to which this object belongs. Used only in stars. By default -1 for all
QPointF pos;
};
diff --git a/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp b/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp
index 275e7bb..cd94703 100644
--- a/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp
+++ b/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp
@@ -50,8 +50,8 @@ void SymbolNode::updateSymbol(float x, float y, float e, float size) {
yb = y + dyb;
}
-StarSymbol::StarSymbol()
- :m_ellipse(new EllipseNode(QColor("#006666")))
+StarSymbol::StarSymbol(QColor color)
+ :m_ellipse(new EllipseNode(color))
{
appendChildNode(m_ellipse);
}
@@ -65,15 +65,15 @@ void StarSymbol::updateSymbol(float x, float y, float e, float size) {
m_ellipse->updateGeometry(0, 0, int(size/2), int(size/2), false);
}
-AsterismSymbol::AsterismSymbol() {
- e1 = new EllipseNode(QColor("#008f00"));
- e2 = new EllipseNode(QColor("#008f00"));
- e3 = new EllipseNode(QColor("#008f00"));
- e4 = new EllipseNode(QColor("#008f00"));
- e5 = new EllipseNode(QColor("#008f00"));
- e6 = new EllipseNode(QColor("#008f00"));
- e7 = new EllipseNode(QColor("#008f00"));
- e8 = new EllipseNode(QColor("#008f00"));
+AsterismSymbol::AsterismSymbol(QColor color) {
+ e1 = new EllipseNode(color);
+ e2 = new EllipseNode(color);
+ e3 = new EllipseNode(color);
+ e4 = new EllipseNode(color);
+ e5 = new EllipseNode(color);
+ e6 = new EllipseNode(color);
+ e7 = new EllipseNode(color);
+ e8 = new EllipseNode(color);
appendChildNode(e1);
appendChildNode(e2);
appendChildNode(e3);
@@ -100,8 +100,8 @@ void AsterismSymbol::updateSymbol(float x, float y, float e, float size) {
e8->updateGeometry(x2, yb, psize, psize, true);
}
-GlobularClusterSymbol::GlobularClusterSymbol()
- :e1(new EllipseNode(QColor("#008f00")))
+GlobularClusterSymbol::GlobularClusterSymbol(QColor color)
+ :e1(new EllipseNode(color))
{
appendChildNode(e1);
@@ -116,7 +116,7 @@ GlobularClusterSymbol::GlobularClusterSymbol()
lines->setFlag(QSGNode::OwnsGeometry);
QSGFlatColorMaterial *material = new QSGFlatColorMaterial;
- material->setColor(QColor("#008f00"));
+ material->setColor(color);
lines->setOpaqueMaterial(material);
lines->setFlag(QSGNode::OwnsMaterial);
}
@@ -139,7 +139,7 @@ void GlobularClusterSymbol::updateSymbol(float x, float y, float e, float size)
lines->markDirty(QSGNode::DirtyGeometry);
}
-DarkNebulaSymbol::DarkNebulaSymbol() {
+DarkNebulaSymbol::DarkNebulaSymbol(QColor color) {
lines = new QSGGeometryNode;
appendChildNode(lines);
@@ -151,7 +151,7 @@ DarkNebulaSymbol::DarkNebulaSymbol() {
lines->setFlag(QSGNode::OwnsGeometry);
QSGFlatColorMaterial *material = new QSGFlatColorMaterial;
- material->setColor("#006666");
+ material->setColor(color);
lines->setOpaqueMaterial(material);
lines->setFlag(QSGNode::OwnsMaterial);
}
@@ -181,8 +181,8 @@ void DarkNebulaSymbol::updateSymbol(float x, float y, float e, float size) {
lines->markDirty(QSGNode::DirtyGeometry);
}
-PlanetaryNebulaSymbol::PlanetaryNebulaSymbol() {
- e1 = new EllipseNode;
+PlanetaryNebulaSymbol::PlanetaryNebulaSymbol(QColor color) {
+ e1 = new EllipseNode(color);
appendChildNode(e1);
lines = new QSGGeometryNode;
@@ -196,7 +196,7 @@ PlanetaryNebulaSymbol::PlanetaryNebulaSymbol() {
lines->setFlag(QSGNode::OwnsGeometry);
QSGFlatColorMaterial *material = new QSGFlatColorMaterial;
- material->setColor(QColor("#006666"));
+ material->setColor(color);
lines->setOpaqueMaterial(material);
lines->setFlag(QSGNode::OwnsMaterial);
}
@@ -233,7 +233,7 @@ void PlanetaryNebulaSymbol::updateSymbol(float x, float y, float e, float size)
lines->markDirty(QSGNode::DirtyGeometry);
}
-SupernovaRemnantSymbol::SupernovaRemnantSymbol() {
+SupernovaRemnantSymbol::SupernovaRemnantSymbol(QColor color) {
lines = new QSGGeometryNode;
appendChildNode(lines);
@@ -245,19 +245,14 @@ SupernovaRemnantSymbol::SupernovaRemnantSymbol() {
lines->setFlag(QSGNode::OwnsGeometry);
QSGFlatColorMaterial *material = new QSGFlatColorMaterial;
- material->setColor(QColor("#006666"));
+ material->setColor(color);
lines->setOpaqueMaterial(material);
lines->setFlag(QSGNode::OwnsMaterial);
}
void SupernovaRemnantSymbol::updateSymbol(float x, float y, float e, float size) {
SymbolNode::updateSymbol(x, y, e, size);
-
if (size<2.) size = 2.;
- /*drawLine( QPointF(0., dy1), QPointF(dx2, 0.) );
- drawLine( QPointF(dx2, 0.), QPointF(0., dy2) );
- drawLine( QPointF(0., dy2), QPointF(dx1, 0.) );
- drawLine( QPointF(dx1, 0.), QPointF(0., dy1) );*/
QSGGeometry::Point2D * vertex = lines->geometry()->vertexDataAsPoint2D();
//First line
@@ -279,8 +274,8 @@ void SupernovaRemnantSymbol::updateSymbol(float x, float y, float e, float size)
lines->markDirty(QSGNode::DirtyGeometry);
}
-GalaxySymbol::GalaxySymbol()
- :e1(new EllipseNode(QColor("#006666")))
+GalaxySymbol::GalaxySymbol(QColor color)
+ :e1(new EllipseNode(color))
{
appendChildNode(e1);
}
@@ -297,7 +292,7 @@ void GalaxySymbol::updateSymbol(float x, float y, float e, float size) {
}
}
-GalaxyClusterSymbol::GalaxyClusterSymbol()
+GalaxyClusterSymbol::GalaxyClusterSymbol(QColor color)
:lines(new QSGGeometryNode)
{
QSGGeometry *geometry = new QSGGeometry(QSGGeometry::defaultAttributes_Point2D(),0);
@@ -308,7 +303,7 @@ GalaxyClusterSymbol::GalaxyClusterSymbol()
lines->setFlag(QSGNode::OwnsGeometry);
QSGFlatColorMaterial *material = new QSGFlatColorMaterial;
- material->setColor(QColor("#006666"));
+ material->setColor(color);
lines->setOpaqueMaterial(material);
lines->setFlag(QSGNode::OwnsMaterial);
@@ -344,7 +339,7 @@ void GalaxyClusterSymbol::updateSymbol(float x, float y, float e, float size) {
}
-DSOSymbolNode::DSOSymbolNode(DeepSkyObject * skyObject)
+DSOSymbolNode::DSOSymbolNode(DeepSkyObject * skyObject, QColor color)
:m_dso(skyObject), m_symbol(0), m_rotate(false) //We don't rotate the symbol by default
{
int type = m_dso->type();
@@ -352,36 +347,36 @@ DSOSymbolNode::DSOSymbolNode(DeepSkyObject * skyObject)
case 0:
case 1:
//catalog star
- m_symbol = new StarSymbol();
+ m_symbol = new StarSymbol(color);
break;
case 3: //Open cluster; draw circle of points
case 13: // Asterism
- m_symbol = new AsterismSymbol();
+ m_symbol = new AsterismSymbol(color);
break;
case 4: //Globular Cluster
- m_symbol = new GlobularClusterSymbol();
+ m_symbol = new GlobularClusterSymbol(color);
m_rotate = true;
break;
case 5: //Gaseous Nebula
case 15: // Dark Nebula
- m_symbol = new DarkNebulaSymbol();
+ m_symbol = new DarkNebulaSymbol(color);
m_rotate = true;
break;
case 6: //Planetary Nebula
- m_symbol = new PlanetaryNebulaSymbol();
+ m_symbol = new PlanetaryNebulaSymbol(color);
m_rotate = true;
break;
case 7: //Supernova remnant
- m_symbol = new SupernovaRemnantSymbol();
+ m_symbol = new SupernovaRemnantSymbol(color);
m_rotate = true;
break;
case 8: //Galaxy
case 16: // Quasar
- m_symbol = new GalaxySymbol();
+ m_symbol = new GalaxySymbol(color);
m_rotate = true;
break;
case 14: // Galaxy cluster - draw a circle of + marks
- m_symbol = new GalaxyClusterSymbol();
+ m_symbol = new GalaxyClusterSymbol(color);
m_rotate = true;
break;
default:
diff --git a/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h b/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h
index 6bba9a6..e2b3b87 100644
--- a/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h
+++ b/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h
@@ -67,14 +67,14 @@ protected:
class StarSymbol : public SymbolNode {
public:
- StarSymbol();
+ StarSymbol(QColor color = QColor());
virtual void updateSymbol(float x, float y, float e, float size) override;
EllipseNode *m_ellipse;
};
class AsterismSymbol : public SymbolNode {
public:
- AsterismSymbol();
+ AsterismSymbol(QColor color);
virtual void updateSymbol(float x, float y, float e, float size) override;
EllipseNode *e1;
@@ -89,7 +89,7 @@ public:
class GlobularClusterSymbol : public SymbolNode {
public:
- GlobularClusterSymbol();
+ GlobularClusterSymbol(QColor color);
virtual void updateSymbol(float x, float y, float e, float size) override;
EllipseNode *e1;
@@ -98,7 +98,7 @@ public:
class DarkNebulaSymbol : public SymbolNode {
public:
- DarkNebulaSymbol();
+ DarkNebulaSymbol(QColor color);
virtual void updateSymbol(float x, float y, float e, float size) override;
QSGGeometryNode *lines;
@@ -106,7 +106,7 @@ public:
class PlanetaryNebulaSymbol : public SymbolNode {
public:
- PlanetaryNebulaSymbol();
+ PlanetaryNebulaSymbol(QColor color);
virtual void updateSymbol(float x, float y, float e, float size) override;
EllipseNode *e1;
@@ -115,7 +115,7 @@ public:
class SupernovaRemnantSymbol : public SymbolNode {
public:
- SupernovaRemnantSymbol();
+ SupernovaRemnantSymbol(QColor color);
virtual void updateSymbol(float x, float y, float e, float size) override;
QSGGeometryNode *lines;
@@ -123,7 +123,7 @@ public:
class GalaxySymbol : public SymbolNode {
public:
- GalaxySymbol();
+ GalaxySymbol(QColor color);
virtual void updateSymbol(float x, float y, float e, float size) override;
EllipseNode *e1;
@@ -131,7 +131,7 @@ public:
class GalaxyClusterSymbol : public SymbolNode {
public:
- GalaxyClusterSymbol();
+ GalaxyClusterSymbol(QColor color);
virtual void updateSymbol(float x, float y, float e, float size) override;
QSGGeometryNode *lines;
@@ -146,7 +146,7 @@ public:
* @param spType spectral class of PointNode
* @param size initial size of PointNode
*/
- DSOSymbolNode(DeepSkyObject *skyObject);
+ DSOSymbolNode(DeepSkyObject *skyObject, QColor color = QColor());
void changePos(float size, const QPointF &pos, float positionangle);
void update(float size, const QPointF &pos, float positionangle);
private:
diff --git a/kstars/kstarslite/skyitems/skynodes/labelnode.cpp b/kstars/kstarslite/skyitems/skynodes/labelnode.cpp
index a7f4a18..d65e497 100644
--- a/kstars/kstarslite/skyitems/skynodes/labelnode.cpp
+++ b/kstars/kstarslite/skyitems/skynodes/labelnode.cpp
@@ -49,6 +49,11 @@ void LabelNode::initialize() {
case LabelsItem::label_t::COMET_LABEL:
case LabelsItem::label_t::RUDE_LABEL:
case LabelsItem::label_t::ASTEROID_LABEL:
+ case LabelsItem::label_t::DEEP_SKY_LABEL:
+ case LabelsItem::label_t::DSO_MESSIER_LABEL:
+ case LabelsItem::label_t::DSO_NGC_LABEL:
+ case LabelsItem::label_t::DSO_IC_LABEL:
+ case LabelsItem::label_t::DSO_OTHER_LABEL:
m_zoomFont = true;
break;
default:
@@ -77,14 +82,19 @@ void LabelNode::createTexture() {
case LabelsItem::label_t::JUPITER_MOON_LABEL:
case LabelsItem::label_t::COMET_LABEL:
case LabelsItem::label_t::RUDE_LABEL:
- color = KStarsData::Instance()->colorScheme()->colorNamed( "PNameColor" );
- break;
case LabelsItem::label_t::ASTEROID_LABEL:
- color = QColor("gray");
+ color = KStarsData::Instance()->colorScheme()->colorNamed( "PNameColor" );
break;
case LabelsItem::label_t::CONSTEL_NAME_LABEL:
color = KStarsData::Instance()->colorScheme()->colorNamed( "CNameColor" );
break;
+ case LabelsItem::label_t::DEEP_SKY_LABEL:
+ case LabelsItem::label_t::DSO_MESSIER_LABEL:
+ case LabelsItem::label_t::DSO_NGC_LABEL:
+ case LabelsItem::label_t::DSO_IC_LABEL:
+ case LabelsItem::label_t::DSO_OTHER_LABEL:
+ color = KStarsData::Instance()->colorScheme()->colorNamed( "DSNameColor" );
+ break;
case LabelsItem::label_t::STAR_LABEL:
color = KStarsData::Instance()->colorScheme()->colorNamed( "SNameColor" );
break;
diff --git a/kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.cpp b/kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.cpp
index 0160517..7ca0c06 100644
--- a/kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.cpp
+++ b/kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.cpp
@@ -20,20 +20,13 @@
#include <QPolygon>
#include "ellipsenode.h"
-//#include <stdio.h>
-//#include <stdlib.h>
-
-extern "C"
-{
-#include "libtess/tessellate.h"
-}
EllipseNode::EllipseNode(QColor color, int width)
:m_geometryNode(new QSGGeometryNode), m_geometry(0),
- m_material(new QSGFlatColorMaterial), m_fillMode(false)
+ m_material(new QSGFlatColorMaterial), m_fillMode(false), m_width(0), m_height(0)
{
m_geometry = new QSGGeometry (QSGGeometry::defaultAttributes_Point2D(),0);
- m_geometry->allocate(360);
+ m_geometry->allocate(60);
m_geometryNode->setGeometry(m_geometry);
m_geometryNode->setFlag(QSGNode::OwnsGeometry);
@@ -64,23 +57,37 @@ void EllipseNode::setLineWidth(int width) {
void EllipseNode::updateGeometry(float x, float y, int width, int height, bool filled) {
if(filled) {
- m_geometry->setDrawingMode(GL_POLYGON);
+ m_geometry->setDrawingMode(GL_TRIANGLE_FAN);
} else {
m_geometry->setDrawingMode(GL_LINE_LOOP);
}
QSGGeometry::Point2D * vertex = m_geometry->vertexDataAsPoint2D();
- for (int i=0; i < 360; ++i) {
- vertex[i].x = x + width*cos(i*(M_PI/180));
- vertex[i].y = y + height*sin(i*(M_PI/180));
- }
- /*vertex[0].x = 0;
- vertex[0].y = 0;
+ float rad = M_PI/180;
- vertex[1].x = 50;
- vertex[1].x = 50;*/
+ width /= 2;
+ height /= 2;
- m_geometryNode->markDirty(QSGNode::DirtyGeometry);
+ if(m_width != width || m_height != height) {
+ for (int i=0; i < 360; i += 6) {
+ vertex[i/6].x = width*cos(i*rad);
+ vertex[i/6].y = height*sin(i*rad);
+ }
+ m_geometryNode->markDirty(QSGNode::DirtyGeometry);
+
+ m_width = width;
+ m_height = height;
+ }
+ if(m_x != x || m_y != y) {
+ QMatrix4x4 m (1,0,0,x,
+ 0,1,0,y,
+ 0,0,1,0,
+ 0,0,0,1);
+ setMatrix(m);
+ markDirty(QSGNode::DirtyMatrix);
+ m_x = x;
+ m_y = y;
+ }
}
diff --git a/kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.h b/kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.h
index fcdeab0..112f741 100644
--- a/kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.h
+++ b/kstars/kstarslite/skyitems/skynodes/nodes/ellipsenode.h
@@ -32,9 +32,9 @@ class QSGGeometryNode;
class QSGGeometry;
class QSGFlatColorMaterial;
-class EllipseNode : public QSGNode {
+class EllipseNode : public QSGTransformNode {
public:
- EllipseNode(QColor color = QColor(), int width = 0);
+ EllipseNode(QColor color = QColor(), int width = 1);
void setColor(QColor color);
void setLineWidth(int width);
@@ -42,6 +42,12 @@ public:
void updateGeometry(float x, float y, int width, int height, bool filled);
private:
+ int m_width;
+ int m_height;
+
+ float m_x;
+ float m_y;
+
QSGGeometryNode *m_geometryNode;
QSGGeometry *m_geometry;
QSGFlatColorMaterial *m_material;
diff --git a/kstars/kstarslite/skyitems/typedeflite.h b/kstars/kstarslite/skyitems/typedeflite.h
index 6a74965..2cb0e9c 100644
--- a/kstars/kstarslite/skyitems/typedeflite.h
+++ b/kstars/kstarslite/skyitems/typedeflite.h
@@ -1,10 +1,16 @@
#ifndef TYPEDEFLITE_H_
#define TYPEDEFLITE_H_
+#include "typedef.h"
+#include "skyopacitynode.h"
class SkyOpacityNode;
typedef SkyOpacityNode LabelTypeNode;
-typedef SkyOpacityNode TrixelNode;
-typedef SkyOpacityNode LineIndexNode;
+typedef SkyOpacityNode LineIndexNode;
+
+class TrixelNode : public SkyOpacityNode {
+public:
+ Trixel m_trixel;
+};
#endif
diff --git a/kstars/main.cpp b/kstars/main.cpp
index 0211efc..9cbae25 100644
--- a/kstars/main.cpp
+++ b/kstars/main.cpp
@@ -261,6 +261,7 @@ int main(int argc, char *argv[])
Options::setShowNGC(true);
Options::setHideNGC(true);
+ Options::setShowDeepSkyNames(true);
Options::setAutoSelectGrid(false);
diff --git a/kstars/skycomponents/milkyway.cpp b/kstars/skycomponents/milkyway.cpp
index ae09eea..1ebb16a 100644
--- a/kstars/skycomponents/milkyway.cpp
+++ b/kstars/skycomponents/milkyway.cpp
@@ -24,7 +24,9 @@
#include <KLocalizedString>
#include "kstarsdata.h"
-#ifndef KSTARS_LITE
+#ifdef KSTARS_LITE
+#include "skymaplite.h"
+#else
#include "skymap.h"
#endif
#include "skyobjects/skypoint.h"
@@ -69,7 +71,7 @@ bool MilkyWay::selected()
! ( Options::hideOnSlew() && Options::hideMilkyWay() && SkyMap::IsSlewing() );
#else
return Options::showMilkyWay() &&
- ! ( Options::hideOnSlew() && Options::hideMilkyWay() );
+ ! ( Options::hideOnSlew() && Options::hideMilkyWay() && SkyMapLite::IsSlewing() );
#endif
}
diff --git a/kstars/skymaplite.cpp b/kstars/skymaplite.cpp
index 0522162..f31547a 100644
--- a/kstars/skymaplite.cpp
+++ b/kstars/skymaplite.cpp
@@ -127,6 +127,7 @@ QSGNode* SkyMapLite::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *upda
if(m_loadingFinished) {
if(!n) {
n = new RootNode();
+ m_rootNode = n;
}
n->update();
}
diff --git a/kstars/skymaplite.h b/kstars/skymaplite.h
index 13854f0..54d27dd 100644
--- a/kstars/skymaplite.h
+++ b/kstars/skymaplite.h
@@ -41,6 +41,7 @@ class PlanetMoonsComponent;
class HorizonItem;
class LinesItem;
class SkyNode;
+class RootNode;
class QSGTexture;
@@ -288,6 +289,8 @@ public:
/** Used in PointSourceNode **/
inline float sizeMagLim() const { return m_sizeMagLim; }
+ inline RootNode *rootNode() { return m_rootNode; }
+
/**
*@short Proxy method for SkyMapDrawAbstract::drawObjectLabels()
*/
@@ -587,6 +590,8 @@ private:
bool m_objPointingMode;
bool m_fovCaptureMode;
+ RootNode *m_rootNode;
+
Projector* m_proj;
static SkyMapLite *pinstance;