Skip to content

Commit

Permalink
tweek test
Browse files Browse the repository at this point in the history
  • Loading branch information
@urbanjost
urbanjost committed Nov 11, 2023
1 parent ad03b47 commit cb7b81b
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion docs/BOOK_M_color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta name="generator" content="vi(1)/vim(1)" />
<meta name="description" content="@(#)M_color::BOOK_M_color: BOOK composed of pages for man(1) topic M_color"/>
<meta name="author" content="urbanjs" />
<meta name="date" content="2023-10-02" />
<meta name="date" content="2023-11-11" />
<meta name="keywords" content="Fortran, Fortran code, source code repository, Fortran library, Fortran archive, source code" />
<!--
Pick your favorite style sheet from among the eight offerings:
Expand Down
3 changes: 1 addition & 2 deletions docs/M_color.3m_color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ <H3>EXAMPLE</H3>
use M_color, only : rgbmono
implicit none
character(len=100) :: string ! at least 20 characters
character(len=20) :: name
character(len=20) :: echoname
real :: red,green,blue
real :: gray
Expand Down Expand Up @@ -365,7 +364,7 @@ <H3>LICENSE</H3>
Public Domain
</BLOCKQUOTE>
<P><HR>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>M_color (3m_color)</TD> <TD align=right width=33%><I>October 02, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from 80b138b0-62d7-4f6c-aa31-6f63cd6309c6 using man macros.</FONT>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>M_color (3m_color)</TD> <TD align=right width=33%><I>November 11, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from 50e23955-7d4b-440d-9115-918a95541630 using man macros.</FONT>
<br><br><center><img src="images/M_color.gif"></center>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/closest_color_name.3m_color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ <H3>LICENSE</H3>
Public Domain
</BLOCKQUOTE>
<P><HR>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>closest_color_name (3m_color)</TD> <TD align=right width=33%><I>October 02, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from 41c6c42a-66ac-495d-a934-100c45c804d7 using man macros.</FONT>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>closest_color_name (3m_color)</TD> <TD align=right width=33%><I>November 11, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from f1ef8743-5198-4e7d-a3c1-8a8d07630bcb using man macros.</FONT>
<br><br><center><img src="images/closest_color_name.gif"></center>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/color_name2rgb.3m_color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ <H3>LICENSE</H3>
Public Domain
</BLOCKQUOTE>
<P><HR>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>color_name2rgb (3m_color)</TD> <TD align=right width=33%><I>October 02, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from 3ed18009-e048-41e6-8a74-51cf0dc1ac69 using man macros.</FONT>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>color_name2rgb (3m_color)</TD> <TD align=right width=33%><I>November 11, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from fe0e868f-0fa7-429d-8983-ff839a1af37f using man macros.</FONT>
<br><br><center><img src="images/color_name2rgb.gif"></center>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/hue.3m_color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ <H3>LICENSE</H3>
Public Domain
</BLOCKQUOTE>
<P><HR>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>hue (3m_color)</TD> <TD align=right width=33%><I>October 02, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from 64058fc8-c831-4429-8424-c8bbf3672752 using man macros.</FONT>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>hue (3m_color)</TD> <TD align=right width=33%><I>November 11, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from 1f3cee1b-bdc8-42fa-9ae9-057de407edcc using man macros.</FONT>
<br><br><center><img src="images/hue.gif"></center>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta name="generator" content="vi(1)/vim(1)" />
<meta name="description" content="@(#)M_color::BOOK_M_color: BOOK composed of pages for man(1) topic M_color"/>
<meta name="author" content="urbanjs" />
<meta name="date" content="2023-10-02" />
<meta name="date" content="2023-11-11" />
<meta name="keywords" content="Fortran, Fortran code, source code repository, Fortran library, Fortran archive, source code" />
<!--
Pick your favorite style sheet from among the eight offerings:
Expand Down
10 changes: 5 additions & 5 deletions docs/man3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ <h1>M_color man(3) pages</h1>
</font>
<table border="1">
<tr> <th>grouping</th> <th>page</th> <th>description</th> </tr>
<tr><td style="background:#c9f1f6;">M_color::INTRO</td><td><a href="M_color.3m_color.html">M_color</a></td><td> a Fortran module that lets you convert between common color models (LICENSE:PD)</td></tr>
<tr><td style="background:#ecddc1;">M_color</td><td><a href="closest_color_name.3m_color.html">closest_color_name</a></td><td> returns the closest name for the given RGB values. (LICENSE:PD)</td></tr>
<tr><td style="background:#ecddc1;">M_color</td><td><a href="color_name2rgb.3m_color.html">color_name2rgb</a></td><td> returns the RGB values in the range 0 to 100 for a given known color name. (LICENSE:PD)</td></tr>
<tr><td style="background:#ecddc1;">M_color</td><td><a href="hue.3m_color.html">hue</a></td><td> converts a color's components from one color model to another. (LICENSE:PD)</td></tr>
<tr><td style="background:#ecddc1;">M_color</td><td><a href="rgbmono.3m_color.html">rgbmono</a></td><td> converts RGB colors to a reasonable grayscale intensity (LICENSE:PD)</td></tr>
<tr><td style="background:#f4e9dd;">M_color::INTRO</td><td><a href="M_color.3m_color.html">M_color</a></td><td> a Fortran module that lets you convert between common color models (LICENSE:PD)</td></tr>
<tr><td style="background:#f8c3f0;">M_color</td><td><a href="closest_color_name.3m_color.html">closest_color_name</a></td><td> returns the closest name for the given RGB values. (LICENSE:PD)</td></tr>
<tr><td style="background:#f8c3f0;">M_color</td><td><a href="color_name2rgb.3m_color.html">color_name2rgb</a></td><td> returns the RGB values in the range 0 to 100 for a given known color name. (LICENSE:PD)</td></tr>
<tr><td style="background:#f8c3f0;">M_color</td><td><a href="hue.3m_color.html">hue</a></td><td> converts a color's components from one color model to another. (LICENSE:PD)</td></tr>
<tr><td style="background:#f8c3f0;">M_color</td><td><a href="rgbmono.3m_color.html">rgbmono</a></td><td> converts RGB colors to a reasonable grayscale intensity (LICENSE:PD)</td></tr>
</table>
</div>
</div>
Expand Down
Binary file modified docs/manpages.tgz
View file
Binary file not shown.
Binary file modified docs/manpages.zip
View file
Binary file not shown.
11 changes: 5 additions & 6 deletions docs/manual.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ LICENSE



