Commit 68465f05 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

added noshow option to report end

parent 145ffbd2

Makefile.version

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ export PROJECT=drspine 


export VERSION_MAJOR=1

export VERSION_MINOR=4

export VERSION_RELEASE=8

export VERSION_RELEASE=9



export PROJLIB=lib$(PROJECT).a

export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)

sources/drspine.f90

+2 −2
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ program drspine 
                '         deff_qcatch       - reporting running average dq catch for deff averaging over binnings.'//&

                                              ' default = 0.01 A**-1'//LF//&

                '         end               - closes the thex file and creates pdf'//LF//&

                '                             [verbose|nopdf]'//LF//&

                '                             [verbose|nopdf|noshow]'//LF//&

                ' -------------------$')) then

        !                   ===============

        call cmd_report()
@@ -3607,7 +3607,7 @@ se: if(found('close') .or. found('end')) then 
       end if

! ============ end of macro writing ===============================================================



       call close_tex(found("verbose"),found("nopdf"))

       call close_tex(found("verbose"),found("nopdf"),found("noshow"))

!       call msg_info('drspine',"report created as tex source: "//trim(tex_output_file))

     endif se

sources/texology.f90

+15 −2
Original line number Diff line number Diff line
@@ -199,12 +199,14 @@ contains 
  end subroutine start_tex



  

  subroutine close_tex(verbose, nopdf)

  subroutine close_tex(verbose, nopdf, noshow)

! ------------------------------------

  implicit none

  logical, intent(in) :: verbose

  logical, intent(in) :: nopdf

  logical, intent(in) :: noshow

  !character(len=1024) :: ebuf

  character(len=1024) :: pdf_output_file



  if(tex_output .ne. 0) then

    write(tex_output,'(a)')'\end{document}'
@@ -240,8 +242,19 @@ contains 
!      call execute_command('pdflatex  '//trim(tex_output_file) )

    endif



    call os_openfile(trim(string_replace(tex_output_file,'.tex','.pdf'))) ! paz (use os_utils module)

    pdf_output_file = string_replace(tex_output_file,'.tex','.pdf')

nsh: if(noshow) then

       write(6,*)

       write(6,*)"!---------------------------------------------------"

       write(6,*)" use system pdf viewer to open "//trim(pdf_output_file)

       write(6,*)"!---------------------------------------------------"

       write(6,*)

       return

    else

    !call os_openfile(trim(string_replace(tex_output_file,'.tex','.pdf'))) ! paz (use os_utils module)

    call os_openfile(pdf_output_file) ! paz (use os_utils module)

    ! write(6,*)'report is on: ',trim(string_replace(tex_output_file,'.tex','.pdf'))

    endif  nsh

    endif  npf