Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration

map65/libm65/Makefile

@@ -74,7 +74,8 @@ LIBS3 = -L'C:/JTSDK/Qt55/5.5/mingw492_32/lib' -lQt5Core
 m65.exe: $(OBJS3) libm65.a
 	$(CXX) -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \
 	-lgfortran
-	cp m65.exe ../../map65_install
+#	cp m65.exe ../../map65_install
+	cp m65.exe /c/MAP65_2.9
 
 OBJS7 = astrosub.o astro0.o astro.o tm2.o grid2deg.o sun.o moondop.o \
 	coord.o dot.o moon2.o tmoonsub.o toxyz.o geocentric.o \

map65/libm65/display.f90

@@ -81,7 +81,7 @@ subroutine display(nkeep,ftol)
         endif
         kz=k
         if(nstart.eq.1) then
-           call indexx(utc2,kz,indx2)
+           call indexx(float(utc2(1:kz)),kz,indx2)
            k3=0
            do k=1,kz
               k3=min(k3+1,400)
@@ -89,7 +89,7 @@ subroutine display(nkeep,ftol)
            enddo
            nstart=0
         else
-           call indexx(utc2,kz,indx2)
+           call indexx(float(utc2(1:kz)),kz,indx2)
            do k=1,kz
               k3=min(k3+1,400)
               line3(k3)=line2(indx2(k))
@@ -108,7 +108,7 @@ subroutine display(nkeep,ftol)
      j0=j
   enddo
   kz=k
-  call indexx(utc2,kz,indx2)
+  call indexx(float(utc2(1:kz)),kz,indx2)
   do k=1,kz
      k3=min(k3+1,400)
      line3(k3)=line2(indx2(k))

map65/map65.pro

@@ -13,7 +13,7 @@ TARGET = map65
 VERSION = 2.5.0
 TEMPLATE = app
 DEFINES = QT5
-DESTDIR = ../map65_install
+DESTDIR = /MAP65_2.9
 
 F90 = gfortran
 gfortran.output = ${QMAKE_FILE_BASE}.o