October 02, 2023 color_name2rgb(3m_color)
November 11, 2023 color_name2rgb(3m_color)
M_color(3m_color) M_color(3m_color)


Expand Down Expand Up @@ -175,7 +175,6 @@ EXAMPLE
use M_color, only : rgbmono
implicit none
character(len=100) :: string ! at least 20 characters
character(len=20) :: name
character(len=20) :: echoname
real :: red,green,blue
real :: gray
Expand Down Expand Up @@ -277,7 +276,7 @@ LICENSE



October 02, 2023 M_color(3m_color)
November 11, 2023 M_color(3m_color)
rgbmono(3m_color) rgbmono(3m_color)


Expand Down Expand Up @@ -364,7 +363,7 @@ LICENSE



October 02, 2023 rgbmono(3m_color)
November 11, 2023 rgbmono(3m_color)
hue(3m_color) hue(3m_color)


Expand Down Expand Up @@ -523,7 +522,7 @@ LICENSE



October 02, 2023 hue(3m_color)
November 11, 2023 hue(3m_color)
closest_color_name(3m_color) closest_color_name(3m_color)


Expand Down Expand Up @@ -589,4 +588,4 @@ LICENSE



October 02, 2023 closest_color_name(3m_color)
November 11, 2023 closest_color_name(3m_color)
2 changes: 1 addition & 1 deletion docs/rgbmono.3m_color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ <H3>LICENSE</H3>
Public Domain
</BLOCKQUOTE>
<P><HR>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>rgbmono (3m_color)</TD> <TD align=right width=33%><I>October 02, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from 49e6398e-dce1-4851-91e9-a4f877812936 using man macros.</FONT>
<TABLE width=100%><TR> <TD width=33%><I>Nemo Release 3.1</I></TD> <TD width=33% align=center>rgbmono (3m_color)</TD> <TD align=right width=33%><I>November 11, 2023</I></TD> </TR></TABLE><FONT SIZE=-1>Generated by <A HREF="http://www.squarebox.co.uk/download/manServer.shtml">manServer 1.08</A> from 9446b434-5590-4ca6-86f3-ce1b9831672c using man macros.</FONT>
<br><br><center><img src="images/rgbmono.gif"></center>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion example/demo_M_color.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ program demo_M_color
use M_color, only : rgbmono
implicit none
character(len=100) :: string ! at least 20 characters
character(len=20) :: name
character(len=20) :: echoname
real :: red,green,blue
real :: gray
Expand Down
1 change: 0 additions & 1 deletion src/M_color.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
!! use M_color, only : rgbmono
!! implicit none
!! character(len=100) :: string ! at least 20 characters
!! character(len=20) :: name
!! character(len=20) :: echoname
!! real :: red,green,blue
!! real :: gray
Expand Down
30 changes: 17 additions & 13 deletions test/test_suite_M_color.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ subroutine test_suite_m_color
call test_color_name2rgb() ! given a color name, return rgb color values in range 0 to 100
call test_rgbmono() ! convert RGB colors to a reasonable grayscale
contains
!TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
!===================================================================================================================================
subroutine test_rgbmono()
real :: gray
integer :: ierr
Expand All @@ -31,7 +31,7 @@ subroutine test_rgbmono()
call unit_check_done('rgbmono')
end subroutine test_rgbmono
end subroutine test_suite_m_color
!TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
!===================================================================================================================================
subroutine test_hue()
real :: c, m, y
real :: r, g, b
Expand Down Expand Up @@ -103,12 +103,12 @@ subroutine test_hue()
call unit_check_done('hue')

