Skip to content

Commit

Permalink
Added SkyImage and NASA Moon Phase
Browse files Browse the repository at this point in the history
  • Loading branch information
msproul committed Apr 6, 2024
1 parent 86014d5 commit 35e54bb
Show file tree
Hide file tree
Showing 72 changed files with 128,411 additions and 699 deletions.
27 changes: 23 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ CAMERA_DRIVER_OBJECTS= \
$(OBJECT_DIR)cameradriver_save.o \
$(OBJECT_DIR)cameradriver_sim.o \
$(OBJECT_DIR)cameradriver_TOUP.o \
$(OBJECT_DIR)NASA_moonphase.o \
$(OBJECT_DIR)multicam.o \
$(OBJECT_DIR)ParseNMEA.o \
$(OBJECT_DIR)NMEA_helper.o \
Expand Down Expand Up @@ -3102,6 +3103,7 @@ SKYTRAVEL_OBJECTS= \
$(OBJECT_DIR)HipparcosCatalog.o \
$(OBJECT_DIR)julianTime.o \
$(OBJECT_DIR)moonphase.o \
$(OBJECT_DIR)NASA_moonphase.o \
$(OBJECT_DIR)NGCcatalog.o \
$(OBJECT_DIR)observatory_settings.o \
$(OBJECT_DIR)OpenNGC.o \
Expand All @@ -3122,11 +3124,11 @@ SKYTRAVEL_OBJECTS= \
$(OBJECT_DIR)windowtab_covercalib.o \
$(OBJECT_DIR)windowtab_deviceselect.o \
$(OBJECT_DIR)windowtab_filterwheel.o \
$(OBJECT_DIR)windowtab_fitsheader.o \
$(OBJECT_DIR)windowtab_fov.o \
$(OBJECT_DIR)windowtab_iplist.o \
$(OBJECT_DIR)windowtab_libraries.o \
$(OBJECT_DIR)windowtab_moon.o \
$(OBJECT_DIR)windowtab_MoonPhase.o \
$(OBJECT_DIR)windowtab_mount.o \
$(OBJECT_DIR)windowtab_obscond.o \
$(OBJECT_DIR)windowtab_multicam.o \
Expand Down Expand Up @@ -3643,27 +3645,30 @@ preview : $(PREVIEW_OBJECTS)
######################################################################################
SKYIMAGE_OBJECTS= \
$(OBJECT_DIR)alpacadriver_helper.o \
$(OBJECT_DIR)commoncolor.o \
$(OBJECT_DIR)controller.o \
$(OBJECT_DIR)controller_image.o \
$(OBJECT_DIR)controller_skyimage.o \
$(OBJECT_DIR)cpu_stats.o \
$(OBJECT_DIR)readconfigfile.o \
$(OBJECT_DIR)commoncolor.o \
$(OBJECT_DIR)fits_opencv.o \
$(OBJECT_DIR)NASA_moonphase.o \
$(OBJECT_DIR)opencv_utils.o \
$(OBJECT_DIR)readconfigfile.o \
$(OBJECT_DIR)windowtab.o \
$(OBJECT_DIR)windowtab_about.o \
$(OBJECT_DIR)windowtab_image.o \
$(OBJECT_DIR)windowtab_imageinfo.o \
$(OBJECT_DIR)windowtab_imageList.o \
$(OBJECT_DIR)windowtab_fitsheader.o \
$(OBJECT_DIR)windowtab_MoonPhase.o \

######################################################################################
# make si skyimage
si : DEFINEFLAGS += -D_ENABLE_SKYIMAGE_
si : DEFINEFLAGS += -D_INCLUDE_CTRL_MAIN_
si : DEFINEFLAGS += -D_ENABLE_CTRL_IMAGE_
si : DEFINEFLAGS += -D_ENABLE_NASA_PDS_
si : DEFINEFLAGS += -D_ENABLE_NASA_PDS_
si : DEFINEFLAGS += -D_USE_OPENCV_CPP_

si : $(SKYIMAGE_OBJECTS) \
$(PDS_OBJECTS) \
Expand Down Expand Up @@ -4587,6 +4592,14 @@ $(OBJECT_DIR)controller_preview.o : $(SRC_DIR)controller_preview.cpp \
$(COMPILEPLUS) $(INCLUDES) $(SRC_DIR)controller_preview.cpp -o$(OBJECT_DIR)controller_preview.o


#-------------------------------------------------------------------------------------
$(OBJECT_DIR)NASA_moonphase.o : $(SRC_DIR)NASA_moonphase.cpp \
$(SRC_DIR)NASA_moonphase.h
$(COMPILEPLUS) $(INCLUDES) $(SRC_DIR)NASA_moonphase.cpp -o$(OBJECT_DIR)NASA_moonphase.o




#-------------------------------------------------------------------------------------
$(OBJECT_DIR)windowtab.o : $(SRC_DIR)windowtab.cpp \
$(SRC_DIR)windowtab.h \
Expand Down Expand Up @@ -4685,6 +4698,12 @@ $(OBJECT_DIR)windowtab_moon.o : $(SRC_DIR)windowtab_moon.cpp \
$(SRC_DIR)controller.h
$(COMPILEPLUS) $(INCLUDES) $(SRC_DIR)windowtab_moon.cpp -o$(OBJECT_DIR)windowtab_moon.o

#-------------------------------------------------------------------------------------
$(OBJECT_DIR)windowtab_MoonPhase.o : $(SRC_DIR)windowtab_MoonPhase.cpp \
$(SRC_DIR)windowtab_MoonPhase.h \
$(SRC_DIR)windowtab.h \
$(SRC_DIR)controller.h
$(COMPILEPLUS) $(INCLUDES) $(SRC_DIR)windowtab_MoonPhase.cpp -o$(OBJECT_DIR)windowtab_MoonPhase.o

#-------------------------------------------------------------------------------------
$(OBJECT_DIR)windowtab_obscond.o : $(SRC_DIR)windowtab_obscond.cpp \
Expand Down
8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2011.txt

Large diffs are not rendered by default.

8,786 changes: 8,786 additions & 0 deletions NASA_MoonInfo/mooninfo_2012.txt

Large diffs are not rendered by default.

8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2013.txt

Large diffs are not rendered by default.

8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2014.txt

Large diffs are not rendered by default.

8,762 changes: 8,762 additions & 0 deletions NASA_MoonInfo/mooninfo_2015.txt

Large diffs are not rendered by default.

8,786 changes: 8,786 additions & 0 deletions NASA_MoonInfo/mooninfo_2016.txt

Large diffs are not rendered by default.

8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2017.txt

Large diffs are not rendered by default.

8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2018.txt

Large diffs are not rendered by default.

8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2019.txt

Large diffs are not rendered by default.

8,786 changes: 8,786 additions & 0 deletions NASA_MoonInfo/mooninfo_2020.txt

Large diffs are not rendered by default.

8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2021.txt

Large diffs are not rendered by default.

8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2022.txt

Large diffs are not rendered by default.

8,761 changes: 8,761 additions & 0 deletions NASA_MoonInfo/mooninfo_2023.txt

Large diffs are not rendered by default.

8,786 changes: 8,786 additions & 0 deletions NASA_MoonInfo/mooninfo_2024.txt

Large diffs are not rendered by default.