contains
subroutine check_name(modelout,name,rgb,other)
subroutine check_name(modelout,name,rgb,expected)

! given a color convert to MODELOUT and compare to expected values
! given a color in RGB convert to MODELOUT and compare to expected values

character(len=*),intent(in) :: name
integer,intent(in) :: rgb(3), other(3)
integer,intent(in) :: rgb(3), expected(3)
character(len=*),intent(in) :: modelout
real :: r,g,b
real :: val1,val2,val3
Expand All @@ -120,16 +120,19 @@ subroutine check_name(modelout,name,rgb,other)
! convert RGB values to MODELOUT values
call hue('rgb',r,g,b,modelout,val1,val2,val3,status)
if(unit_check_level.gt.0)then
write(*,*)'EXPECTED '//modelout//' ====>',other
write(*,*)'RETURNED '//modelout//' ====>',int([val1+0.5,val2+0.5,val3+0.5])
write(*,*)'STATUS ==========>',status
write(*,*)'test_hue:MODELOUT ====>',modelout
write(*,*)'test_hue:NAME ====>',name
write(*,*)'test_hue:RGB ====>',rgb
write(*,*)'test_hue:EXPECTED ====>',expected
write(*,*)'test_hue:RETURNED ====>',int([val1+0.5,val2+0.5,val3+0.5])
write(*,*)'test_hue:STATUS ====>',status
endif
call unit_check('hue', status.eq.0.and.all(abs(int([val1+0.5,val2+0.5,val3+0.5])-other).lt.2 ),'convert from rgb to '//modelout)
call unit_check('hue',status.eq.0.and.all(abs(int([val1+0.5,val2+0.5,val3+0.5])-expected).lt.2),'convert from rgb to '//modelout)

end subroutine check_name
!===================================================================================================================================

end subroutine test_hue
!TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
!===================================================================================================================================
subroutine test_closest_color_name()

call unit_check_start('closest_color_name')
Expand Down Expand Up @@ -185,9 +188,9 @@ subroutine check_name(name,rgb)
& rgb(3) .eq. int(b2+0.5) ,msg='close enough for NAME: '//trim(name)//' CLOSESTNAME: '//trim(closestname) )
endif
end subroutine check_name
!===================================================================================================================================

end subroutine test_closest_color_name
!TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
!===================================================================================================================================
subroutine test_color_name2rgb()

call unit_check_start('color_name2rgb')
Expand All @@ -214,6 +217,7 @@ subroutine test_color_name2rgb()

call unit_check_done('color_name2rgb')
contains

subroutine check_name(name,rgb)
! given a colorname look up RGB values, compare to expected values, check

Expand Down

0 comments on commit cb7b81b

Please sign in to comment.