74 changes: 59 additions & 15 deletions alpacapi_EditHistory.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
History Comments found =3128 in 476 files
History Comments found =3172 in 480 files
PDS_ReadNASAfiles.c:28 //* Jan 26, 1992 Reading of PDS files into Mac program from CD working
PDS_ReadNASAfiles.c:29 //* Mar 14, 1992 Starting on more detailed interpretation of label (header)
PDS_ReadNASAfiles.c:30 //* Mar 16, 1992 Changed number of displayed bytes from 836 to 800
Expand Down Expand Up @@ -2352,7 +2352,7 @@ windowtab.cpp:77 //* Oct 21, 2022 <MLS> Added SetupWindowBottomBoxes()
windowtab.cpp:78 //* Oct 21, 2022 <MLS> Updated all windowtabs to use SetupWindowBottomBoxes()
windowtab.cpp:79 //* Oct 21, 2022 <MLS> Removed SetIPaddressBoxes() use SetupWindowBottomBoxes() instead
windowtab.cpp:80 //* Oct 21, 2022 <MLS> Removed SetAlpacaLogo()
controller.cpp:1752 //* Oct 24, 2022 <MLS> Dont use openCV 4.5.4 (mousewheel bug), use 4.5.1 instead
controller.cpp:1768 //* Oct 24, 2022 <MLS> Dont use openCV 4.5.4 (mousewheel bug), use 4.5.1 instead
cameradriver_fits.cpp:91 //* Oct 25, 2022 <MLS> Now using cv::getVersionString().c_str() for openCV version string
spectrodriver.cpp:27 //* Oct 25, 2022 <MLS> Added Get_PropertyInfo()
controllerAlpaca.cpp:46 //* Oct 26, 2022 <MLS> Fixed return data valid bug in AlpacaGetStringValue()
Expand Down Expand Up @@ -3115,8 +3115,52 @@ controller_image.cpp:33 //* Mar 23, 2024 <MLS> PDS Header data displaying prop
controller_image.cpp:34 //* Mar 23, 2024 <MLS> Added IsFilePDS()
windowtab.cpp:108 //* Mar 23, 2024 <MLS> Added LaunchWebURL()
windowtab_fitsheader.cpp:22 //* Mar 23, 2024 <MLS> Added double click to open any web link specified
cameradriver.cpp:210 //* Jan 1, 2119 <TODO> ----------------------------------------
cameradriver.cpp:211 //* Jun 26, 2119 <TODO> Add support for sub frames
controller_image.cpp:35 //* Mar 24, 2024 <MLS> Added IsFileFITS()
controller_image.cpp:36 //* Mar 24, 2024 <MLS> Added DrawTitleBlock_FITS() & DrawTitleBlock_PDS()
controller_skyimage.cpp:12 //* Mar 24, 2024 <MLS> Added recursive directory reading
controller_skyimage.cpp:13 //* Mar 24, 2024 <MLS> Fixed crash bug when image failed to load
cameradriver.cpp:209 //* Mar 25, 2024 <MLS> Read NASA Moon Phase on creation of camera objects
cameradriver_fits.cpp:102 //* Mar 25, 2024 <MLS> Now using NASA Moon Phase info if available
controller_skytravel.cpp:24 //* Mar 25, 2024 <MLS> Added MoonPhase window to SkyTravel
NASA_moonphase.cpp:18 //* Mar 25, 2024 <MLS> Created NASA_moonphase.cpp
windowtab_MoonPhase.cpp:21 //* Mar 25, 2024 <MLS> Created windowtab_MoonPhase.cpp
controller.cpp:116 //* Mar 26, 2024 <MLS> Added RunFastBackgroundTasks()
controller_skytravel.cpp:25 //* Mar 26, 2024 <MLS> Added RunFastBackgroundTasks()
NASA_moonphase.cpp:19 //* Mar 26, 2024 <MLS> Added minutes & seconds to argument list so we can do interpolation
NASA_moonphase.cpp:20 //* Mar 26, 2024 <MLS> Now doing interpolation for Age, Diam, Dist & Phase
windowtab.cpp:109 //* Mar 26, 2024 <MLS> Added LLG_FrameRect(cv::Rect *theRect) & LLG_FillRect(cv::Rect *theRect)
windowtab_MoonPhase.cpp:22 //* Mar 26, 2024 <MLS> Added DrawMoonWidget() & DrawMoonGraphic()
cameradriver_fits.cpp:103 //* Mar 27, 2024 <MLS> Added lunar polar axis to moon fits info
controller.cpp:117 //* Mar 27, 2024 <MLS> Added SetRunFastBackgroundMode()
controller_skyimage.cpp:14 //* Mar 27, 2024 <MLS> Added NASA MoonPhase window ti SkyImage
NASA_moonphase.cpp:21 //* Mar 27, 2024 <MLS> Verified interpolation
NASA_moonphase.cpp:22 //* Mar 27, 2024 <MLS> Added _ENABLE_INTERPOLATION_
NASA_moonphase.cpp:23 //* Mar 27, 2024 <MLS> Added NASA_GetDayOfYear()
windowtab.cpp:110 //* Mar 27, 2024 <MLS> Added SetRunFastBackgroundMode()
windowtab_MoonPhase.cpp:23 //* Mar 27, 2024 <MLS> Added UpdateCurrentMoonPhase()
controller_image.cpp:37 //* Mar 28, 2024 <MLS> Added more moon info to title block
NASA_moonphase.cpp:24 //* Mar 28, 2024 <MLS> Added TestInteroplation()
windowtab.cpp:111 //* Mar 28, 2024 <MLS> Added SetWidgetTextColor() with color index arg
windowtab_MoonPhase.cpp:24 //* Mar 29, 2024 <MLS> Added HandleMouseClickedInGraph()
controller_image.cpp:38 //* Mar 30, 2024 <MLS> Finished LoadImage() to be able to handle normal image files
controller_image.cpp:39 //* Mar 30, 2024 <MLS> Added FlipImage()
controller_image.cpp:40 //* Mar 30, 2024 <MLS> Added SaveFitsHeaderLine()
controller_image.cpp:41 //* Mar 30, 2024 <MLS> Added UpdateFitsHeader()
windowtab_image.cpp:38 //* Mar 30, 2024 <MLS> Added FlipImage()
windowtab_MoonPhase.cpp:25 //* Mar 30, 2024 <MLS> Added ability to double click and open current moon image
controller_image.cpp:42 //* Mar 31, 2024 <MLS> Added DrawSignature()
NASA_moonphase.cpp:25 //* Mar 31, 2024 <MLS> Made internal polar axis angle +/- 180 to fix interpolation
NASA_moonphase.cpp:26 //* Apr 1, 2024 <MLS> Added NASA_GetMoonImageCount()
windowtab.cpp:112 //* Apr 1, 2024 <MLS> Added SetWebHelpURLstring()
NASA_moonphase.cpp:27 //* Apr 4, 2024 <MLS> Added NASA_DownloadMoonPhaseData()
NASA_moonphase.cpp:28 //* Apr 5, 2024 <MLS> Added NASA_StartMoonImageDownloadThread()
windowtab_camsettings.cpp:30 //* Apr 5, 2024 <MLS> Added Eclipse to object settings option list
windowtab_MoonPhase.cpp:26 //* Apr 5, 2024 <MLS> Added ability to download NASA moon image files
windowtab_MoonPhase.cpp:27 //* Apr 5, 2024 <MLS> Added ELat & ELon to graph
NASA_moonphase.cpp:29 //* Apr 6, 2024 <MLS> Fixed moon image number bug (was off by 1)
windowtab_MoonPhase.cpp:28 //* Apr 6, 2024 <MLS> Fixed initialization bug (cDisplayedImage)
cameradriver.cpp:211 //* Jan 1, 2119 <TODO> ----------------------------------------
cameradriver.cpp:212 //* Jun 26, 2119 <TODO> Add support for sub frames
cameradriver_png.cpp:33 //* Jan 31, 2120 <TODO> Add support for libpng
cameradriver_TOUP.cpp:48 //* Feb 4, 2120 <TODO> Add 16 bit readout to Toupcam
cameradriver_TOUP.cpp:49 //* Feb 16, 2120 <TODO> Add gain setting to Toupcam
Expand All @@ -3127,19 +3171,19 @@ controller_camera.cpp:80 //* Feb 6, 2121 <TODO> Move downloading of images to
cameradriver_QHY.cpp:52 //* Oct 10, 2122 <TODO> Add support for percentcompleted to QHY camera driver
spectrodriver.cpp:33 //* May 7, 2123 <TODO> Add support for SlitID, SlitAngle, SlitWidth
controller_dome.cpp:47 //* Jun 25, 2123 <ADD> Add slaved to DeviceState
History Comments found = 3128 in 476 files
Total lines = 219318
Total comment Lines = 35677 (16.3%)
Total comments = 40098 (18.3%)
Total history comments = 3128 (1.4%)
History Comments found = 3172 in 480 files
Total lines = 223254
Total comment Lines = 36458 (16.3%)
Total comments = 40910 (18.3%)
Total history comments = 3172 (1.4%)
Total C files = 63
Total C++ files = 180
Total H files = 231
Preprocssor cnt = 6924
Total SLOC = 139509
Total SLOC-Logical = 107660
Total C++ files = 182
Total H files = 233
Preprocssor cnt = 6982
Total SLOC = 141922
Total SLOC-Logical = 109488
Programmer comment summary
MLS = 2733
MLS = 2777
TODO = 11
DDB = 1
JMH = 3
Expand Down
88 changes: 88 additions & 0 deletions docs/aavsoTargetTool.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<HTML>
<TITLE>AAVSO Target Tool</TITLE>

<!-------------------------------------------->

<BODY bgcolor=#777777>
<FONT COLOR=white>

<CENTER>
<TABLE BORDER=1 BGCOLOR=BLACK>
<TR>
<TH width=700>
<FONT COLOR=PURPLE>
<H1>AlpacaPi</H1>
<H1>AAVSO Target Tool</H1>
</TH>
</TR>
</TABLE>
</CENTER>
<P>
<!-------------------------------------------->
<CENTER>
<TABLE BORDER=1>
</TR>
<TH><A HREF=index.html>Home</A> </TH>
<TH><A HREF=skytravel.html>SkyTravel</A> </TH>
<TH><A HREF=drivers.html>Drivers</A> </TH>
<TH><A HREF=clientapps.html>Client Apps</A> </TH>
<TH><A HREF=moonphase.html>Moon Phase</A> </TH>
<TH><A HREF=skyimage.html>SkyImage</A> </TH>
<TH><A HREF=aavsoTargetTool.html>AAVSO</A> </TH>
</TR>
</TABLE>
</CENTER>
<!-------------------------------------------->
<P>
<HR>
<H3>AAVSO Target Tool</H3>
<A HREF=https://www.aavso.org/ TARGET=AAVSO">AAVSO</A> provides a list of
objects of interest via a system called "Target tool".

This list shows observations that professional astronomers would like assistance with in
the form of additional observations, many of which can be accomplished by amateur astronomers.
<P>
In order to use the target tool, you must create an account.

<CENTER>
<IMG SRC=images/SkyTravel-SkyTravel-aavso1.jpg width=99%>
<BR>
The yellow text objects are the alerts from the target tool
<P>
<IMG SRC=images/SkyTravel-SkyTravel-aavso2.jpg width=99%>
<BR>
When zoomed in, the alert number appears as well.
</CENTER>
<UL>
<LI><A HREF="https://filtergraph.com/aavso/default/" TARGET=AAVSO">AAVSO Target Tool</A>

<LI><A HREF="https://filtergraph.com/aavso/api" TARGET=AAVSO">AAVSO Target Tool API</A>
</UL>

<HR>


<H1>Time navigation</H1>
SkyTravel allows you to change the time of the current view.
<CENTER>
<TABLE BORDER=1>
<TR>
<TD><FONT COLOR=white><CENTER>( / )</TD> <TD><FONT COLOR=white>-/+ year</TD>
</TR>
<TR>
<TD><FONT COLOR=white><CENTER>{ / }</TD> <TD><FONT COLOR=white>-/+ month</TD>
</TR>
<TR>
<TD><FONT COLOR=white><CENTER>[ / ]</TD> <TD><FONT COLOR=white>-/+ day</TD>
</TR>
<TR>
<TD><FONT COLOR=white><CENTER>< / ></TD> <TD><FONT COLOR=white>-/+ hour</TD>
</TR>
<TR>
<TD><FONT COLOR=white><CENTER>0 / 9</TD> <TD><FONT COLOR=white>-/+ minute</TD>
</TR>
<TR>
<TD><FONT COLOR=white><CENTER>@</TD> <TD><FONT COLOR=white>Reset to current time</TD>
</TR>
</TABLE>
</CENTER>
22 changes: 10 additions & 12 deletions docs/clientapps.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,24 @@ <H1>Client Apps</H1>
</TH>
</TR>
</TABLE>
</CENTER>
<P>
<!-------------------------------------------->
<CENTER>
<TABLE BORDER=1>
</TR>
<TH><A HREF=index.html>Home</A>
</TH>

<TH><A HREF=skytravel.html>SkyTravel</A>
</TH>

<TH><A HREF=drivers.html>Drivers</A>
</TH>

<TH><A HREF=clientapps.html>Client Apps</A>
</TH>
<TH><A HREF=index.html>Home</A> </TH>
<TH><A HREF=skytravel.html>SkyTravel</A> </TH>
<TH><A HREF=drivers.html>Drivers</A> </TH>
<TH><A HREF=clientapps.html>Client Apps</A> </TH>
<TH><A HREF=moonphase.html>Moon Phase</A> </TH>
<TH><A HREF=skyimage.html>SkyImage</A> </TH>
<TH><A HREF=aavsoTargetTool.html>AAVSO</A> </TH>
</TR>
</TABLE>
</CENTER>
<!-------------------------------------------->


<H2>Client applications</H2>
</CENTER>
Once you have drivers running, you need an application to control it.
Expand Down
14 changes: 10 additions & 4 deletions docs/drivers.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,19 @@ <H1>Drivers</H1>
</TH>
</TR>
</TABLE>
</CENTER>
<P>
<!-------------------------------------------->
<CENTER>
<TABLE BORDER=1>
</TR>
<TH><A HREF=index.html>Home</A> </TH>
<TH><A HREF=skytravel.html>SkyTravel</A> </TH>
<TH><A HREF=drivers.html>Drivers</A> </TH>
<TH><A HREF=clientapps.html>Client Apps</A> </TH>
<TH><A HREF=index.html>Home</A> </TH>
<TH><A HREF=skytravel.html>SkyTravel</A> </TH>
<TH><A HREF=drivers.html>Drivers</A> </TH>
<TH><A HREF=clientapps.html>Client Apps</A> </TH>
<TH><A HREF=moonphase.html>Moon Phase</A> </TH>
<TH><A HREF=skyimage.html>SkyImage</A> </TH>
<TH><A HREF=aavsoTargetTool.html>AAVSO</A> </TH>
</TR>
</TABLE>
</CENTER>
Expand Down
Binary file added docs/images/moonphase.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ <H1>AlpacaPi</H1>
</TH>
</TR>
</TABLE>
</CENTER>
<P>
<!-------------------------------------------->
<CENTER>
<TABLE BORDER=1>
</TR>
<TH><A HREF=index.html>Home</A>
</TH>

<TH><A HREF=skytravel.html>SkyTravel</A>
</TH>

<TH><A HREF=drivers.html>Drivers</A>
</TH>

<TH><A HREF=clientapps.html>Client Apps</A>
</TH>
<TH><A HREF=index.html>Home</A> </TH>
<TH><A HREF=skytravel.html>SkyTravel</A> </TH>
<TH><A HREF=drivers.html>Drivers</A> </TH>
<TH><A HREF=clientapps.html>Client Apps</A> </TH>
<TH><A HREF=moonphase.html>Moon Phase</A> </TH>
<TH><A HREF=skyimage.html>SkyImage</A> </TH>
<TH><A HREF=aavsoTargetTool.html>AAVSO</A> </TH>
</TR>
</TABLE>
</CENTER>
<!-------------------------------------------->

<P>
<I>Alpaca</I> is the new protocol from the ASCOM community for controlling astronomy equipment.
Alpaca is 100% backwards compatible with ASCOM but instead of using COM (Component Object Mode) which is
Expand Down
Loading

0 comments on commit 35e54bb

Please sign in to comment.