Menu
▾
▴
plplot-cvs — For PLplot svn commit messages
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(33) |
Jun
|
Jul
(30) |
Aug
(2) |
Sep
|
Oct
(30) |
Nov
(136) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(255) |
Feb
(169) |
Mar
(322) |
Apr
(185) |
May
(33) |
Jun
(89) |
Jul
(47) |
Aug
(59) |
Sep
(40) |
Oct
(31) |
Nov
(74) |
Dec
(84) |
| 2002 |
Jan
(163) |
Feb
(78) |
Mar
(23) |
Apr
(5) |
May
(22) |
Jun
(75) |
Jul
(143) |
Aug
(48) |
Sep
(111) |
Oct
(58) |
Nov
(124) |
Dec
(278) |
| 2003 |
Jan
(106) |
Feb
(276) |
Mar
(354) |
Apr
(97) |
May
(14) |
Jun
(3) |
Jul
(7) |
Aug
(21) |
Sep
(83) |
Oct
(110) |
Nov
(3) |
Dec
(119) |
| 2004 |
Jan
(318) |
Feb
(409) |
Mar
(68) |
Apr
(23) |
May
(105) |
Jun
(147) |
Jul
(69) |
Aug
(53) |
Sep
(23) |
Oct
(14) |
Nov
(15) |
Dec
(63) |
| 2005 |
Jan
(146) |
Feb
(69) |
Mar
(157) |
Apr
(127) |
May
(166) |
Jun
(8) |
Jul
(5) |
Aug
(3) |
Sep
(8) |
Oct
(17) |
Nov
(29) |
Dec
(34) |
| 2006 |
Jan
(3) |
Feb
(4) |
Mar
(1) |
Apr
(70) |
May
(241) |
Jun
(82) |
Jul
(344) |
Aug
(196) |
Sep
(87) |
Oct
(57) |
Nov
(121) |
Dec
(86) |
| 2007 |
Jan
(60) |
Feb
(67) |
Mar
(102) |
Apr
(28) |
May
(13) |
Jun
(29) |
Jul
(38) |
Aug
(56) |
Sep
(91) |
Oct
(89) |
Nov
(50) |
Dec
(68) |
| 2008 |
Jan
(87) |
Feb
(47) |
Mar
(100) |
Apr
(34) |
May
(65) |
Jun
(54) |
Jul
(98) |
Aug
(128) |
Sep
(109) |
Oct
(141) |
Nov
(40) |
Dec
(206) |
| 2009 |
Jan
(176) |
Feb
(226) |
Mar
(134) |
Apr
(84) |
May
(152) |
Jun
(85) |
Jul
(91) |
Aug
(153) |
Sep
(141) |
Oct
(59) |
Nov
(87) |
Dec
(75) |
| 2010 |
Jan
(58) |
Feb
(41) |
Mar
(51) |
Apr
(74) |
May
(81) |
Jun
(39) |
Jul
(30) |
Aug
(43) |
Sep
(76) |
Oct
(59) |
Nov
(62) |
Dec
(52) |
| 2011 |
Jan
(125) |
Feb
(41) |
Mar
(96) |
Apr
(53) |
May
(21) |
Jun
(23) |
Jul
(48) |
Aug
(71) |
Sep
(37) |
Oct
(81) |
Nov
(60) |
Dec
(32) |
| 2012 |
Jan
(51) |
Feb
(23) |
Mar
|
Apr
(8) |
May
(2) |
Jun
|
Jul
(8) |
Aug
(25) |
Sep
(4) |
Oct
(32) |
Nov
(17) |
Dec
(2) |
| 2013 |
Jan
(8) |
Feb
(2) |
Mar
(9) |
Apr
(9) |
May
(37) |
Jun
(48) |
Jul
(63) |
Aug
(42) |
Sep
(59) |
Oct
(83) |
Nov
(141) |
Dec
(133) |
| 2014 |
Jan
(57) |
Feb
(58) |
Mar
(58) |
Apr
(25) |
May
(14) |
Jun
(3) |
Jul
(6) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ai...@us...> - 2013-12-10 23:49:31
|
Revision: 12839
http://sourceforge.net/p/plplot/code/12839
Author: airwin
Date: 2013-12-10 23:49:29 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Drop tests involving -dev psc (for the unusual case) when that device is not enabled.
Modified Paths:
--------------
trunk/plplot_test/CMakeLists.txt
Modified: trunk/plplot_test/CMakeLists.txt
===================================================================
--- trunk/plplot_test/CMakeLists.txt 2013-12-10 23:46:45 UTC (rev 12838)
+++ trunk/plplot_test/CMakeLists.txt 2013-12-10 23:49:29 UTC (rev 12839)
@@ -2,7 +2,7 @@
###
### Process this file with cmake to produce Makefile
###
-# Copyright (C) 2006-2010 Alan W. Irwin
+# Copyright (C) 2006-2013 Alan W. Irwin
#
# This file is part of PLplot.
#
@@ -96,13 +96,16 @@
set(test_output_files_LIST)
set(examples_compare_DEPENDS)
- add_test(examples_c
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c"
- )
- list(APPEND examples_compare_DEPENDS examples_c)
- list_example_files(. ${TEST_DEVICE} c output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_c
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c"
+ )
+ list(APPEND examples_compare_DEPENDS examples_c)
+ list_example_files(. ${TEST_DEVICE} c output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
+
if(ENABLE_cxx)
configure_file(
test_cxx.sh.in
@@ -110,12 +113,14 @@
@ONLY
)
list(APPEND SCRIPTS test_cxx.sh)
- add_test(examples_cxx
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx"
- )
- list(APPEND examples_compare_DEPENDS examples_cxx)
- list_example_files(. ${TEST_DEVICE} cxx output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_cxx
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx"
+ )
+ list(APPEND examples_compare_DEPENDS examples_cxx)
+ list_example_files(. ${TEST_DEVICE} cxx output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_cxx)
if(ENABLE_f95)
@@ -125,12 +130,14 @@
@ONLY
)
list(APPEND SCRIPTS test_f95.sh)
- add_test(examples_f95
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95"
- )
- list(APPEND examples_compare_DEPENDS examples_f95)
- list_example_files(. ${TEST_DEVICE} f95 output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_f95
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95"
+ )
+ list(APPEND examples_compare_DEPENDS examples_f95)
+ list_example_files(. ${TEST_DEVICE} f95 output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_f95)
if(ENABLE_java)
@@ -140,12 +147,14 @@
@ONLY
)
list(APPEND SCRIPTS test_java.sh)
- add_test(examples_java
- ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java"
- )
- list(APPEND examples_compare_DEPENDS examples_java)
- list_example_files(. ${TEST_DEVICE} j output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_java
+ ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java"
+ )
+ list(APPEND examples_compare_DEPENDS examples_java)
+ list_example_files(. ${TEST_DEVICE} j output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_java)
if(ENABLE_octave)
@@ -163,12 +172,14 @@
@ONLY
)
list(APPEND SCRIPTS test_octave.sh)
- add_test(examples_octave
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave"
- )
- list(APPEND examples_compare_DEPENDS examples_octave)
- list_example_files(. ${TEST_DEVICE} o output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_octave
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave"
+ )
+ list(APPEND examples_compare_DEPENDS examples_octave)
+ list_example_files(. ${TEST_DEVICE} o output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_octave)
if(ENABLE_python)
@@ -178,12 +189,14 @@
@ONLY
)
list(APPEND SCRIPTS test_python.sh)
- add_test(examples_python
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python"
- )
- list(APPEND examples_compare_DEPENDS examples_python)
- list_example_files(. ${TEST_DEVICE} p output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_python
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python"
+ )
+ list(APPEND examples_compare_DEPENDS examples_python)
+ list_example_files(. ${TEST_DEVICE} p output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_python)
if(ENABLE_tcl)
@@ -202,12 +215,14 @@
${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh
@ONLY
)
- add_test(examples_tcl
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl"
- )
- list(APPEND examples_compare_DEPENDS examples_tcl)
- list_example_files(. ${TEST_DEVICE} t output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_tcl
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl"
+ )
+ list(APPEND examples_compare_DEPENDS examples_tcl)
+ list_example_files(. ${TEST_DEVICE} t output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
set(PLTCL_DIR ${BIN_DIR})
# Transform drive-letter form to leading-slash form, see comment above.
string(REGEX REPLACE "^(.):" "/\\1/" PLTCL_DIR ${PLTCL_DIR})
@@ -225,12 +240,14 @@
@ONLY
)
list(APPEND SCRIPTS test_pdl.sh)
- add_test(examples_pdl
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl"
- )
- list(APPEND examples_compare_DEPENDS examples_pdl)
- list_example_files(. ${TEST_DEVICE} pdl output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_pdl
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl"
+ )
+ list(APPEND examples_compare_DEPENDS examples_pdl)
+ list_example_files(. ${TEST_DEVICE} pdl output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_pdl)
if(ENABLE_ada)
@@ -240,12 +257,14 @@
@ONLY
)
list(APPEND SCRIPTS test_ada.sh)
- add_test(examples_ada
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada"
- )
- list(APPEND examples_compare_DEPENDS examples_ada)
- list_example_files(. ${TEST_DEVICE} a output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_ada
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada"
+ )
+ list(APPEND examples_compare_DEPENDS examples_ada)
+ list_example_files(. ${TEST_DEVICE} a output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_ada)
if(ENABLE_ocaml)
@@ -255,12 +274,14 @@
@ONLY
)
list(APPEND SCRIPTS test_ocaml.sh)
- add_test(examples_ocaml
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml"
- )
- list(APPEND examples_compare_DEPENDS examples_ocaml)
- list_example_files(. ${TEST_DEVICE} ocaml output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_ocaml
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml"
+ )
+ list(APPEND examples_compare_DEPENDS examples_ocaml)
+ list_example_files(. ${TEST_DEVICE} ocaml output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_ocaml)
if(ENABLE_lua)
@@ -270,12 +291,14 @@
@ONLY
)
list(APPEND SCRIPTS test_lua.sh)
- add_test(examples_lua
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua"
- )
- list(APPEND examples_compare_DEPENDS examples_lua)
- list_example_files(. ${TEST_DEVICE} lua output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_lua
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua"
+ )
+ list(APPEND examples_compare_DEPENDS examples_lua)
+ list_example_files(. ${TEST_DEVICE} lua output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_lua)
if(ENABLE_d)
@@ -285,12 +308,14 @@
@ONLY
)
list(APPEND SCRIPTS test_d.sh)
- add_test(examples_d
- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d"
- )
- list(APPEND examples_compare_DEPENDS examples_d)
- list_example_files(. ${TEST_DEVICE} d output_list)
- list(APPEND test_output_files_LIST ${output_list})
+ if(PLD_${TEST_DEVICE})
+ add_test(examples_d
+ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d"
+ )
+ list(APPEND examples_compare_DEPENDS examples_d)
+ list_example_files(. ${TEST_DEVICE} d output_list)
+ list(APPEND test_output_files_LIST ${output_list})
+ endif(PLD_${TEST_DEVICE})
endif(ENABLE_d)
# Run C examples with different drivers
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-10 23:46:48
|
Revision: 12838
http://sourceforge.net/p/plplot/code/12838
Author: airwin
Date: 2013-12-10 23:46:45 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Previously we dropped example 17 for -dev xcairo because it was painfully
slow for that device. A similar issue occurs for -dev qtwidgets so drop
example 17 for that device as well.
Modified Paths:
--------------
trunk/plplot_test/test_c_interactive.sh.in
Modified: trunk/plplot_test/test_c_interactive.sh.in
===================================================================
--- trunk/plplot_test/test_c_interactive.sh.in 2013-12-10 00:14:08 UTC (rev 12837)
+++ trunk/plplot_test/test_c_interactive.sh.in 2013-12-10 23:46:45 UTC (rev 12838)
@@ -27,9 +27,9 @@
lang="c"
export index lang
-if [ "$device" = "xcairo" ] ; then
- # Temporarily drop example 17 for xcairo because that driver is
- # so horribly slow such interactive plots.
+if [ "$device" = "xcairo" -o "$device" = "qtwidget" ] ; then
+ # Temporarily drop example 17 for xcairo and qtwidget because those drivers are
+ # so horribly slow for such interactive plots.
INDEX="01 04 08 14 16 24 30"
else
INDEX="01 04 08 14 16 17 24 30"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-12-10 00:14:11
|
Revision: 12837
http://sourceforge.net/p/plplot/code/12837
Author: andrewross
Date: 2013-12-10 00:14:08 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Fix up various compiler warnings with pdf driver.
Modified Paths:
--------------
trunk/drivers/pdf.c
Modified: trunk/drivers/pdf.c
===================================================================
--- trunk/drivers/pdf.c 2013-12-09 19:33:53 UTC (rev 12836)
+++ trunk/drivers/pdf.c 2013-12-10 00:14:08 UTC (rev 12837)
@@ -37,12 +37,13 @@
#include <stdarg.h>
#include <math.h>
#include <setjmp.h>
+#include <strings.h>
#include "hpdf.h"
// PLplot header files
-#define DEBUG
-#define NEED_PLDEBUG
+//#define DEBUG
+//#define NEED_PLDEBUG
#include "plplotP.h"
#include "drivers.h"
#include "plunicode-type1.h"
@@ -103,7 +104,7 @@
//--------------------------------------------------------------------------
// General
-static short desired_offset( short, double );
+//static short desired_offset( short, double );
static void poly_line( PLStream *pls, short *xa, short *ya, PLINT npts, short fill );
// String processing
@@ -119,6 +120,10 @@
void plD_tidy_pdf( PLStream * );
void plD_state_pdf( PLStream *, PLINT );
void plD_esc_pdf( PLStream *, PLINT, void * );
+void error_handler( HPDF_STATUS error_no, HPDF_STATUS detail_no, void *user_data );
+void PSDrawTextToCanvas( pdfdev* dev, unsigned char* type1_string, short drawText );
+void PSSetFont( pdfdev* dev, PLUNICODE fci );
+void PSDrawText( pdfdev* dev, PLUNICODE* ucs4, int ucs4Len, short drawText );
//--------------------------------------------------------------------------
// error_handler( HPDF_STATUS error_no, HPDF_STATUS detail_no,
@@ -131,7 +136,7 @@
#else
void
#endif
-error_handler( HPDF_STATUS error_no, HPDF_STATUS detail_no, void *user_data )
+error_handler( HPDF_STATUS error_no, HPDF_STATUS detail_no, void * PL_UNUSED( user_data ) )
{
// invoke longjmp() when an error has occurred
printf( "ERROR: error_no=%04X, detail_no=%d\n", (unsigned int) error_no, (int) detail_no );
@@ -361,7 +366,7 @@
//
// End of page
//--------------------------------------------------------------------------
-void plD_eop_pdf( PLStream *pls )
+void plD_eop_pdf( PLStream * PL_UNUSED( pls ) )
{
// nothing to be done here
}
@@ -387,7 +392,8 @@
{
HPDF_BYTE buf[4096]; // TODO: not good
HPDF_UINT32 size = 4096;
- HPDF_STATUS ret = HPDF_ReadFromStream( dev->pdf, buf, &size );
+ // HPDF_STATUS ret = HPDF_ReadFromStream( dev->pdf, buf, &size );
+ HPDF_ReadFromStream( dev->pdf, buf, &size );
if ( size == 0 )
break;
@@ -411,7 +417,7 @@
// Nothing is done here because these attributes are aquired from
// PLStream for each element that is drawn.
//--------------------------------------------------------------------------
-void plD_state_pdf( PLStream *pls, PLINT op )
+void plD_state_pdf( PLStream * PL_UNUSED( pls ), PLINT PL_UNUSED( op ) )
{
// Nothing to be done here.
}
@@ -537,7 +543,7 @@
// determine text width and height
dev->textWidth += HPDF_Page_TextWidth( dev->page, (char *) type1_string ); // TODO: this conversion must be wrong
- th = (HPDF_REAL) ( HPDF_Font_GetCapHeight( dev->m_font ) * dev->fontSize * dev->fontScale / 1000.0 );
+ th = (HPDF_REAL) ( (HPDF_REAL) HPDF_Font_GetCapHeight( dev->m_font ) * dev->fontSize * dev->fontScale / 1000.0 );
dev->textHeight = dev->textHeight > ( th + dev->yOffset ) ? dev->textHeight : ( th + dev->yOffset );
// clear string
@@ -742,9 +748,9 @@
// for superscripts should be
// 0.5*(base font size - superscript/subscript font size).
dup = 0.5 * ( 1.0 - sscale );
- dev->fontScale = sscale;
+ dev->fontScale = (HPDF_REAL) sscale;
PSSetFont( dev, fci );
- dev->yOffset = dev->fontSize * ( soffset * RISE_FACTOR + dup );
+ dev->yOffset = (HPDF_REAL) (dev->fontSize * ( soffset * RISE_FACTOR + dup ));
}
if ( ucs4[i] == (PLUNICODE) 'd' ) // Subscript
{
@@ -759,9 +765,9 @@
// for subcripts should be
// 0.5*(base font size - superscript/subscript font size).
dup = -0.5 * ( 1.0 - sscale );
- dev->fontScale = sscale;
+ dev->fontScale = (HPDF_REAL) sscale;
PSSetFont( dev, fci );
- dev->yOffset = -dev->fontSize * ( soffset * RISE_FACTOR + dup );
+ dev->yOffset = (HPDF_REAL) ( -dev->fontSize * ( soffset * RISE_FACTOR + dup ) );
}
if ( ucs4[i] == (PLUNICODE) '-' ) // underline
{ // draw string so far
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-12-09 19:33:56
|
Revision: 12836
http://sourceforge.net/p/plplot/code/12836
Author: arjenmarkus
Date: 2013-12-09 19:33:53 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Add the "rectangular" argument to all variants of plshades. It may not be useful in some cases, but it does not hurt and restores the symmetry.
Note: plshades_multiple_tr now uses a default "rectangular" option of 0 - previously it was 1, but I think that was a mistake, as in most cases the transformation of the coordinates will not result in rectangles.
Modified Paths:
--------------
trunk/bindings/f95/plplotf95.def
trunk/bindings/f95/plplotf95_ifort.def
trunk/bindings/f95/plplotf95_mingw.def
trunk/bindings/f95/sccont.c
trunk/bindings/f95/sfstubs.f90
trunk/bindings/f95/sfstubsf95.f90
Modified: trunk/bindings/f95/plplotf95.def
===================================================================
--- trunk/bindings/f95/plplotf95.def 2013-12-09 19:18:22 UTC (rev 12835)
+++ trunk/bindings/f95/plplotf95.def 2013-12-09 19:33:53 UTC (rev 12836)
@@ -33,7 +33,9 @@
_PLPLOTP_mp_PLSHADES_MULTIPLE_1@52
_PLPLOTP_mp_PLSHADES_MULTIPLE_1R@56
_PLPLOTP_mp_PLSHADES_MULTIPLE_2@52
+ _PLPLOTP_mp_PLSHADES_MULTIPLE_2R@56
_PLPLOTP_mp_PLSHADES_MULTIPLE_TR@48
+ _PLPLOTP_mp_PLSHADES_MULTIPLE_TRR@52
_PLPLOTP_mp_PLSPAL0@8
_PLPLOTP_mp_PLSPAL1@12
_PLPLOTP_mp_PLLAB@24
Modified: trunk/bindings/f95/plplotf95_ifort.def
===================================================================
--- trunk/bindings/f95/plplotf95_ifort.def 2013-12-09 19:18:22 UTC (rev 12835)
+++ trunk/bindings/f95/plplotf95_ifort.def 2013-12-09 19:33:53 UTC (rev 12836)
@@ -33,7 +33,9 @@
PLPLOTP_mp_PLSHADES_MULTIPLE_1
PLPLOTP_mp_PLSHADES_MULTIPLE_1R
PLPLOTP_mp_PLSHADES_MULTIPLE_2
+ PLPLOTP_mp_PLSHADES_MULTIPLE_2R
PLPLOTP_mp_PLSHADES_MULTIPLE_TR
+ PLPLOTP_mp_PLSHADES_MULTIPLE_TRR
PLPLOTP_mp_PLSPAL0
PLPLOTP_mp_PLSPAL1
PLPLOTP_mp_PLLAB
Modified: trunk/bindings/f95/plplotf95_mingw.def
===================================================================
--- trunk/bindings/f95/plplotf95_mingw.def 2013-12-09 19:18:22 UTC (rev 12835)
+++ trunk/bindings/f95/plplotf95_mingw.def 2013-12-09 19:33:53 UTC (rev 12836)
@@ -40,7 +40,9 @@
__plplotp_MOD_plshades_multiple_1
__plplotp_MOD_plshades_multiple_1r
__plplotp_MOD_plshades_multiple_2
+ __plplotp_MOD_plshades_multiple_2r
__plplotp_MOD_plshades_multiple_tr
+ __plplotp_MOD_plshades_multiple_trr
__plplotp_MOD_plspal0
__plplotp_MOD_plspal1
__plplotp_MOD_plstart
Modified: trunk/bindings/f95/sccont.c
===================================================================
--- trunk/bindings/f95/sccont.c 2013-12-09 19:18:22 UTC (rev 12835)
+++ trunk/bindings/f95/sccont.c 2013-12-09 19:33:53 UTC (rev 12836)
@@ -83,11 +83,11 @@
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
PLINT *cont_color, PLFLT *cont_width,
- PLFLT *xg2, PLFLT *yg2, PLINT *lx );
+ PLFLT *xg2, PLFLT *yg2, PLINT *lx, PLINT *rect );
void PLSHADES7( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
- PLINT *cont_color, PLFLT *cont_width, PLFLT *ftr, PLINT *lx );
+ PLINT *cont_color, PLFLT *cont_width, PLFLT *ftr, PLINT *lx, PLINT *rect );
void PLGRIDDATA( PLFLT *x, PLFLT *y, PLFLT *z, PLINT *npts, PLFLT *xg,
PLINT *nx, PLFLT *yg, PLINT *ny, PLFLT *zg, PLINT *type,
PLFLT *data );
@@ -580,17 +580,13 @@
plFree2dGrid( a, *nx, *ny );
}
-
-// Note that in this case the rectangular argument should always be 0,
-// it makes no sense to propagate it as an optional argument
void
PLSHADES27( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
PLINT *cont_color, PLFLT *cont_width,
- PLFLT *xg2, PLFLT *yg2, PLINT *lx )
+ PLFLT *xg2, PLFLT *yg2, PLINT *lx, PLINT *rect )
{
- PLINT rect = 0;
PLFLT **a;
int i, j;
PLcGrid2 cgrid2;
@@ -615,7 +611,7 @@
*xmin, *xmax, *ymin, *ymax,
clevel, *nlevel, *fill_width,
*cont_color, *cont_width,
- c_plfill, rect, pltr2, (void *) &cgrid2 );
+ c_plfill, *rect, pltr2, (void *) &cgrid2 );
// Clean up allocated memory
plFree2dGrid( a, *nx, *ny );
@@ -627,9 +623,8 @@
PLSHADES7( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
- PLINT *cont_color, PLFLT *cont_width, PLFLT *ftr, PLINT *lx )
+ PLINT *cont_color, PLFLT *cont_width, PLFLT *ftr, PLINT *lx, PLINT *rect )
{
- PLINT rect = 1;
PLFLT ** a;
int i, j;
@@ -647,7 +642,7 @@
*xmin, *xmax, *ymin, *ymax,
clevel, *nlevel, *fill_width,
*cont_color, *cont_width,
- c_plfill, rect, pltr, (void *) ftr );
+ c_plfill, *rect, pltr, (void *) ftr );
// Clean up memory allocated for a
plFree2dGrid( a, *nx, *ny );
Modified: trunk/bindings/f95/sfstubs.f90
===================================================================
--- trunk/bindings/f95/sfstubs.f90 2013-12-09 19:18:22 UTC (rev 12835)
+++ trunk/bindings/f95/sfstubs.f90 2013-12-09 19:33:53 UTC (rev 12836)
@@ -603,12 +603,46 @@
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
xg2(:,:), yg2(:,:)
+ integer rect
+
! call plstrf2c(dnam, string1)
+ rect = 0
+
s1 = transfer( string1, s1 )
call plshades27(z, size(z,1), size(z,2), s1, &
xmin, xmax, ymin, ymax, &
clevel, size(clevel), fill_width, &
+ cont_color, cont_width, xg2, yg2, size(z,1), rect)
+
+ end subroutine
+
+!***********************************************************************
+
+ subroutine plshades_multiple_2r(z, defined, &
+ xmin, xmax, ymin, ymax, &
+ clevel, fill_width, &
+ cont_color, cont_width, rectangular, xg2, yg2)
+
+ implicit none
+ character defined*(*)
+ integer cont_color
+ logical rectangular
+ real(kind=plflt)fill_width, cont_width
+ real(kind=plflt) clevel(:)
+ real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
+ xg2(:,:), yg2(:,:)
+
+ integer rect
+
+ rect = merge( 1, 0, rectangular )
+
+! call plstrf2c(dnam, string1)
+
+ s1 = transfer( string1, s1 )
+ call plshades27(z, size(z,1), size(z,2), s1, &
+ xmin, xmax, ymin, ymax, &
+ clevel, size(clevel), fill_width, &
cont_color, cont_width, xg2, yg2, size(z,1))
end subroutine
@@ -628,18 +662,52 @@
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax
real(kind=plflt) tr(6)
+ integer rect
+
! call plstrf2c(dnam, string1)
+ rect = 0
+
s1 = transfer( string1, s1 )
call plshades7(z, size(z,1), size(z,2), s1, &
xmin, xmax, ymin, ymax, &
clevel, size(clevel), fill_width, &
- cont_color, cont_width, tr, size(z,1))
+ cont_color, cont_width, tr, size(z,1), rect)
end subroutine
!***********************************************************************
+ subroutine plshades_multiple_trr(z, defined, &
+ xmin, xmax, ymin, ymax, &
+ clevel, fill_width, &
+ cont_color, cont_width, rectangular, tr)
+
+ implicit none
+ character defined*(*)
+ integer cont_color
+ logical rectangular
+ real(kind=plflt) fill_width, cont_width
+ real(kind=plflt) clevel(:)
+ real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax
+ real(kind=plflt) tr(6)
+
+ integer rect
+
+! call plstrf2c(dnam, string1)
+
+ rect = merge(1, 0, rectangular)
+
+ s1 = transfer( string1, s1 )
+ call plshades7(z, size(z,1), size(z,2), s1, &
+ xmin, xmax, ymin, ymax, &
+ clevel, size(clevel), fill_width, &
+ cont_color, cont_width, tr, size(z,1), rect)
+
+ end subroutine
+
+!***********************************************************************
+
subroutine plimagefr_0(z,xmin,xmax,ymin,ymax,zmin,zmax, &
valuemin,valuemax)
Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90 2013-12-09 19:18:22 UTC (rev 12835)
+++ trunk/bindings/f95/sfstubsf95.f90 2013-12-09 19:33:53 UTC (rev 12836)
@@ -112,10 +112,13 @@
module procedure plshades_multiple_1
module procedure plshades_multiple_1r
module procedure plshades_multiple_2
+ module procedure plshades_multiple_2r
module procedure plshades_multiple_tr
+ module procedure plshades_multiple_trr
end interface
- private :: plshades_multiple_0, plshades_multiple_1, &
- plshades_multiple_2, plshades_multiple_tr
+ private :: plshades_multiple_0, plshades_multiple_1, plshades_multiple_1r, &
+ plshades_multiple_2, plshades_multiple_2r, &
+ plshades_multiple_tr, plshades_multiple_trr
interface plimagefr
module procedure plimagefr_0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-12-09 19:18:25
|
Revision: 12835
http://sourceforge.net/p/plplot/code/12835
Author: arjenmarkus
Date: 2013-12-09 19:18:22 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Changes to get the Tk bindings compilable on Windows for the ntk. Not all the code involved in this change set is actually used by the ntk device, but the compiler and linker complain otherwise.
Modified Paths:
--------------
trunk/bindings/tk/plframe.c
trunk/bindings/tk/pltkd.h
trunk/bindings/tk/tcpip.c
trunk/bindings/tk/tkMain.c
Modified: trunk/bindings/tk/plframe.c
===================================================================
--- trunk/bindings/tk/plframe.c 2013-12-09 19:16:11 UTC (rev 12834)
+++ trunk/bindings/tk/plframe.c 2013-12-09 19:18:22 UTC (rev 12835)
@@ -1195,7 +1195,11 @@
dbug_enter( "PlFrameKeyEH" );
+#if !defined( __WIN32__ )
nchars = XLookupString( event, string, 10, &keysym, &cs );
+#else
+ nchars = 0;
+#endif
string[nchars] = '\0';
pldebug( "PlFrameKeyEH", "Keysym %x, translation: %s\n", keysym, string );
@@ -2544,7 +2548,11 @@
(char *) NULL );
return TCL_ERROR;
}
+#if !defined( __WIN32__ )
if ( ( iodev->fd = open( argv[1], O_RDONLY ) ) == -1 )
+#else
+ if ( 1 )
+#endif
{
Tcl_AppendResult( interp, "cannot open fifo ", argv[1],
" for read", (char *) NULL );
@@ -2552,7 +2560,11 @@
}
iodev->type = 0;
iodev->typeName = "fifo";
+#if !defined( __WIN32__ )
iodev->file = fdopen( iodev->fd, "rb" );
+#else
+ iodev->file = NULL;
+#endif
}
// Open socket
@@ -2863,7 +2875,11 @@
if ( plFramePtr->plpr_cmd == NULL )
plFramePtr->plpr_cmd = plFindCommand( "plpr" );
+#if !defined( __WIN32__ )
if ( ( plFramePtr->plpr_cmd == NULL ) || ( pid = fork() ) < 0 )
+#else
+ if ( 1 )
+#endif
{
Tcl_AppendResult( interp,
"Error -- cannot fork print process",
@@ -2872,8 +2888,12 @@
}
else if ( pid == 0 )
{
+#if !defined( __WIN32__ )
if ( execl( plFramePtr->plpr_cmd, plFramePtr->plpr_cmd, sfnam,
(char *) 0 ) )
+#else
+ if ( 1 )
+#endif
{
fprintf( stderr, "Unable to exec print command.\n" );
free( sfnam );
Modified: trunk/bindings/tk/pltkd.h
===================================================================
--- trunk/bindings/tk/pltkd.h 2013-12-09 19:16:11 UTC (rev 12834)
+++ trunk/bindings/tk/pltkd.h 2013-12-09 19:18:22 UTC (rev 12835)
@@ -21,6 +21,11 @@
#include <dp.h>
#endif
+// Define the type pid_t - a dummy for the moment - for MS Windows
+#if defined(__WIN32__)
+typedef unsigned int pid_t;
+#endif
+
// One of these holds the TK driver state information
typedef struct
Modified: trunk/bindings/tk/tcpip.c
===================================================================
--- trunk/bindings/tk/tcpip.c 2013-12-09 19:16:11 UTC (rev 12834)
+++ trunk/bindings/tk/tcpip.c 2013-12-09 19:18:22 UTC (rev 12835)
@@ -105,9 +105,18 @@
#include <sys/types.h>
#include <fcntl.h>
#include <ctype.h>
+#if !defined( __WIN32__ )
#include <sys/uio.h>
+#endif
#include <errno.h>
+// Supply dummy macros for the low-level I/O functions - Windows
+#if defined( __WIN32__ )
+#define read(a,b,c) 0
+#define close(a)
+#define write(a,b,c) 0
+#endif
+
//extern int errno;
#ifndef MIN
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2013-12-09 19:16:11 UTC (rev 12834)
+++ trunk/bindings/tk/tkMain.c 2013-12-09 19:18:22 UTC (rev 12835)
@@ -108,7 +108,12 @@
// extern int isatty _ANSI_ARGS_((int fd));
// extern int read _ANSI_ARGS_((int fd, char *buf, size_t size));
//
+#if !defined(__WIN32__)
extern char * strrchr _ANSI_ARGS_( ( CONST char *string, int c ) );
+#else
+// On Windows we do not have a convenient console to work with
+#define isatty( a ) 0
+#endif
//
// Global variables used by the main program:
@@ -199,6 +204,7 @@
//
// Parse command-line arguments.
//
+ fprintf( stderr, "Before Tk_ParseArgv\n");
if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
!= TCL_OK )
@@ -206,6 +212,7 @@
fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
exit( 1 );
}
+ fprintf( stderr, "After Tk_ParseArgv\n");
if ( name == NULL )
{
if ( fileName != NULL )
@@ -308,6 +315,7 @@
// and "argv". Also set the "geometry" variable from the geometry
// specified on the command line.
//
+ fprintf( stderr, "Before Tcl_Merge\n");
args = Tcl_Merge( argc - 1, ( CONST char * CONST * )argv + 1 );
Tcl_SetVar( interp, "argv", args, TCL_GLOBAL_ONLY );
@@ -315,6 +323,7 @@
sprintf( buf, "%d", argc - 1 );
Tcl_SetVar( interp, "argc", buf, TCL_GLOBAL_ONLY );
+ fprintf( stderr, "After Tcl_Merge\n");
if ( geometry != NULL )
{
Tcl_SetVar( interp, "geometry", geometry, TCL_GLOBAL_ONLY );
@@ -336,6 +345,7 @@
//
// Invoke application-specific initialization.
//
+ fprintf( stderr, "Before AppInit\n");
if ( ( *AppInit )( interp ) != TCL_OK )
{
@@ -359,6 +369,7 @@
//
// Process the startup script, if any.
//
+ fprintf( stderr, "Before startup\n");
if ( script != NULL )
{
@@ -373,6 +384,7 @@
//
// Invoke the script specified on the command line, if any.
//
+ fprintf( stderr, "Before source\n");
if ( fileName != NULL )
{
@@ -436,6 +448,7 @@
// are no windows left, Tk_MainLoop returns and we exit.
//
+ fprintf( stderr, "Before Tk_MainLoop\n");
Tk_MainLoop();
//
@@ -489,7 +502,11 @@
int code, count;
const char *res;
+#if !defined(__WIN32__)
count = (int) read( fileno( stdin ), input, BUFFER_SIZE );
+#else
+ count = fread( input, BUFFER_SIZE, sizeof( char ), stdin );
+#endif
if ( count <= 0 )
{
if ( !gotPartial )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-12-09 19:16:14
|
Revision: 12834
http://sourceforge.net/p/plplot/code/12834
Author: arjenmarkus
Date: 2013-12-09 19:16:11 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Adjust the package loading script for Cygwin - a specific library name and a different directory. The name (now: cygplplottcltkd-10) should be configured but I could not find the right keyword for it.
Modified Paths:
--------------
trunk/bindings/tk/pkgIndex.tcl.in
Modified: trunk/bindings/tk/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tk/pkgIndex.tcl.in 2013-12-09 16:48:06 UTC (rev 12833)
+++ trunk/bindings/tk/pkgIndex.tcl.in 2013-12-09 19:16:11 UTC (rev 12834)
@@ -33,9 +33,13 @@
set pllibrary $dir
if {$tcl_platform(platform) == "unix"} {
- set stem tk
+ if {[string match "*CYGWIN*" $::tcl_platform(os)]} {
+ set stem cygplplottcltk@LIB_TAG@-10
+ } else {
+ set stem tk
+ }
set thisDir [pwd]
- # Find absolute path of $dir
+ # Find absolute path of $dir
cd $dir
set pkgIndexDir [pwd]
cd $thisDir
@@ -43,7 +47,7 @@
set bLen [string length $buildDir]
# If pkgIndexDir is in the build tree...
if {![string compare -length $bLen $buildDir $pkgIndexDir]} then {
- set searchdirs "../../drivers"} else {
+ set searchdirs [list "../../drivers" "../../dll"]} else {
set searchdirs [list "@DRV_HARDDIR@"]}
#puts $searchdirs
set suf [info sharedlibextension]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-12-09 16:48:09
|
Revision: 12833
http://sourceforge.net/p/plplot/code/12833
Author: andrewross
Date: 2013-12-09 16:48:06 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Fix another compiler warning.
Modified Paths:
--------------
trunk/drivers/pdf.c
Modified: trunk/drivers/pdf.c
===================================================================
--- trunk/drivers/pdf.c 2013-12-09 14:39:59 UTC (rev 12832)
+++ trunk/drivers/pdf.c 2013-12-09 16:48:06 UTC (rev 12833)
@@ -552,7 +552,7 @@
//--------------------------------------------------------------------------
void PSSetFont( pdfdev* dev, PLUNICODE fci )
{
- char *font;
+ const char *font;
// fci = 0 is a special value indicating the Type 1 Symbol font
// is desired. This value cannot be confused with a normal FCI value
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-12-09 14:40:03
|
Revision: 12832
http://sourceforge.net/p/plplot/code/12832
Author: andrewross
Date: 2013-12-09 14:39:59 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Style recent code changes.
Modified Paths:
--------------
trunk/bindings/d/plplot.d
trunk/bindings/java/plplotjavac.i
trunk/bindings/lua/plplotluac.i
trunk/bindings/octave/plplot_octave.i
trunk/bindings/python/plplotcmodule.i
trunk/bindings/qt_gui/plqt.cpp
trunk/bindings/tcl/tclAPI.c
trunk/bindings/tk/plframe.c
trunk/bindings/tk/tkMain.c
trunk/bindings/tk-x-plat/plplotter.c
trunk/drivers/ntk.c
trunk/drivers/tk.c
trunk/examples/c/x01c.c
trunk/examples/c/x17c.c
trunk/examples/c++/x01.cc
trunk/examples/c++/x17.cc
trunk/examples/c++/x22.cc
trunk/examples/d/x22d.d
trunk/examples/java/x22.java
Modified: trunk/bindings/d/plplot.d
===================================================================
--- trunk/bindings/d/plplot.d 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/d/plplot.d 2013-12-09 14:39:59 UTC (rev 12832)
@@ -1418,11 +1418,11 @@
//alias c_pllegend pllegend;
alias c_pllightsource pllightsource;
//alias c_plline plline;
-alias c_plpath plpath;
+alias c_plpath plpath;
//alias c_plline3 plline3;
-alias c_pllsty pllsty;
+alias c_pllsty pllsty;
//alias c_plmap plmap;
-alias c_plmeridians plmeridians;
+alias c_plmeridians plmeridians;
//alias c_plmesh plmesh;
//alias c_plmeshc plmeshc;
alias c_plmkstrm plmkstrm;
Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/java/plplotjavac.i 2013-12-09 14:39:59 UTC (rev 12832)
@@ -741,7 +741,6 @@
{
if ( $1 != NULL )
free( $1 );
-
}
%typemap( jni ) ( const PLFLT * ArrayCkNull, PLINT n ) jPLFLTArray
%typemap( jtype ) ( const PLFLT * ArrayCkNull, PLINT n ) jPLFLTbracket
@@ -912,7 +911,7 @@
}
else
{
- $1 = NULL;
+ $1 = NULL;
Alen = 0;
}
}
@@ -1526,7 +1525,7 @@
%{
jobject ctClass = 0;
jobject ctClassRef = 0;
-
+
void ct_java( PLFLT x, PLFLT y, PLFLT *xt, PLFLT *yt, PLPointer data );
// C coordinate transform callback function which calls the java
Modified: trunk/bindings/lua/plplotluac.i
===================================================================
--- trunk/bindings/lua/plplotluac.i 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/lua/plplotluac.i 2013-12-09 14:39:59 UTC (rev 12832)
@@ -183,13 +183,13 @@
else
{
$1 = (PLINT *) LUA_get_int_num_array_var( L, $input, &temp );
- if ( !$1 )
- SWIG_fail;
- if ( temp != Alen )
- {
- lua_pushfstring( L, "Tables must be of same length." );
- SWIG_fail;
- }
+ if ( !$1 )
+ SWIG_fail;
+ if ( temp != Alen )
+ {
+ lua_pushfstring( L, "Tables must be of same length." );
+ SWIG_fail;
+ }
}
}
%typemap( freearg ) const PLINT * ArrayCkNull { LUA_FREE_ARRAY( $1 ); }
@@ -218,13 +218,13 @@
else
{
$1 = (PLINT *) LUA_get_int_num_array_var( L, $input, &temp );
- if ( !$1 )
+ if ( !$1 )
SWIG_fail;
- if ( temp < Alen - 1 )
- {
- lua_pushfstring( L, "Tables must be at least length of others minus 1." );
- SWIG_fail;
- }
+ if ( temp < Alen - 1 )
+ {
+ lua_pushfstring( L, "Tables must be at least length of others minus 1." );
+ SWIG_fail;
+ }
}
}
%typemap( freearg ) const PLINT * ArrayCkMinus1Null { LUA_FREE_ARRAY( $1 ); }
@@ -320,13 +320,13 @@
else
{
$1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
- if ( !$1 )
- SWIG_fail;
- if ( temp != Alen )
- {
- lua_pushfstring( L, "Tables must be of same length." );
- SWIG_fail;
- }
+ if ( !$1 )
+ SWIG_fail;
+ if ( temp != Alen )
+ {
+ lua_pushfstring( L, "Tables must be of same length." );
+ SWIG_fail;
+ }
}
$2 = temp;
}
@@ -334,7 +334,10 @@
{
LUA_FREE_ARRAY( $1 );
}
-%typemap( default ) ( const PLFLT * ArrayCkNull, PLINT n ) { $1 = NULL; $2 = 0; }
+%typemap( default ) ( const PLFLT * ArrayCkNull, PLINT n )
+{
+ $1 = NULL; $2 = 0;
+}
// no count, but check consistency with previous
@@ -362,13 +365,13 @@
else
{
$1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
- if ( !$1 )
- SWIG_fail;
- if ( temp != Alen )
- {
- lua_pushfstring( L, "Tables must be of same length." );
- SWIG_fail;
- }
+ if ( !$1 )
+ SWIG_fail;
+ if ( temp != Alen )
+ {
+ lua_pushfstring( L, "Tables must be of same length." );
+ SWIG_fail;
+ }
}
}
%typemap( freearg ) const PLFLT * ArrayCkNull { LUA_FREE_ARRAY( $1 ); }
@@ -393,15 +396,15 @@
int temp;
if ( lua_isnil( L, $input ) )
{
- $1 = NULL;
- Alen = 0;
+ $1 = NULL;
+ Alen = 0;
}
else
{
$1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
- if ( !$1 )
- SWIG_fail;
- Alen = temp;
+ if ( !$1 )
+ SWIG_fail;
+ Alen = temp;
}
}
%typemap( freearg ) ( const PLFLT * Array )
@@ -864,7 +867,7 @@
typedef PLFLT ( *f2eval_func )( PLINT, PLINT, PLPointer );
typedef void ( *label_func )( PLINT, PLFLT, char*, PLINT, PLPointer );
-// Function prototypes
+// Function prototypes
void mypltr( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, void * pltr_data );
void myct( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, void * pltr_data );
void mylabel( PLINT axis, PLFLT value, char* label, PLINT length, PLPointer data );
@@ -961,7 +964,6 @@
void mylabel( PLINT axis, PLFLT value, char* label, PLINT length, PLPointer PL_UNUSED( data ) )
{
-
// check Lua state
if ( myL == NULL )
{
@@ -971,8 +973,8 @@
// push functions and arguments
lua_getglobal( myL, mylabel_funcstr ); // function to be called
- lua_pushnumber( myL, axis ); // push 1st argument
- lua_pushnumber( myL, value ); // push 1st argument
+ lua_pushnumber( myL, axis ); // push 1st argument
+ lua_pushnumber( myL, value ); // push 1st argument
// do the call (2 arguments, 1 result)
if ( lua_pcall( myL, 2, 1, 0 ) != 0 )
@@ -1423,7 +1425,10 @@
LUA_FREE_ARRAY( $2 );
}
-%typemap( default ) ( PLBOOL deffalse ) { $1 = 0; }
+%typemap( default ) ( PLBOOL deffalse )
+{
+ $1 = 0;
+}
//--------------------------------------------------------------------------
Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/octave/plplot_octave.i 2013-12-09 14:39:59 UTC (rev 12832)
@@ -411,14 +411,14 @@
if ( !$input.is_empty() )
{
if ( _dim( $input, 0 ) != Alen )
- {
- error( "argument vectors must be same length" ); SWIG_fail;
- }
- temp = $input.matrix_value();
- $1 = &temp( 0, 0 );
- $2 = (PLINT) ( _dim( $input, 0 ) );
+ {
+ error( "argument vectors must be same length" ); SWIG_fail;
+ }
+ temp = $input.matrix_value();
+ $1 = &temp( 0, 0 );
+ $2 = (PLINT) ( _dim( $input, 0 ) );
}
- else
+ else
{
$1 = NULL;
$2 = 0;
@@ -509,13 +509,13 @@
if ( !$input.is_empty() )
{
Alen = (PLINT) ( _dim( $input, 0 ) );
- temp = $input.matrix_value();
- $1 = &temp( 0, 0 );
+ temp = $input.matrix_value();
+ $1 = &temp( 0, 0 );
}
else
{
- $1 = NULL;
- Alen = 0;
+ $1 = NULL;
+ Alen = 0;
}
}
%typemap( freearg ) ( const PLFLT * ArrayNull )
Modified: trunk/bindings/python/plplotcmodule.i
===================================================================
--- trunk/bindings/python/plplotcmodule.i 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/python/plplotcmodule.i 2013-12-09 14:39:59 UTC (rev 12832)
@@ -330,20 +330,20 @@
// trailing count and check consistency with previous
%typemap( in ) ( const PLFLT * ArrayCkNull, PLINT n ) ( PyArrayObject * tmp = NULL )
{
- if ( $input != Py_None )
+ if ( $input != Py_None )
{
- tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
- if ( tmp == NULL )
- return NULL;
- if ( PyArray_DIMS( tmp )[0] != Alen )
- {
- PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
- return NULL;
+ tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
+ if ( tmp == NULL )
+ return NULL;
+ if ( PyArray_DIMS( tmp )[0] != Alen )
+ {
+ PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
+ return NULL;
+ }
+ $1 = (PLFLT *) PyArray_DATA( tmp );
+ $2 = PyArray_DIMS( tmp )[0];
}
- $1 = (PLFLT *) PyArray_DATA( tmp );
- $2 = PyArray_DIMS( tmp )[0];
- }
- else
+ else
{
$1 = NULL;
$2 = 0;
@@ -374,16 +374,16 @@
{
if ( $input != Py_None )
{
- tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
- if ( tmp == NULL )
- return NULL;
- if ( PyArray_DIMS( tmp )[0] != Alen )
- {
- PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
- return NULL;
+ tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
+ if ( tmp == NULL )
+ return NULL;
+ if ( PyArray_DIMS( tmp )[0] != Alen )
+ {
+ PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
+ return NULL;
+ }
+ $1 = (PLFLT *) PyArray_DATA( tmp );
}
- $1 = (PLFLT *) PyArray_DATA( tmp );
- }
else
{
$1 = NULL;
@@ -505,16 +505,16 @@
{
if ( $input != Py_None )
{
- tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
- if ( tmp == NULL )
- return NULL;
- Alen = PyArray_DIMS( tmp )[0];
- $1 = (PLFLT *) PyArray_DATA( tmp );
+ tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
+ if ( tmp == NULL )
+ return NULL;
+ Alen = PyArray_DIMS( tmp )[0];
+ $1 = (PLFLT *) PyArray_DATA( tmp );
}
- else
+ else
{
- $1 = NULL;
- Alen = 0;
+ $1 = NULL;
+ Alen = 0;
}
}
%typemap( freearg ) const PLFLT * ArrayNull { Py_CLEAR( tmp$argnum );}
Modified: trunk/bindings/qt_gui/plqt.cpp
===================================================================
--- trunk/bindings/qt_gui/plqt.cpp 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/qt_gui/plqt.cpp 2013-12-09 14:39:59 UTC (rev 12832)
@@ -1123,7 +1123,7 @@
//mouseEvent( event );
}
-void QtPLWidget::mouseMoveEvent( QMouseEvent * PL_UNUSED ( event ) )
+void QtPLWidget::mouseMoveEvent( QMouseEvent * PL_UNUSED( event ) )
{
//mouseEvent( event );
}
Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/tcl/tclAPI.c 2013-12-09 14:39:59 UTC (rev 12832)
@@ -1237,20 +1237,20 @@
static int
plsvectCmd( ClientData PL_UNUSED( clientData ), Tcl_Interp *interp,
- int argc, const char *argv[] )
+ int argc, const char *argv[] )
{
tclMatrix *matx, *maty;
- PLINT npts;
- PLBOOL fill;
+ PLINT npts;
+ PLBOOL fill;
if ( argc == 1
- || (strcmp( argv[1], "NULL" ) == 0 ) && ( strcmp( argv[2], "NULL" ) == 0 ) )
+ || ( strcmp( argv[1], "NULL" ) == 0 ) && ( strcmp( argv[2], "NULL" ) == 0 ) )
{
// The user has requested to clear the transform setting.
plsvect( NULL, NULL, 0, 0 );
return TCL_OK;
}
- else if (argc != 4)
+ else if ( argc != 4 )
{
Tcl_AppendResult( interp, "wrong # args: see documentation for ",
argv[0], (char *) NULL );
@@ -1284,7 +1284,7 @@
return TCL_ERROR;
}
- fill = (PLBOOL) atoi(argv[3]);
+ fill = (PLBOOL) atoi( argv[3] );
plsvect( matx->fdata, maty->fdata, npts, fill );
Modified: trunk/bindings/tk/plframe.c
===================================================================
--- trunk/bindings/tk/plframe.c 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/tk/plframe.c 2013-12-09 14:39:59 UTC (rev 12832)
@@ -382,40 +382,40 @@
return TCL_ERROR;
}
- plFramePtr = (PlFrame *) ckalloc( sizeof ( PlFrame ) );
+ plFramePtr = (PlFrame *) ckalloc( sizeof ( PlFrame ) );
// Initialize in the same order as the members of the struct just
// to keep track of what is initialized and what not.
- plFramePtr->tkwin = new;
- plFramePtr->display = Tk_Display( new );
- plFramePtr->interp = interp;
+ plFramePtr->tkwin = new;
+ plFramePtr->display = Tk_Display( new );
+ plFramePtr->interp = interp;
//plFramePtr->widgetCMD = <initialized below for HAVE_ITCL case>
- plFramePtr->border = NULL;
+ plFramePtr->border = NULL;
//plFramePtr->borderWidth = <uninitialized>
//plFramePtr->relief = <uninitialized>
- plFramePtr->width = Tk_Width( plFramePtr->tkwin );
- plFramePtr->height = Tk_Height( plFramePtr->tkwin );
- plFramePtr->cursor = None;
- plFramePtr->flags = 0;
- plFramePtr->tkwin_initted = 0;
+ plFramePtr->width = Tk_Width( plFramePtr->tkwin );
+ plFramePtr->height = Tk_Height( plFramePtr->tkwin );
+ plFramePtr->cursor = None;
+ plFramePtr->flags = 0;
+ plFramePtr->tkwin_initted = 0;
// Associate new PLplot stream with this widget
plmkstrm( &plFramePtr->ipls );
plgpls( &plFramePtr->pls );
- plFramePtr->ipls_save = 0;
- plFramePtr->plr = (PLRDev *) ckalloc( sizeof ( PLRDev ) );
- plFramePtr->bgColor = NULL;
- plFramePtr->plpr_cmd = NULL;
- plFramePtr->pldis.x = 0;
- plFramePtr->pldis.y = 0;
- plFramePtr->pldis.width = 0;
- plFramePtr->pldis.height = 0;
- plFramePtr->prevWidth = 0;
- plFramePtr->prevHeight = 0;
- plFramePtr->SaveFnam = NULL;
+ plFramePtr->ipls_save = 0;
+ plFramePtr->plr = (PLRDev *) ckalloc( sizeof ( PLRDev ) );
+ plFramePtr->bgColor = NULL;
+ plFramePtr->plpr_cmd = NULL;
+ plFramePtr->pldis.x = 0;
+ plFramePtr->pldis.y = 0;
+ plFramePtr->pldis.width = 0;
+ plFramePtr->pldis.height = 0;
+ plFramePtr->prevWidth = 0;
+ plFramePtr->prevHeight = 0;
+ plFramePtr->SaveFnam = NULL;
// plFramePtr->devDesc = <uninitialized, to be malloced?>;
// plFramePtr->devName = <uninitialized, to be malloced?>;
- plFramePtr->xorGC = NULL;
+ plFramePtr->xorGC = NULL;
// plFram Ptr->pts = <uninitialized array>;
plFramePtr->continue_draw = 0;
plFramePtr->xhair_cursor = None;
@@ -431,15 +431,15 @@
plFramePtr->drawing_xhairs = 0;
// plFram Ptr->xhair_x = <uninitialized array>;
// plFram Ptr->xhair_y = <uninitialized array>;
- plFramePtr->rband = 0;
- plFramePtr->drawing_rband = 0;
+ plFramePtr->rband = 0;
+ plFramePtr->drawing_rband = 0;
// plFram Ptr->rband_pt = <uninitialized array>;
- plr = plFramePtr->plr;
- plr->pdfs = NULL;
- plr->at_bop = 0;
- plr->at_eop = 0;
- plr->iodev = (PLiodev *) ckalloc( sizeof ( PLiodev ) );
+ plr = plFramePtr->plr;
+ plr->pdfs = NULL;
+ plr->at_bop = 0;
+ plr->at_eop = 0;
+ plr->iodev = (PLiodev *) ckalloc( sizeof ( PLiodev ) );
plr_start( plr );
// Set up stuff for rubber-band drawing
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/tk/tkMain.c 2013-12-09 14:39:59 UTC (rev 12832)
@@ -583,7 +583,7 @@
static void
Prompt( interploc, partial )
-Tcl_Interp * interploc; // Interpreter to use for prompting.
+Tcl_Interp * interploc; // Interpreter to use for prompting.
int partial; // Non-zero means there already
// exists a partial command, so use
// the secondary prompt.
Modified: trunk/bindings/tk-x-plat/plplotter.c
===================================================================
--- trunk/bindings/tk-x-plat/plplotter.c 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/bindings/tk-x-plat/plplotter.c 2013-12-09 14:39:59 UTC (rev 12832)
@@ -371,7 +371,7 @@
}
Tk_SetClass( tkwin, "Plframe" );
- plPlotterPtr = (PlPlotter *) malloc( sizeof ( PlPlotter ) );
+ plPlotterPtr = (PlPlotter *) malloc( sizeof ( PlPlotter ) );
// Initialize in the same order as the members of the struct just
// to keep track of what is initialized and what not.
@@ -382,32 +382,32 @@
Tcl_CreateCommand( interp, Tk_PathName( plPlotterPtr->tkwin ),
(Tcl_CmdProc *) PlPlotterWidgetCmd, (ClientData) plPlotterPtr,
(Tcl_CmdDeleteProc *) NULL );
- plPlotterPtr->border = NULL;
+ plPlotterPtr->border = NULL;
//plPlotterPtr->borderWidth = <uninitialized>;
//plPlotterPtr->relief = <uninitialized>;
- plPlotterPtr->width = Tk_Width( plPlotterPtr->tkwin );
- plPlotterPtr->height = Tk_Height( plPlotterPtr->tkwin );
- plPlotterPtr->cursor = None;
- plPlotterPtr->flags = 0;
- plPlotterPtr->tkwin_initted = 0;
+ plPlotterPtr->width = Tk_Width( plPlotterPtr->tkwin );
+ plPlotterPtr->height = Tk_Height( plPlotterPtr->tkwin );
+ plPlotterPtr->cursor = None;
+ plPlotterPtr->flags = 0;
+ plPlotterPtr->tkwin_initted = 0;
// Associate new PLplot stream with this widget
plmkstrm( &plPlotterPtr->ipls );
plgpls( &plPlotterPtr->pls );
- plPlotterPtr->ipls_save = 0;
- plPlotterPtr->plr = (PLRDev *) malloc( sizeof ( PLRDev ) );
- plPlotterPtr->plpr_cmd = NULL;
- plPlotterPtr->active_plot = 1;
- plPlotterPtr->isActive = 0;
- plPlotterPtr->pldis.x = 0;
- plPlotterPtr->pldis.y = 0;
- plPlotterPtr->pldis.width = 0;
- plPlotterPtr->pldis.height = 0;
- plPlotterPtr->prevWidth = 0;
- plPlotterPtr->prevHeight = 0;
- plPlotterPtr->SaveFnam = NULL;
+ plPlotterPtr->ipls_save = 0;
+ plPlotterPtr->plr = (PLRDev *) malloc( sizeof ( PLRDev ) );
+ plPlotterPtr->plpr_cmd = NULL;
+ plPlotterPtr->active_plot = 1;
+ plPlotterPtr->isActive = 0;
+ plPlotterPtr->pldis.x = 0;
+ plPlotterPtr->pldis.y = 0;
+ plPlotterPtr->pldis.width = 0;
+ plPlotterPtr->pldis.height = 0;
+ plPlotterPtr->prevWidth = 0;
+ plPlotterPtr->prevHeight = 0;
+ plPlotterPtr->SaveFnam = NULL;
// plPlotterPtr->devDesc = <uninitialized, to be malloced?>;
// plPlotterPtr->devName = <uninitialized, to be malloced?>;
- plPlotterPtr->xorGC = NULL;
+ plPlotterPtr->xorGC = NULL;
// plPlotterPtr->pts = <uninitialized array>;
plPlotterPtr->continue_draw = 0;
plPlotterPtr->xhair_cursor = None;
@@ -423,10 +423,10 @@
plPlotterPtr->drawing_xhairs = 0;
// plPlotterPtr->xhair_x = <uninitialized array>;
// plPlotterPtr->xhair_y = <uninitialized array>;
- plPlotterPtr->rband = 0;
- plPlotterPtr->drawing_rband = 0;
+ plPlotterPtr->rband = 0;
+ plPlotterPtr->drawing_rband = 0;
// plPlotterPtr->rband_pt = <uninitialized array>;
- plPlotterPtr->double_buffer = 1;
+ plPlotterPtr->double_buffer = 1;
plr = plPlotterPtr->plr;
plr->pdfs = NULL;
Modified: trunk/drivers/ntk.c
===================================================================
--- trunk/drivers/ntk.c 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/drivers/ntk.c 2013-12-09 14:39:59 UTC (rev 12832)
@@ -125,7 +125,7 @@
int columnbreak;
ccanv++;
- columnbreak = (ccanv%30 == 0);
+ columnbreak = ( ccanv % 30 == 0 );
// create new canvas
sprintf( cmd, "set ccanv %d; canvas $plf.f2.c$ccanv -width $xmax -height $ymax -background #%02x%02x%02x -xscrollcommand \"$hs set\" -yscrollcommand \"$vs set\" -scrollregion \"0 0 $xmax $ymax\"", ccanv, pls->cmap0[0].r, pls->cmap0[0].g, pls->cmap0[0].b );
@@ -484,8 +484,8 @@
void
plD_esc_ntk( PLStream *pls, PLINT op, void *ptr )
{
- PLINT i, j;
- short *xa, *ya;
+ PLINT i, j;
+ short *xa, *ya;
//Pixmap bitmap;
static const unsigned char bit_pat[] = {
0x24, 0x01, 0x92, 0x00, 0x49, 0x00, 0x24, 0x00, 0x12, 0x00, 0x09, 0x00,
@@ -496,8 +496,8 @@
switch ( op )
{
case PLESC_DASH:
- xa = (short *) malloc( sizeof ( short ) * ( size_t ) pls->dev_npts );
- ya = (short *) malloc( sizeof ( short ) * ( size_t ) pls->dev_npts );
+ xa = (short *) malloc( sizeof ( short ) * (size_t) pls->dev_npts );
+ ya = (short *) malloc( sizeof ( short ) * (size_t) pls->dev_npts );
for ( i = 0; i < pls->dev_npts; i++ )
{
xa[i] = pls->dev_x[i];
Modified: trunk/drivers/tk.c
===================================================================
--- trunk/drivers/tk.c 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/drivers/tk.c 2013-12-09 14:39:59 UTC (rev 12832)
@@ -1518,9 +1518,9 @@
static void
link_init( PLStream *pls )
{
- TkDev *dev = (TkDev *) pls->dev;
- PLiodev *iodev = (PLiodev *) dev->iodev;
- size_t bufmax = (size_t) ( pls->bufmax * 1.2 );
+ TkDev *dev = (TkDev *) pls->dev;
+ PLiodev *iodev = (PLiodev *) dev->iodev;
+ size_t bufmax = (size_t) ( pls->bufmax * 1.2 );
const char *dirname = NULL;
dbug_enter( "link_init" );
Modified: trunk/examples/c/x01c.c
===================================================================
--- trunk/examples/c/x01c.c 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/examples/c/x01c.c 2013-12-09 14:39:59 UTC (rev 12832)
@@ -274,9 +274,9 @@
if ( do_test && test_xor )
{
#ifdef PL_HAVE_NANOSLEEP
- PLINT st;
+ PLINT st;
struct timespec ts;
- ts.tv_sec = 0;
+ ts.tv_sec = 0;
ts.tv_nsec = 50000000;
plxormod( 1, &st ); // enter xor mode
if ( st )
@@ -284,7 +284,7 @@
for ( i = 0; i < 60; i++ )
{
plpoin( 1, x + i, y + i, 9 ); // draw a point
- nanosleep( &ts, NULL ); // wait a little
+ nanosleep( &ts, NULL ); // wait a little
plflush(); // force an update of the tk driver
plpoin( 1, x + i, y + i, 9 ); // erase point
}
Modified: trunk/examples/c/x17c.c
===================================================================
--- trunk/examples/c/x17c.c 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/examples/c/x17c.c 2013-12-09 14:39:59 UTC (rev 12832)
@@ -30,11 +30,11 @@
int
main( int argc, const char *argv[] )
{
- PLINT id1, n, autoy, acc, nsteps = 1000;
- PLFLT y1, y2, y3, y4, ymin, ymax, xlab, ylab;
- PLFLT t, tmin, tmax, tjump, dt, noise;
- PLINT colbox, collab, colline[4], styline[4];
- const char *legline[4];
+ PLINT id1, n, autoy, acc, nsteps = 1000;
+ PLFLT y1, y2, y3, y4, ymin, ymax, xlab, ylab;
+ PLFLT t, tmin, tmax, tjump, dt, noise;
+ PLINT colbox, collab, colline[4], styline[4];
+ const char *legline[4];
#ifdef PL_HAVE_NANOSLEEP
struct timespec ts;
#endif
@@ -134,13 +134,13 @@
dt = 0.1;
#ifdef PL_HAVE_NANOSLEEP
- ts.tv_sec = 0;
+ ts.tv_sec = 0;
ts.tv_nsec = 10000000;
#endif
for ( n = 0; n < nsteps; n++ )
{
#ifdef PL_HAVE_NANOSLEEP
- nanosleep( &ts, NULL); // wait a little (10 ms) to simulate time elapsing
+ nanosleep( &ts, NULL ); // wait a little (10 ms) to simulate time elapsing
#else
# ifdef PL_HAVE_POLL
poll( 0, 0, 10 );
Modified: trunk/examples/c++/x01.cc
===================================================================
--- trunk/examples/c++/x01.cc 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/examples/c++/x01.cc 2013-12-09 14:39:59 UTC (rev 12832)
@@ -279,9 +279,9 @@
if ( do_test && test_xor )
{
#ifdef PL_HAVE_NANOLEEP
- bool st;
+ bool st;
struct timespec ts;
- ts.tv_sec = 0;
+ ts.tv_sec = 0;
ts.tv_nsec = 50000000;
pls->xormod( true, &st ); // enter xor mode
if ( st )
Modified: trunk/examples/c++/x17.cc
===================================================================
--- trunk/examples/c++/x17.cc 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/examples/c++/x17.cc 2013-12-09 14:39:59 UTC (rev 12832)
@@ -60,12 +60,12 @@
x17::x17( int argc, const char ** argv )
{
- PLINT id1, n, nsteps = 1000;
- bool autoy, acc;
- PLFLT y1, y2, y3, y4, ymin, ymax, xlab, ylab;
- PLFLT t, tmin, tmax, tjump, dt, noise;
- PLINT colbox, collab, colline[4], styline[4];
- const char *legline[4];
+ PLINT id1, n, nsteps = 1000;
+ bool autoy, acc;
+ PLFLT y1, y2, y3, y4, ymin, ymax, xlab, ylab;
+ PLFLT t, tmin, tmax, tjump, dt, noise;
+ PLINT colbox, collab, colline[4], styline[4];
+ const char *legline[4];
#ifdef PL_HAVE_NANOSLEEP
struct timespec ts;
#endif
@@ -156,7 +156,7 @@
dt = 0.1;
#ifdef PL_HAVE_NANOSLEEP
- ts.tv_sec = 0;
+ ts.tv_sec = 0;
ts.tv_nsec = 10000000;
#endif
for ( n = 0; n < nsteps; n++ )
Modified: trunk/examples/c++/x22.cc
===================================================================
--- trunk/examples/c++/x22.cc 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/examples/c++/x22.cc 2013-12-09 14:39:59 UTC (rev 12832)
@@ -172,7 +172,7 @@
PLFLT dx, dy, x, y;
PLFLT xmin, xmax, ymin, ymax;
PLFLT Q, b;
-#define NC 11
+#define NC 11
int nc = NC;
PLFLT clev[NC];
Modified: trunk/examples/d/x22d.d
===================================================================
--- trunk/examples/d/x22d.d 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/examples/d/x22d.d 2013-12-09 14:39:59 UTC (rev 12832)
@@ -35,8 +35,8 @@
void
transform( PLFLT x, PLFLT y, PLFLT *xt, PLFLT *yt, PLPointer data )
{
- PLFLT *xmax = cast(PLFLT *) data;
-
+ PLFLT *xmax = cast(PLFLT *) data;
+
*xt = x;
*yt = y / 4.0 * ( 3 - cos( PI * x / *xmax ) );
}
@@ -113,7 +113,7 @@
{
const int nx = 20;
const int ny = 20;
- string title;
+ string title;
PLFLT dx = 1.0;
PLFLT dy = 1.0;
@@ -164,7 +164,7 @@
}
plenv( xmin, xmax, ymin, ymax, 0, 0 );
- title = format("#frPLplot Example 22 - constriction (arrow style %d)", astyle);
+ title = format( "#frPLplot Example 22 - constriction (arrow style %d)", astyle );
pllab( "(x)", "(y)", title );
plcol0( 2 );
plvect( u, v, -1.0, cgrid2 );
@@ -173,15 +173,15 @@
//
- // Vector plot of flow through a constricted pipe
+ // Vector plot of flow through a constricted pipe
// with a coordinate transform
//
void
constriction2()
{
- const int nx = 20;
- const int ny = 20;
- const int nc = 11;
+ const int nx = 20;
+ const int ny = 20;
+ const int nc = 11;
const int nseg = 20;
PLFLT [] clev = new PLFLT[nc];
@@ -196,7 +196,7 @@
plstransform( &transform, cast(PLPointer) &xmax );
- PLcGrid2 cgrid2;
+ PLcGrid2 cgrid2;
cgrid2.xg = new PLFLT[][nx];
for ( int i = 0; i < nx; i++ )
cgrid2.xg[i] = new PLFLT[ny];
@@ -221,7 +221,7 @@
y = ( j - ny / 2 + 0.5 ) * dy;
cgrid2.xg[i][j] = x;
cgrid2.yg[i][j] = y;
- b = ymax / 4.0 * ( 3 - cos( PI * x / xmax ) );
+ b = ymax / 4.0 * ( 3 - cos( PI * x / xmax ) );
u[i][j] = Q * ymax / b;
v[i][j] = 0.0;
}
@@ -235,7 +235,7 @@
plenv( xmin, xmax, ymin, ymax, 0, 0 );
pllab( "(x)", "(y)", "#frPLplot Example 22 - constriction with plstransform" );
plcol0( 2 );
- plshades( u, null, xmin + dx / 2, xmax - dx / 2,
+ plshades( u, null, xmin + dx / 2, xmax - dx / 2,
ymin + dy / 2, ymax - dy / 2,
clev, 0.0, 1, 1.0, 0 );
plvect( u, v, -1.0, cgrid2 );
@@ -245,7 +245,6 @@
plcol0( 1 );
plstransform( null, null );
-
}
//--------------------------------------------------------------------------
@@ -417,7 +416,7 @@
myPlot.constriction2();
- plsvect( null, null, 0);
+ plsvect( null, null, 0 );
myPlot.potential();
Modified: trunk/examples/java/x22.java
===================================================================
--- trunk/examples/java/x22.java 2013-12-09 14:35:42 UTC (rev 12831)
+++ trunk/examples/java/x22.java 2013-12-09 14:39:59 UTC (rev 12832)
@@ -149,10 +149,10 @@
//
void constriction2( )
{
- int i, j;
- double dx, dy, x, y;
- double xmin, xmax, ymin, ymax;
- double Q, b, dbdx;
+ int i, j;
+ double dx, dy, x, y;
+ double xmin, xmax, ymin, ymax;
+ double Q, b, dbdx;
double[] clev = new double[nc];
Transform transform = new Transform();
@@ -172,12 +172,12 @@
x = ( i - nx / 2 + 0.5 ) * dx;
for ( j = 0; j < ny; j++ )
{
- y = ( j - ny / 2 + 0.5 ) * dy;
+ y = ( j - ny / 2 + 0.5 ) * dy;
xg[i][j] = x;
yg[i][j] = y;
- b = ymax / 4.0 * ( 3 - Math.cos( Math.PI * x / xmax ) );
- u[i][j] = Q * ymax / b;
- v[i][j] = 0.0;
+ b = ymax / 4.0 * ( 3 - Math.cos( Math.PI * x / xmax ) );
+ u[i][j] = Q * ymax / b;
+ v[i][j] = 0.0;
}
}
@@ -189,7 +189,7 @@
pls.env( xmin, xmax, ymin, ymax, 0, 0 );
pls.lab( "(x)", "(y)", "#frPLplot Example 22 - constriction with plstransform" );
pls.col0( 2 );
- pls.shades( u, xmin + dx / 2, xmax - dx / 2,
+ pls.shades( u, xmin + dx / 2, xmax - dx / 2,
ymin + dy / 2, ymax - dy / 2,
clev, 0, 1, 1.0, 0, xg, yg );
pls.vect( u, v, -1.0, xg, yg );
@@ -199,7 +199,7 @@
pls.col0( 1 );
pls.stransform( null, null );
-}
+ }
// Vector plot of the gradient of a shielded potential (see example 9)
void potential()
@@ -338,9 +338,9 @@
pls.init();
- nx = 20;
- ny = 20;
- nc = 11;
+ nx = 20;
+ ny = 20;
+ nc = 11;
nseg = 20;
// Allocate arrays
@@ -366,7 +366,7 @@
constriction2();
- pls.svect(null,null,false);
+ pls.svect( null, null, false );
potential();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-12-09 14:35:47
|
Revision: 12831
http://sourceforge.net/p/plplot/code/12831
Author: andrewross
Date: 2013-12-09 14:35:42 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Fix up const arguments to pl_create_tempfifo. Fixes compiler warning.
Modified Paths:
--------------
trunk/drivers/tk.c
trunk/include/plplotP.h
trunk/src/plstdio.c
Modified: trunk/drivers/tk.c
===================================================================
--- trunk/drivers/tk.c 2013-12-09 14:12:01 UTC (rev 12830)
+++ trunk/drivers/tk.c 2013-12-09 14:35:42 UTC (rev 12831)
@@ -1521,7 +1521,7 @@
TkDev *dev = (TkDev *) pls->dev;
PLiodev *iodev = (PLiodev *) dev->iodev;
size_t bufmax = (size_t) ( pls->bufmax * 1.2 );
- char *dirname = NULL;
+ const char *dirname = NULL;
dbug_enter( "link_init" );
@@ -1532,7 +1532,7 @@
// This uses the pl_create_tempfifo function to create
// the fifo in a safe manner by first creating a private
// temporary directory.
- iodev->fileName = pl_create_tempfifo( (char **) &iodev->fileName, &dirname );
+ iodev->fileName = pl_create_tempfifo( (const char **) &iodev->fileName, &dirname );
if ( dirname == NULL || iodev->fileName == NULL )
abort_session( pls, "mkfifo error" );
Modified: trunk/include/plplotP.h
===================================================================
--- trunk/include/plplotP.h 2013-12-09 14:12:01 UTC (rev 12830)
+++ trunk/include/plplotP.h 2013-12-09 14:35:42 UTC (rev 12831)
@@ -1229,7 +1229,7 @@
// Create a temporary fifo securely
PLDLLIMPEXP char *
-pl_create_tempfifo( char **p_fifoname, char **p_dirname );
+pl_create_tempfifo( const char **p_fifoname, const char **p_dirname );
#ifdef __cplusplus
}
Modified: trunk/src/plstdio.c
===================================================================
--- trunk/src/plstdio.c 2013-12-09 14:12:01 UTC (rev 12830)
+++ trunk/src/plstdio.c 2013-12-09 14:35:42 UTC (rev 12831)
@@ -271,7 +271,7 @@
// The function returns the file name of the fifo.
//
char *
-pl_create_tempfifo( char **p_fifoname, char **p_dirname )
+pl_create_tempfifo( const char **p_fifoname, const char **p_dirname )
{
#if !defined PL_HAVE_MKDTEMP || !defined PL_HAVE_MKFIFO
plwarn( "Creating fifos not supported on this platform" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-12-09 14:12:05
|
Revision: 12830
http://sourceforge.net/p/plplot/code/12830
Author: andrewross
Date: 2013-12-09 14:12:01 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Remove const qualified from strings since they are not strictly const (we allocate / deallocate them).
Modified Paths:
--------------
trunk/include/disptab.h
Modified: trunk/include/disptab.h
===================================================================
--- trunk/include/disptab.h 2013-12-09 13:51:15 UTC (rev 12829)
+++ trunk/include/disptab.h 2013-12-09 14:12:01 UTC (rev 12830)
@@ -77,8 +77,8 @@
typedef struct
{
- const char *pl_MenuStr;
- const char *pl_DevName;
+ char *pl_MenuStr;
+ char *pl_DevName;
int pl_type;
int pl_seq;
plD_init_fp pl_init;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-09 13:51:20
|
Revision: 12829
http://sourceforge.net/p/plplot/code/12829
Author: airwin
Date: 2013-12-09 13:51:15 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Make sure MSYS_PLATFORM is off for Cygwin in all cases.
Modified Paths:
--------------
trunk/cmake/epa_build/CMakeLists.txt
Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt 2013-12-09 13:41:35 UTC (rev 12828)
+++ trunk/cmake/epa_build/CMakeLists.txt 2013-12-09 13:51:15 UTC (rev 12829)
@@ -51,11 +51,13 @@
find_program(MINGW_GET_EXECUTABLE mingw-get)
find_program(BASH_EXECUTABLE bash)
-if(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE)
+
+if(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE AND NOT CYGWIN)
set(MSYS_PLATFORM ON)
-else(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE)
+else(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE AND NOT CYGWIN)
set(MSYS_PLATFORM OFF)
-endif(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE)
+endif(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE AND NOT CYGWIN)
+
message(STATUS "WIN32 = ${WIN32}")
message(STATUS "MINGW = ${MINGW}")
message(STATUS "MSYS = ${MSYS}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-12-09 13:41:38
|
Revision: 12828
http://sourceforge.net/p/plplot/code/12828
Author: andrewross
Date: 2013-12-09 13:41:35 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Replace calls to usleep in the C / C++ examples with nanosleep. usleep has been deprecated and removed from the newer POSIX specs in favour of nanosleep.
Modified Paths:
--------------
trunk/cmake/modules/plplot.cmake
trunk/examples/c/x01c.c
trunk/examples/c/x17c.c
trunk/examples/c++/x01.cc
trunk/examples/c++/x17.cc
trunk/include/plConfig.h.in
Modified: trunk/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake 2013-12-09 13:20:01 UTC (rev 12827)
+++ trunk/cmake/modules/plplot.cmake 2013-12-09 13:41:35 UTC (rev 12828)
@@ -252,6 +252,7 @@
include(CheckFunctionExists)
check_function_exists(popen HAVE_POPEN)
check_function_exists(usleep PL_HAVE_USLEEP)
+check_function_exists(nanosleep PL_HAVE_NANOSLEEP)
check_function_exists(mkstemp PL_HAVE_MKSTEMP)
check_function_exists(mkdtemp PL_HAVE_MKDTEMP)
check_function_exists(mkfifo PL_HAVE_MKFIFO)
Modified: trunk/examples/c/x01c.c
===================================================================
--- trunk/examples/c/x01c.c 2013-12-09 13:20:01 UTC (rev 12827)
+++ trunk/examples/c/x01c.c 2013-12-09 13:41:35 UTC (rev 12828)
@@ -24,6 +24,9 @@
#include "plcdemos.h"
#include "plevent.h"
+#ifdef PL_HAVE_NANOSLEEP
+#include <time.h>
+#endif
#ifdef PL_HAVE_UNISTD_H
# include <unistd.h>
#endif
@@ -270,15 +273,18 @@
if ( do_test && test_xor )
{
-#ifdef PL_HAVE_USLEEP
+#ifdef PL_HAVE_NANOSLEEP
PLINT st;
+ struct timespec ts;
+ ts.tv_sec = 0;
+ ts.tv_nsec = 50000000;
plxormod( 1, &st ); // enter xor mode
if ( st )
{
for ( i = 0; i < 60; i++ )
{
plpoin( 1, x + i, y + i, 9 ); // draw a point
- usleep( 50000 ); // wait a little
+ nanosleep( &ts, NULL ); // wait a little
plflush(); // force an update of the tk driver
plpoin( 1, x + i, y + i, 9 ); // erase point
}
@@ -286,7 +292,7 @@
}
#else
printf( "The -xor command line option can only be exercised if your "
- "system\nhas usleep(), which does not seem to happen.\n" );
+ "system\nhas nanosleep(), which does not seem to happen.\n" );
#endif
}
}
Modified: trunk/examples/c/x17c.c
===================================================================
--- trunk/examples/c/x17c.c 2013-12-09 13:20:01 UTC (rev 12827)
+++ trunk/examples/c/x17c.c 2013-12-09 13:41:35 UTC (rev 12828)
@@ -5,6 +5,9 @@
#include "plcdemos.h"
#include <stdlib.h>
+#ifdef PL_HAVE_NANOSLEEP
+# include <time.h>
+#endif
#ifdef PL_HAVE_UNISTD_H
# include <unistd.h>
#else
@@ -32,6 +35,9 @@
PLFLT t, tmin, tmax, tjump, dt, noise;
PLINT colbox, collab, colline[4], styline[4];
const char *legline[4];
+#ifdef PL_HAVE_NANOSLEEP
+ struct timespec ts;
+#endif
// plplot initialization
// Parse and process command line arguments
@@ -127,10 +133,14 @@
y1 = y2 = y3 = y4 = 0.0;
dt = 0.1;
+#ifdef PL_HAVE_NANOSLEEP
+ ts.tv_sec = 0;
+ ts.tv_nsec = 10000000;
+#endif
for ( n = 0; n < nsteps; n++ )
{
-#ifdef PL_HAVE_USLEEP
- usleep( 10000 ); // wait a little (10 ms) to simulate time elapsing
+#ifdef PL_HAVE_NANOSLEEP
+ nanosleep( &ts, NULL); // wait a little (10 ms) to simulate time elapsing
#else
# ifdef PL_HAVE_POLL
poll( 0, 0, 10 );
Modified: trunk/examples/c++/x01.cc
===================================================================
--- trunk/examples/c++/x01.cc 2013-12-09 13:20:01 UTC (rev 12827)
+++ trunk/examples/c++/x01.cc 2013-12-09 13:41:35 UTC (rev 12828)
@@ -31,6 +31,10 @@
#include "plevent.h"
#include <cctype>
+#ifdef PL_HAVE_NANOSLEEP
+#include <time.h>
+#endif
+
#ifdef PL_HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -274,22 +278,25 @@
if ( do_test && test_xor )
{
-#ifdef PL_HAVE_USLEEP
+#ifdef PL_HAVE_NANOLEEP
bool st;
+ struct timespec ts;
+ ts.tv_sec = 0;
+ ts.tv_nsec = 50000000;
pls->xormod( true, &st ); // enter xor mode
if ( st )
{
for ( i = 0; i < 60; i++ )
{
pls->poin( 1, x + i, y + i, 9 ); // draw a point
- usleep( 50000 ); // wait a little
+ nanosleep( &ts, NULL ); // wait a little
pls->flush(); // force an update of the tk driver
pls->poin( 1, x + i, y + i, 9 ); // erase point
}
pls->xormod( false, &st ); // leave xor mode
}
#else
- cout << "The -xor command line option can only be exercised if your system has usleep(), which does not seems to happen." << endl;
+ cout << "The -xor command line option can only be exercised if your system has nanosleep(), which does not seems to happen." << endl;
#endif
}
Modified: trunk/examples/c++/x17.cc
===================================================================
--- trunk/examples/c++/x17.cc 2013-12-09 13:20:01 UTC (rev 12827)
+++ trunk/examples/c++/x17.cc 2013-12-09 13:41:35 UTC (rev 12828)
@@ -27,6 +27,9 @@
//--------------------------------------------------------------------------
#include "plc++demos.h"
+#ifdef PL_HAVE_NANOSLEEP
+# include <time.h>
+#endif
#ifdef PL_HAVE_UNISTD_H
# include <unistd.h>
#else
@@ -63,6 +66,9 @@
PLFLT t, tmin, tmax, tjump, dt, noise;
PLINT colbox, collab, colline[4], styline[4];
const char *legline[4];
+#ifdef PL_HAVE_NANOSLEEP
+ struct timespec ts;
+#endif
// plplot initialization
@@ -149,10 +155,14 @@
y1 = y2 = y3 = y4 = 0.0;
dt = 0.1;
+#ifdef PL_HAVE_NANOSLEEP
+ ts.tv_sec = 0;
+ ts.tv_nsec = 10000000;
+#endif
for ( n = 0; n < nsteps; n++ )
{
-#ifdef PL_HAVE_USLEEP
- usleep( 10000 ); // wait a little (10 ms) to simulate time elapsing
+#ifdef PL_HAVE_NANOSLEEP
+ nanosleep( &ts, NULL ); // wait a little (10 ms) to simulate time elapsing
#else
# ifdef PL_HAVE_POLL
poll( 0, 0, 10 );
Modified: trunk/include/plConfig.h.in
===================================================================
--- trunk/include/plConfig.h.in 2013-12-09 13:20:01 UTC (rev 12827)
+++ trunk/include/plConfig.h.in 2013-12-09 13:41:35 UTC (rev 12828)
@@ -93,8 +93,8 @@
// Define to 1 if you have the <unistd.h> header file.
#cmakedefine PL_HAVE_UNISTD_H 1
-// Define if usleep is available
-#cmakedefine PL_HAVE_USLEEP
+// Define if nanosleep is available
+#cmakedefine PL_HAVE_NANOSLEEP
// Define if you want PLplot's float type to be double
#cmakedefine PL_DOUBLE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-12-09 13:20:07
|
Revision: 12827
http://sourceforge.net/p/plplot/code/12827
Author: andrewross
Date: 2013-12-09 13:20:01 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Fix up a load of compiler warnings (testing full build with the compiler standards / warnings flags suggested in README.release).
Modified Paths:
--------------
trunk/bindings/f95/scstubs.c
trunk/bindings/java/plplotjavac.i
trunk/bindings/lua/plplotluac.i
trunk/bindings/qt_gui/plqt.cpp
trunk/bindings/swig-support/plplotcapi.i
trunk/bindings/tk/tkMain.c
trunk/drivers/cairo.c
trunk/drivers/ntk.c
trunk/drivers/ps.c
trunk/examples/c/x22c.c
trunk/examples/c++/x22.cc
trunk/examples/f95/x22f.f90
trunk/src/plmap.c
trunk/src/plstdio.c
Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/bindings/f95/scstubs.c 2013-12-09 13:20:01 UTC (rev 12827)
@@ -169,6 +169,7 @@
void PLMTEX37( const char *side, PLFLT *disp, PLFLT *pos, PLFLT *just, const char *text );
void PLPARSEOPTS7( int *numargs, const char *iargs, PLINT *mode, PLINT *maxindex );
void PLPAT( PLINT *nlin, PLINT *inc, PLINT *del );
+void PLPATH( PLINT *n, PLFLT *x1, PLFLT *y1, PLFLT *x2, PLFLT *y2 );
void PLPOIN( PLINT *n, PLFLT *x, PLFLT *y, PLINT *code );
void PLPOIN3( PLINT *n, PLFLT *x, PLFLT *y, PLFLT *z, PLINT *code );
void PLPOLY3( PLINT *n, PLFLT *x, PLFLT *y, PLFLT *z, PLBOOL *draw, PLBOOL *ifcc );
Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/bindings/java/plplotjavac.i 2013-12-09 13:20:01 UTC (rev 12827)
@@ -56,7 +56,7 @@
%{
static JavaVM *cached_jvm = NULL;
- SWIGEXPORT JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *jvm, void *reserved )
+ SWIGEXPORT JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *jvm, void * PL_UNUSED( reserved ) )
{
cached_jvm = jvm;
return JNI_VERSION_1_2;
@@ -1424,10 +1424,12 @@
jobject labelClass = 0;
jobject labelClassRef = 0;
+ void label_java( PLINT axis, PLFLT value, char *string, PLINT len, PLPointer data );
+
// C label plotting callback function which calls the java
// label function in a PLCallbackLabel labelClassobelID
// bject.
- void label_java( PLINT axis, PLFLT value, char *string, PLINT len, PLPointer data )
+ void label_java( PLINT axis, PLFLT value, char *string, PLINT len, PLPointer PL_UNUSED( data ) )
{
jstring javaString;
const char *nativeString;
@@ -1478,7 +1480,7 @@
{
javaString = (jstring) ( *cbenv )->CallObjectMethod( cbenv, labelClass, labelID, jaxis, jvalue );
nativeString = ( *cbenv )->GetStringUTFChars( cbenv, javaString, 0 );
- strncpy( string, nativeString, len );
+ strncpy( string, nativeString, (size_t) len );
( *cbenv )->ReleaseStringUTFChars( cbenv, javaString, nativeString );
}
else
@@ -1524,6 +1526,8 @@
%{
jobject ctClass = 0;
jobject ctClassRef = 0;
+
+ void ct_java( PLFLT x, PLFLT y, PLFLT *xt, PLFLT *yt, PLPointer data );
// C coordinate transform callback function which calls the java
// coordinate transform function in a PLCallbackCoordTrans object.
Modified: trunk/bindings/lua/plplotluac.i
===================================================================
--- trunk/bindings/lua/plplotluac.i 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/bindings/lua/plplotluac.i 2013-12-09 13:20:01 UTC (rev 12827)
@@ -334,6 +334,7 @@
{
LUA_FREE_ARRAY( $1 );
}
+%typemap( default ) ( const PLFLT * ArrayCkNull, PLINT n ) { $1 = NULL; $2 = 0; }
// no count, but check consistency with previous
@@ -371,6 +372,7 @@
}
}
%typemap( freearg ) const PLFLT * ArrayCkNull { LUA_FREE_ARRAY( $1 ); }
+%typemap( default ) const PLFLT * ArrayCkNull { $1 = NULL; }
// No length but remember size to check others
@@ -407,7 +409,6 @@
LUA_FREE_ARRAY( $1 );
}
-%typemap( default ) const PLFLT * ArrayCkNull { $1 = NULL; }
// with trailing count
%typemap( in ) ( const PLFLT * Array, PLINT n )
@@ -510,6 +511,8 @@
%{
+ PLFLT** read_double_Matrix( lua_State* L, int index, int* nx, int *ny );
+
PLFLT** read_double_Matrix( lua_State* L, int index, int* nx, int *ny )
{
int i, j;
@@ -779,6 +782,8 @@
//--------------------------------------------------------------------------
%{
+ void mapform( PLINT n, PLFLT* x, PLFLT* y );
+
static lua_State* myL = NULL;
static char mapform_funcstr[255];
@@ -859,11 +864,16 @@
typedef PLFLT ( *f2eval_func )( PLINT, PLINT, PLPointer );
typedef void ( *label_func )( PLINT, PLFLT, char*, PLINT, PLPointer );
+// Function prototypes
+ void mypltr( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, void * pltr_data );
+ void myct( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, void * pltr_data );
+ void mylabel( PLINT axis, PLFLT value, char* label, PLINT length, PLPointer data );
+
static char mypltr_funcstr[255];
// This is the callback that gets handed to the C code.
// It, in turn, calls the Lua callback
- void mypltr( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, void *pltr_data )
+ void mypltr( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, void * PL_UNUSED( pltr_data ) )
{
*tx = 0;
*ty = 0;
@@ -907,7 +917,7 @@
// This is the callback that gets handed to the C code.
// It, in turn, calls the Lua callback
- void myct( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, void *pltr_data )
+ void myct( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, void * PL_UNUSED( pltr_data ) )
{
*tx = 0;
*ty = 0;
@@ -947,12 +957,10 @@
return;
}
- static char label_funcstr[255];
+ static char mylabel_funcstr[255];
- void mylabel( PLINT axis, PLFLT value, char* label, PLINT length, PLPointer data )
+ void mylabel( PLINT axis, PLFLT value, char* label, PLINT length, PLPointer PL_UNUSED( data ) )
{
- PLFLT *xtemp, *ytemp;
- int len, i;
// check Lua state
if ( myL == NULL )
@@ -962,19 +970,19 @@
}
// push functions and arguments
- lua_getglobal( myL, label_funcstr ); // function to be called
+ lua_getglobal( myL, mylabel_funcstr ); // function to be called
lua_pushnumber( myL, axis ); // push 1st argument
lua_pushnumber( myL, value ); // push 1st argument
// do the call (2 arguments, 1 result)
if ( lua_pcall( myL, 2, 1, 0 ) != 0 )
fprintf( stderr, "error running function `%s':%s",
- label_funcstr, lua_tostring( myL, -1 ) );
+ mylabel_funcstr, lua_tostring( myL, -1 ) );
// retrieve results
if ( !lua_isstring( myL, -1 ) )
{
- fprintf( stderr, "function `%s' must return a string as result", label_funcstr );
+ fprintf( stderr, "function `%s' must return a string as result", mylabel_funcstr );
return;
}
strncpy( label, lua_tostring( myL, -1 ), length );
@@ -1021,7 +1029,7 @@
%typemap( in ) label_func lf {
$1 = NULL;
- label_funcstr[0] = '\0';
+ mylabel_funcstr[0] = '\0';
if ( lua_isnil( L, $input ) )
{
@@ -1030,7 +1038,7 @@
else if ( lua_isstring( L, $input ) )
{
$1 = mylabel;
- strncpy( label_funcstr, lua_tostring( L, $input ), 255 );
+ strncpy( mylabel_funcstr, lua_tostring( L, $input ), 255 );
myL = L;
}
else
@@ -1415,7 +1423,9 @@
LUA_FREE_ARRAY( $2 );
}
+%typemap( default ) ( PLBOOL deffalse ) { $1 = 0; }
+
//--------------------------------------------------------------------------
// Renames
//--------------------------------------------------------------------------
Modified: trunk/bindings/qt_gui/plqt.cpp
===================================================================
--- trunk/bindings/qt_gui/plqt.cpp 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/bindings/qt_gui/plqt.cpp 2013-12-09 13:20:01 UTC (rev 12827)
@@ -1118,12 +1118,12 @@
mouseEvent( event );
}
-void QtPLWidget::mouseReleaseEvent( QMouseEvent * event )
+void QtPLWidget::mouseReleaseEvent( QMouseEvent * PL_UNUSED( event ) )
{
//mouseEvent( event );
}
-void QtPLWidget::mouseMoveEvent( QMouseEvent * event )
+void QtPLWidget::mouseMoveEvent( QMouseEvent * PL_UNUSED ( event ) )
{
//mouseEvent( event );
}
Modified: trunk/bindings/swig-support/plplotcapi.i
===================================================================
--- trunk/bindings/swig-support/plplotcapi.i 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/bindings/swig-support/plplotcapi.i 2013-12-09 13:20:01 UTC (rev 12827)
@@ -764,7 +764,7 @@
plstyl( PLINT n, const PLINT *Array, const PLINT *ArrayCk );
void
-plsvect( const PLFLT *ArrayNull, const PLFLT *ArrayCkNull, PLINT n, PLBOOL fill );
+plsvect( const PLFLT *ArrayNull, const PLFLT *ArrayCkNull, PLINT n, PLBOOL deffalse );
void
plsvpa( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax );
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/bindings/tk/tkMain.c 2013-12-09 13:20:01 UTC (rev 12827)
@@ -154,7 +154,7 @@
// Forward declarations for procedures defined later in this file:
//
-static void Prompt _ANSI_ARGS_( ( Tcl_Interp * interp, int partial ) );
+static void Prompt _ANSI_ARGS_( ( Tcl_Interp * interploc, int partial ) );
static void StdinProc _ANSI_ARGS_( ( ClientData clientData,
int mask ) );
@@ -582,8 +582,8 @@
//
static void
-Prompt( interp, partial )
-Tcl_Interp * interp; // Interpreter to use for prompting.
+Prompt( interploc, partial )
+Tcl_Interp * interploc; // Interpreter to use for prompting.
int partial; // Non-zero means there already
// exists a partial command, so use
// the secondary prompt.
@@ -591,7 +591,7 @@
const char *promptCmd;
int code;
- promptCmd = Tcl_GetVar( interp,
+ promptCmd = Tcl_GetVar( interploc,
partial ? "tcl_prompt2" : "tcl_prompt1", TCL_GLOBAL_ONLY );
if ( promptCmd == NULL )
{
@@ -603,12 +603,12 @@
}
else
{
- code = Tcl_Eval( interp, promptCmd );
+ code = Tcl_Eval( interploc, promptCmd );
if ( code != TCL_OK )
{
- Tcl_AddErrorInfo( interp,
+ Tcl_AddErrorInfo( interploc,
"\n (script that generates prompt)" );
- fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
+ fprintf( stderr, "%s\n", Tcl_GetStringResult( interploc ) );
goto defaultPrompt;
}
}
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/drivers/cairo.c 2013-12-09 13:20:01 UTC (rev 12827)
@@ -528,9 +528,9 @@
void plD_esc_cairo( PLStream *pls, PLINT op, void *ptr )
{
- PLCairo *aStream;
+ //PLCairo *aStream;
- aStream = (PLCairo *) pls->dev;
+ //aStream = (PLCairo *) pls->dev;
switch ( op )
{
Modified: trunk/drivers/ntk.c
===================================================================
--- trunk/drivers/ntk.c 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/drivers/ntk.c 2013-12-09 13:20:01 UTC (rev 12827)
@@ -101,19 +101,19 @@
static PLGraphicsIn gin;
static void
-tk_cmd( char *cmd )
+tk_cmd( const char *gcmd )
{
static char scmd[10000];
if ( local )
- Tcl_Eval( interp, cmd );
+ Tcl_Eval( interp, gcmd );
else
{
// the -async option makes it block, some times! but is *much* faster!
// and was working OK till now :(
// sprintf(scmd, "send -async %s {%s}", rem_interp, cmd);
//
- sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
+ sprintf( scmd, "send %s {%s}", rem_interp, gcmd ); // mess! make it more efficient
if ( Tcl_Eval( interp, scmd ) != TCL_OK )
fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
}
@@ -306,7 +306,7 @@
Tcl_Eval( interp, "tk scaling" ); // pixels per mm
ppm = (PLFLT) atof( Tcl_GetStringResult( interp ) ) / ( 25.4 / 72. );
plP_setpxl( ppm, ppm );
- plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
+ plP_setphy( xmin, (PLINT) ( xmax * scale ), ymin, (PLINT) ( ymax * scale ) );
tk_cmd( "update" );
}
@@ -344,7 +344,7 @@
}
void
-plD_polyline_ntk( PLStream *pls, short *xa, short *ya, PLINT npts )
+plD_polyline_ntk( PLStream * PL_UNUSED( pls ), short *xa, short *ya, PLINT npts )
{
PLINT i, j;
@@ -363,7 +363,7 @@
// an event loop has to be designed, getcursor() and waitforpage() are just experimental
static void
-waitforpage( PLStream *pls )
+waitforpage( PLStream * PL_UNUSED( pls ) )
{
int key = 0, st = 0;
// why can't I bind to the canvas? or even any frame?
@@ -426,7 +426,7 @@
}
static void
-getcursor( PLStream *pls, PLGraphicsIn *ptr )
+getcursor( PLStream * PL_UNUSED( pls ), PLGraphicsIn *ptr )
{
int st = 0;
@@ -462,9 +462,9 @@
tk_cmd( "set yloc" );
sscanf( Tcl_GetStringResult( interp ), "%d", &gin.pY );
tk_cmd( "set bloc" );
- sscanf( Tcl_GetStringResult( interp ), "%d", &gin.button );
+ sscanf( Tcl_GetStringResult( interp ), "%ud", &gin.button );
tk_cmd( "set sloc" );
- sscanf( Tcl_GetStringResult( interp ), "%d", &gin.state );
+ sscanf( Tcl_GetStringResult( interp ), "%ud", &gin.state );
gin.dX = (PLFLT) gin.pX / xmax;
gin.dY = 1. - (PLFLT) gin.pY / ymax;
@@ -486,8 +486,8 @@
{
PLINT i, j;
short *xa, *ya;
- Pixmap bitmap;
- static unsigned char bit_pat[] = {
+ //Pixmap bitmap;
+ static const unsigned char bit_pat[] = {
0x24, 0x01, 0x92, 0x00, 0x49, 0x00, 0x24, 0x00, 0x12, 0x00, 0x09, 0x00,
0x04, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff
@@ -496,8 +496,8 @@
switch ( op )
{
case PLESC_DASH:
- xa = (short *) malloc( sizeof ( short ) * pls->dev_npts );
- ya = (short *) malloc( sizeof ( short ) * pls->dev_npts );
+ xa = (short *) malloc( sizeof ( short ) * ( size_t ) pls->dev_npts );
+ ya = (short *) malloc( sizeof ( short ) * ( size_t ) pls->dev_npts );
for ( i = 0; i < pls->dev_npts; i++ )
{
xa[i] = pls->dev_x[i];
@@ -547,8 +547,8 @@
{
if ( pls->patt != 0 )
{
- Tk_DefineBitmap( interp, Tk_GetUid( "foo" ), bit_pat, 16, 16 );
- bitmap = Tk_GetBitmap( interp, mainw, Tk_GetUid( "patt" ) );
+ Tk_DefineBitmap( interp, Tk_GetUid( "foo" ), (const char *) bit_pat, 16, 16 );
+ //bitmap = Tk_GetBitmap( interp, mainw, Tk_GetUid( "patt" ) );
}
j = sprintf( cmd, "$plf.f2.c%d create polygon ", ccanv );
for ( i = 0; i < pls->dev_npts; i++ )
Modified: trunk/drivers/ps.c
===================================================================
--- trunk/drivers/ps.c 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/drivers/ps.c 2013-12-09 13:20:01 UTC (rev 12827)
@@ -594,9 +594,9 @@
switch ( op )
{
case PLSTATE_WIDTH: {
- int width =
+ int width = (int) (
( pls->width < MIN_WIDTH ) ? DEF_WIDTH :
- ( pls->width > MAX_WIDTH ) ? MAX_WIDTH : pls->width;
+ ( pls->width > MAX_WIDTH ) ? MAX_WIDTH : pls->width );
fprintf( OF, " S\n%d W", width );
Modified: trunk/examples/c/x22c.c
===================================================================
--- trunk/examples/c/x22c.c 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/examples/c/x22c.c 2013-12-09 13:20:01 UTC (rev 12827)
@@ -26,7 +26,9 @@
#include "plcdemos.h"
void circulation( void );
-void constriction( int );
+void constriction( int astyle );
+void transform( PLFLT x, PLFLT y, PLFLT *xt, PLFLT *yt, PLPointer data );
+void constriction2( void );
void potential( void );
void f2mnmx( PLFLT **f, PLINT nx, PLINT ny, PLFLT *fnmin, PLFLT *fnmax );
@@ -197,7 +199,7 @@
int i, j;
PLFLT dx, dy, x, y;
PLFLT xmin, xmax, ymin, ymax;
- PLFLT Q, b, dbdx;
+ PLFLT Q, b;
PLcGrid2 cgrid2;
PLFLT **u, **v;
const int nx = 20;
Modified: trunk/examples/c++/x22.cc
===================================================================
--- trunk/examples/c++/x22.cc 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/examples/c++/x22.cc 2013-12-09 13:20:01 UTC (rev 12827)
@@ -171,7 +171,7 @@
int i, j;
PLFLT dx, dy, x, y;
PLFLT xmin, xmax, ymin, ymax;
- PLFLT Q, b, dbdx;
+ PLFLT Q, b;
#define NC 11
int nc = NC;
PLFLT clev[NC];
Modified: trunk/examples/f95/x22f.f90
===================================================================
--- trunk/examples/f95/x22f.f90 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/examples/f95/x22f.f90 2013-12-09 13:20:01 UTC (rev 12827)
@@ -186,7 +186,7 @@
real(kind=plflt) dx, dy, xx, yy
real(kind=plflt) xmin, xmax, ymin, ymax
- real(kind=plflt) Q, b, dbdx, scaling
+ real(kind=plflt) Q, b, scaling
real(kind=plflt) u(nx, ny), v(nx, ny), xg(nx,ny), yg(nx,ny)
real(kind=plflt) clev(nc);
common /transform_data/ ymax
Modified: trunk/src/plmap.c
===================================================================
--- trunk/src/plmap.c 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/src/plmap.c 2013-12-09 13:20:01 UTC (rev 12827)
@@ -50,8 +50,10 @@
SHPHandle
OpenShapeFile( const char *fn );
+#ifdef HAVE_SAHOOKS
static void
CustomErrors( const char *message );
+#endif
#endif
@@ -473,6 +475,7 @@
//! found
//--------------------------------------------------------------------------
#ifdef HAVE_SHAPELIB
+#ifdef HAVE_SAHOOKS
// Our thanks to Frank Warmerdam, the developer of shapelib for suggesting
// this approach for quieting shapelib "Unable to open" error messages.
static
@@ -481,6 +484,7 @@
if ( strstr( message, "Unable to open" ) == NULL )
fprintf( stderr, "%s\n", message );
}
+#endif
SHPHandle
OpenShapeFile( const char *fn )
@@ -496,7 +500,7 @@
// Using ancient version of shapelib without SAHooks or SHPOpenLL.
// For this case live with the misleading "Unable to open" error
// messages.
- int sHooks;
+ // int sHooks;
#define SHPOpenLL( a, b, c ) SHPOpen( a, b )
#endif
Modified: trunk/src/plstdio.c
===================================================================
--- trunk/src/plstdio.c 2013-12-08 01:07:56 UTC (rev 12826)
+++ trunk/src/plstdio.c 2013-12-09 13:20:01 UTC (rev 12827)
@@ -277,13 +277,11 @@
plwarn( "Creating fifos not supported on this platform" );
return NULL;
#else
- FILE *fd;
const char *tmpdir;
char *template;
char *dirname;
const char *tmpname = "plplot_dir_XXXXXX";
const char *fifoname = "plplot_fifo";
- int flags;
#if defined ( MSDOS ) || defined ( WIN32 )
tmpdir = getenv( "TEMP" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hez...@us...> - 2013-12-08 01:07:58
|
Revision: 12826
http://sourceforge.net/p/plplot/code/12826
Author: hezekiahcarty
Date: 2013-12-08 01:07:56 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
Add plsvect_reset to OCaml; Update example 22 to match the updated C version
Modified Paths:
--------------
trunk/bindings/ocaml/plplot.mli
trunk/bindings/ocaml/plplot_core.idl
trunk/bindings/ocaml/plplot_impl.c
trunk/examples/ocaml/x22.ml
Modified: trunk/bindings/ocaml/plplot.mli
===================================================================
--- trunk/bindings/ocaml/plplot.mli 2013-12-07 19:37:42 UTC (rev 12825)
+++ trunk/bindings/ocaml/plplot.mli 2013-12-08 01:07:56 UTC (rev 12826)
@@ -1000,6 +1000,7 @@
= "camlidl_plplot_core_ml_plpoly3"
external pltr0 : float -> float -> float * float
= "camlidl_plplot_core_ml_pltr0"
+external plsvect_reset : unit -> unit = "camlidl_plplot_core_ml_plsvect_reset"
external plg_current_col0 : unit -> int
= "camlidl_plplot_core_plg_current_col0"
external plg_current_col1 : unit -> float
Modified: trunk/bindings/ocaml/plplot_core.idl
===================================================================
--- trunk/bindings/ocaml/plplot_core.idl 2013-12-07 19:37:42 UTC (rev 12825)
+++ trunk/bindings/ocaml/plplot_core.idl 2013-12-08 01:07:56 UTC (rev 12826)
@@ -197,8 +197,8 @@
[mlname(pltr0)] void ml_pltr0(
PLFLT x, PLFLT y, [out] PLFLT *tx, [out] PLFLT *ty);
-// XXX The following are non-standard functions which help retrieve some extra
-// information from PLplot.
+// XXX The following are non-standard functions
+[mlname(plsvect_reset)] void ml_plsvect_reset(void);
int plg_current_col0(void);
PLFLT plg_current_col1(void);
PLFLT plgwidth(void);
Modified: trunk/bindings/ocaml/plplot_impl.c
===================================================================
--- trunk/bindings/ocaml/plplot_impl.c 2013-12-07 19:37:42 UTC (rev 12825)
+++ trunk/bindings/ocaml/plplot_impl.c 2013-12-08 01:07:56 UTC (rev 12826)
@@ -498,6 +498,14 @@
}
//
+// Wrapper to reset vector rendering
+//
+void ml_plsvect_reset()
+{
+ c_plsvect( NULL, NULL, 0, 0 );
+}
+
+//
// void
// c_plmap( void (*mapform)(PLINT, PLFLT *, PLFLT *), const char *type,
// PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat );
Modified: trunk/examples/ocaml/x22.ml
===================================================================
--- trunk/examples/ocaml/x22.ml 2013-12-07 19:37:42 UTC (rev 12825)
+++ trunk/examples/ocaml/x22.ml 2013-12-08 01:07:56 UTC (rev 12826)
@@ -233,6 +233,58 @@
plline px py;
()
+let transform xmax x y =
+ x, y /. 4.0 *. (3.0 -. cos (pi *. x /. xmax))
+
+(* Vector plot of flow through a constricted pipe
+ with a coordinate transform *)
+let constriction2 () =
+ let nx, ny = 20, 20 in
+ let nc = 11 in
+ let nseg = 20 in
+ let dx, dy = 1.0, 1.0 in
+ let xmin = float ~-nx /. 2.0 *. dx in
+ let xmax = float nx /. 2.0 *. dx in
+ let ymin = float ~-ny /. 2.0 *. dy in
+ let ymax = float ny /. 2.0 *. dy in
+
+ plstransform (transform xmax);
+
+ let cgrid2_xg = Array.make_matrix nx ny 0.0 in
+ let cgrid2_yg = Array.make_matrix nx ny 0.0 in
+ let u = Array.make_matrix nx ny 0.0 in
+ let v = Array.make_matrix nx ny 0.0 in
+ let q = 2.0 in
+ for i = 0 to nx - 1 do
+ let x = (float i -. float nx /. 2.0 +. 0.5) *. dx in
+ for j = 0 to ny - 1 do
+ let y = (float j -. float ny /. 2.0 +. 0.5) *. dy in
+ cgrid2_xg.(i).(j) <- x;
+ cgrid2_yg.(i).(j) <- y;
+ let b = ymax /. 4.0 *. (3.0 -. cos (pi *. x /. xmax)) in
+ u.(i).(j) <- q *. ymax /. b;
+ v.(i).(j) <- 0.0
+ done
+ done;
+ let clev = Array.init nc (fun i -> q +. float i *. q /. float (nc - 1)) in
+
+ plenv xmin xmax ymin ymax 0 0;
+ pllab "(x)" "(y)" "#frPLplot Example 22 - constriction with plstransform";
+ plcol0 2;
+ plshades u
+ (xmin +. dx /. 2.0) (xmax -. dx /. 2.0)
+ (ymin +. dy /. 2.0) (ymax -. dy /. 2.0)
+ clev 0.0 1 1.0 false;
+ plset_pltr (pltr2 cgrid2_xg cgrid2_yg);
+ plvect u v ~-.1.0;
+ plunset_pltr ();
+ plpath nseg xmin ymax xmax ymax;
+ plpath nseg xmin ymin xmax ymin;
+ plcol0 1;
+
+ plunset_transform ();
+ ()
+
let () =
(* Parse and process command line arguments *)
plparseopts Sys.argv [PL_PARSE_FULL];
@@ -255,10 +307,11 @@
plsvect arrow2_x arrow2_y fill;
constriction ( 2 );
- (* Need to be able to pass NULL arguments to plsvect to reset arrow style to default
- Currently this doesn't work *)
- (* plsvect [||] [||] fill; *)
+ constriction2 ();
+ (* Reset arrow style to the default *)
+ plsvect_reset ();
+
potential ();
plend ();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-07 19:37:45
|
Revision: 12825
http://sourceforge.net/p/plplot/code/12825
Author: airwin
Date: 2013-12-07 19:37:42 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
Suppress warning messages concerning policies CMP0022 and CMP0023 that
are generated by CMake-2.8.12 and higher. This is a temporary measure
that is required until we bump the minimum version to 2.8.12.1 or
higher and fix the resulting build-system errors which will require
moving from the old LINK_INTERFACE_LIBRARIES method to the modern
INTERFACE_LINK_LIBRARIES method (implemented badly in 2.8.12 and
implemented correctly for the first time in 2.8.12.1).
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-12-07 06:54:18 UTC (rev 12824)
+++ trunk/CMakeLists.txt 2013-12-07 19:37:42 UTC (rev 12825)
@@ -32,6 +32,29 @@
cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
+# cmake-2.8.12.1 (2.8.12 screwed up the implementation) introduced a
+# corrected implementation of keyword signatures for
+# target_link_libraries which are preferred now over the traditional
+# plain signatures. There are a lot of implications concerning these
+# preferred keyword signatures which I don't understand at the moment,
+# but it is clear some modifications to our build system will be
+# required to start using keyword signatures appropriately. But it is
+# also clear we can do nothing about this until we can guarantee that
+# all our users are running 2.8.12.1 or higher. Therefore, until we
+# bump the actual minimum version to 2.8.12.1 in the above
+# cmake_minimum_required call and deal with all the errors in our
+# CMake code that will generate, quiet the warnings about this issue
+# by explicitly setting policies CMP0022 and CMP0023 (if they exist
+# for whatever CMake version the user is running) to OLD.
+if(POLICY CMP0022)
+ message(STATUS "Explicitly setting policy CMP0022 to OLD")
+ cmake_policy(SET CMP0022 OLD)
+endif(POLICY CMP0022)
+if(POLICY CMP0023)
+ message(STATUS "Explicitly setting policy CMP0023 to OLD")
+ cmake_policy(SET CMP0023 OLD)
+endif(POLICY CMP0023)
+
# It is a fatal error if no working C compiler is available to build
# the PLplot core C library and core C examples. All other compilers
# required by our bindings are optional in that if no working compiler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-12-07 06:54:23
|
Revision: 12824
http://sourceforge.net/p/plplot/code/12824
Author: arjenmarkus
Date: 2013-12-07 06:54:18 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
Replace the optional "rectangular" argument to plshades by an overloaded function so that it can be placed in the same position as in the corresponding C function.
Modified Paths:
--------------
trunk/bindings/f95/plplotf95.def
trunk/bindings/f95/plplotf95_ifort.def
trunk/bindings/f95/plplotf95_mingw.def
trunk/bindings/f95/sfstubs.f90
trunk/bindings/f95/sfstubsf95.f90
Modified: trunk/bindings/f95/plplotf95.def
===================================================================
--- trunk/bindings/f95/plplotf95.def 2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/plplotf95.def 2013-12-07 06:54:18 UTC (rev 12824)
@@ -31,6 +31,7 @@
_PLPLOTP_mp_PLSHADE_SINGLE_TR@68
_PLPLOTP_mp_PLSHADES_MULTIPLE_0@44
_PLPLOTP_mp_PLSHADES_MULTIPLE_1@52
+ _PLPLOTP_mp_PLSHADES_MULTIPLE_1R@56
_PLPLOTP_mp_PLSHADES_MULTIPLE_2@52
_PLPLOTP_mp_PLSHADES_MULTIPLE_TR@48
_PLPLOTP_mp_PLSPAL0@8
Modified: trunk/bindings/f95/plplotf95_ifort.def
===================================================================
--- trunk/bindings/f95/plplotf95_ifort.def 2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/plplotf95_ifort.def 2013-12-07 06:54:18 UTC (rev 12824)
@@ -31,6 +31,7 @@
PLPLOTP_mp_PLSHADE_SINGLE_TR
PLPLOTP_mp_PLSHADES_MULTIPLE_0
PLPLOTP_mp_PLSHADES_MULTIPLE_1
+ PLPLOTP_mp_PLSHADES_MULTIPLE_1R
PLPLOTP_mp_PLSHADES_MULTIPLE_2
PLPLOTP_mp_PLSHADES_MULTIPLE_TR
PLPLOTP_mp_PLSPAL0
Modified: trunk/bindings/f95/plplotf95_mingw.def
===================================================================
--- trunk/bindings/f95/plplotf95_mingw.def 2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/plplotf95_mingw.def 2013-12-07 06:54:18 UTC (rev 12824)
@@ -38,6 +38,7 @@
__plplotp_MOD_plshade_single_tr
__plplotp_MOD_plshades_multiple_0
__plplotp_MOD_plshades_multiple_1
+ __plplotp_MOD_plshades_multiple_1r
__plplotp_MOD_plshades_multiple_2
__plplotp_MOD_plshades_multiple_tr
__plplotp_MOD_plspal0
Modified: trunk/bindings/f95/sfstubs.f90
===================================================================
--- trunk/bindings/f95/sfstubs.f90 2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/sfstubs.f90 2013-12-07 06:54:18 UTC (rev 12824)
@@ -534,12 +534,11 @@
subroutine plshades_multiple_1(z, defined, &
xmin, xmax, ymin, ymax, &
clevel, fill_width, &
- cont_color, cont_width, xg1, yg1, rectangular)
+ cont_color, cont_width, xg1, yg1)
implicit none
character defined*(*)
integer cont_color
- logical, optional :: rectangular
real(kind=plflt) fill_width, cont_width
real(kind=plflt) clevel(:)
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
@@ -550,9 +549,6 @@
! call plstrf2c(dnam, string1)
rect = 1
- if ( present(rectangular) ) then
- rect = merge( 1, 0, rectangular )
- endif
s1 = transfer( string1, s1 )
call plshades17(z, size(z,1), size(z,2), s1, &
@@ -564,6 +560,36 @@
!***********************************************************************
+ subroutine plshades_multiple_1r(z, defined, &
+ xmin, xmax, ymin, ymax, &
+ clevel, fill_width, &
+ cont_color, cont_width, rectangular, xg1, yg1)
+
+ implicit none
+ character defined*(*)
+ integer cont_color
+ logical rectangular
+ real(kind=plflt) fill_width, cont_width
+ real(kind=plflt) clevel(:)
+ real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
+ xg1(:), yg1(:)
+
+ integer rect
+
+! call plstrf2c(dnam, string1)
+
+ rect = merge( 1, 0, rectangular )
+
+ s1 = transfer( string1, s1 )
+ call plshades17(z, size(z,1), size(z,2), s1, &
+ xmin, xmax, ymin, ymax, &
+ clevel, size(clevel), fill_width, &
+ cont_color, cont_width, xg1, yg1, size(z,1), rect)
+
+ end subroutine
+
+!***********************************************************************
+
subroutine plshades_multiple_2(z, defined, &
xmin, xmax, ymin, ymax, &
clevel, fill_width, &
Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90 2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/sfstubsf95.f90 2013-12-07 06:54:18 UTC (rev 12824)
@@ -110,6 +110,7 @@
interface plshades
module procedure plshades_multiple_0
module procedure plshades_multiple_1
+ module procedure plshades_multiple_1r
module procedure plshades_multiple_2
module procedure plshades_multiple_tr
end interface
@@ -898,7 +899,7 @@
interface plsvect
module procedure plsvect1
-
+
subroutine plsvect2
end subroutine plsvect2
@@ -1089,7 +1090,7 @@
cont_color, cont_width, &
n_labels, label_opts, n_axes, ticks, sub_ticks, &
n_values, values)
- end subroutine plcolorbar_2
+ end subroutine plcolorbar_2
subroutine plcpstrm( iplsr, flags )
integer :: iplsr
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-07 02:15:10
|
Revision: 12823
http://sourceforge.net/p/plplot/code/12823
Author: airwin
Date: 2013-12-07 02:15:07 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
Initial commit of "ToDo" list for epa_build.
Added Paths:
-----------
trunk/cmake/epa_build/ToDo
Added: trunk/cmake/epa_build/ToDo
===================================================================
--- trunk/cmake/epa_build/ToDo (rev 0)
+++ trunk/cmake/epa_build/ToDo 2013-12-07 02:15:07 UTC (rev 12823)
@@ -0,0 +1,80 @@
+Here is the current (2013-12-06) epa_build ToDo list.
+
+* Add a build configuration for Qt4_lite. As far as I can tell
+ (despite all the excitement over the years concerning the
+ CMake-based build system for KDE) the build system for Qt4 is an
+ autotools-based one, see
+ <http://www.linuxfromscratch.org/blfs/view/svn/x/qt4.html>. Note
+ the prerequisities mentioned on that blfs page are Linux
+ prerequisites. So I attempted to find out more about Windows
+ platform requirements by running the configure script from
+ MinGW/MSYS/Wine with the --help option. That bombed out (saying
+ something about the platform not being ready) so I tried specifying
+ the platform before asking for help using these configure options:
+ -platform win32-g++ --help. That worked, and showed, for example,
+ all the X11 options had disappeared. I determined that platform
+ string following the directions in
+ <http://stackoverflow.com/questions/5211188/what-are-the-different-platforms-for-qts-configure>)
+ which said to use the same name as one of the subdirectories in the
+ mkspecs subdirectory of the top-level of the Qt source tarball.
+ From that method, another alternative platform string was
+ win32-g++-4.6, and looking at that subdirectory in more detail, it
+ obviously is an (extremely minor) update to win32-g++ so from now on
+ I intend to use the later platform string, i.e., -platform
+ win32-g++-4.6 because my MinGW version is 4.7.2 and not something
+ earlier than 4.6.
+
+ My guess is the Windows version of Qt4 is essentially a standalone
+ version with no outside dependencies. In contrast from the BLFS
+ remarks, the Linux version has lots of dependencies, and if you
+ follow those up you would have to create and test epa_build
+ configurations for many additional software packages including some
+ difficult-to-get-right security packages such as openssl and the
+ security certificates. So the strategy I intend to use is specify
+ no dependencies for Qt4 (which will mean the Linux epa_build of Qt4
+ will depend on some pre-existing system libraries which is OK, and
+ it should likely not be an issue for the Windows epa_build of Qt4 if
+ that is truly standalone). Furthermore, I will attempt to make the
+ Qt4 build as quick and "lite" as possible by dropping as much as
+ possible from the configuration that does not interfere with PLplot
+ use, and for components that are used by PLplot such as jpeg, use
+ the in-house Qt4 version of that library rather than the system
+ library (which again reduces or avoids dependencies for the Windows
+ case).
+
+ Later on, of course, if somebody was interested they could configure
+ a more complete and powerful form of epa_build configuration of Qt4
+ that was suitable, for example, to support even an epa_build
+ configuration for KDE. But for now I am going to concentrate on
+ Qt4_lite.
+
+* Test whether the current build_plplot_lite works for the current
+ wine (1.6-rc4) that I have built. This has worked in the past
+ so I expect only minor issues to show up for this case.
+
+* Attempt to add a Tcl8.6 and friends buildtools for the Wine case.
+ If this works, then try build_plplot_lite on Wine again. Our normal
+ Tcl test targets such as test_pltcl_standard_examples and
+ test_tclsh_standard_examples, should work, and there is also a good
+ chance that test_c_ntk will work also since -dev ntk only depends on
+ Tk and not X. Of course, our other Tk test targets (test_c_tk,
+ test_plserver_standard_examples, test_wish_standard_examples,
+ test_plserver_runAllDemos, and test_wish_runAllDemos) will not work
+ on this platform because all the PLplot Tk functionality exercised
+ by those tests ultimately depends on -dev xwin and X.
+
+* Update to the latest Wine and verify that build_plplot_lite continues
+ to work in that case.
+
+* libcurl build configuration following the specific libcurl
+ information (and all its dependencies) in Linux from Scratch
+ <http://www.linuxfromscratch.org/blfs/view/svn/basicnet/curl.html>.
+ A build configuration success with libcurl would free epa_build
+ users of the need to rely on binary versions of CMake which is a
+ worthwhile goal although an extremely low priority compared to Qt4_lite
+ since ABI incompatibility is not an issue with binary
+ downloads of CMake (since that is just an application) while they
+ are an issue with binary downloads of the Qt4 set of libraries.
+ In fact, I may never bother to configure libcurl since it has a lot
+ of dependencies and some of those (like openssl and security certificates)
+ seem difficult to get right.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-12-06 13:38:22
|
Revision: 12822
http://sourceforge.net/p/plplot/code/12822
Author: andrewross
Date: 2013-12-06 13:38:20 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Partial update to the ada versions of example 22. Still needs more work (and some changes to the ocaml bindings).
Modified Paths:
--------------
trunk/examples/ada/x22a.adb
trunk/examples/ada/xthick22a.adb
Modified: trunk/examples/ada/x22a.adb
===================================================================
--- trunk/examples/ada/x22a.adb 2013-12-06 07:22:11 UTC (rev 12821)
+++ trunk/examples/ada/x22a.adb 2013-12-06 13:38:20 UTC (rev 12822)
@@ -84,7 +84,7 @@
--Vector plot of flow through a constricted pipe
- procedure constriction is
+ procedure constriction(astyle : Integer) is
dx, dy, x, y : Long_Float;
xmin, xmax, ymin, ymax : Long_Float;
Q, b, dbdx : Long_Float;
@@ -112,7 +112,7 @@
cgrid2.yg(i, j) := y;
b := ymax / 4.0 * (3.0 - cos(pi * x / xmax));
if abs(y) < b then
- dbdx := ymax / 4.0 * sin(pi * x / xmax) * y / b;
+ dbdx := ymax / 4.0 * sin(pi * x / xmax) * pi / xmax * y / b;
u(i, j) := Q * ymax / b;
v(i, j) := dbdx * u(i, j);
else
@@ -123,9 +123,9 @@
end loop;
plenv(xmin, xmax, ymin, ymax, 0, 0);
- pllab("(x)", "(y)", "#frPLplot Example 22 - constriction");
+ pllab("(x)", "(y)", "#frPLplot Example 22 - constriction (arrow style"&Integer'image(astyle)&")");
plcol0(2);
- plvect(u, v, -0.5, pltr2'access, cgrid2'Address);
+ plvect(u, v, -1.0, pltr2'access, cgrid2'Address);
plcol0(1);
end constriction;
@@ -249,11 +249,11 @@
-- Set arrow style using arrow_x and arrow_y then plot using these arrows.
plsvect(arrow_x, arrow_y, False);
- constriction;
+ constriction(1);
-- Set arrow style using arrow2_x and arrow2_y then plot using these filled arrows.
plsvect(arrow2_x, arrow2_y, True);
- constriction;
+ constriction(2);
potential;
Modified: trunk/examples/ada/xthick22a.adb
===================================================================
--- trunk/examples/ada/xthick22a.adb 2013-12-06 07:22:11 UTC (rev 12821)
+++ trunk/examples/ada/xthick22a.adb 2013-12-06 13:38:20 UTC (rev 12822)
@@ -84,7 +84,7 @@
--Vector plot of flow through a constricted pipe
- procedure constriction is
+ procedure constriction(astyle : Integer) is
dx, dy, x, y : Long_Float;
xmin, xmax, ymin, ymax : Long_Float;
Q, b, dbdx : Long_Float;
@@ -112,7 +112,7 @@
cgrid2.yg(i, j) := y;
b := ymax / 4.0 * (3.0 - cos(pi * x / xmax));
if abs(y) < b then
- dbdx := ymax / 4.0 * sin(pi * x / xmax) * y / b;
+ dbdx := ymax / 4.0 * sin(pi * x / xmax) * pi / xmax * y / b;
u(i, j) := Q * ymax / b;
v(i, j) := dbdx * u(i, j);
else
@@ -123,9 +123,9 @@
end loop;
Set_Environment(xmin, xmax, ymin, ymax, Not_Justified, Linear_Box_Plus);
- Write_Labels("(x)", "(y)", "#frPLplot Example 22 - constriction");
+ Write_Labels("(x)", "(y)", "#frPLplot Example 22 - constriction (arrow style"&Integer'image(astyle)&")");
Set_Pen_Color(Yellow);
- Vector_Plot(u, v, -0.5, Plot_Transformation_2'access, cgrid2'Address);
+ Vector_Plot(u, v, -1.0, Plot_Transformation_2'access, cgrid2'Address);
Set_Pen_Color(Red);
end constriction;
@@ -249,11 +249,11 @@
-- Set arrow style using arrow_x and arrow_y then plot using these arrows.
Set_Arrow_Style_For_Vector_Plots(arrow_x, arrow_y, False);
- constriction;
+ constriction(1);
-- Set arrow style using arrow2_x and arrow2_y then plot using these filled arrows.
Set_Arrow_Style_For_Vector_Plots(arrow2_x, arrow2_y, True);
- constriction;
+ constriction(2);
potential;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-12-06 07:22:13
|
Revision: 12821
http://sourceforge.net/p/plplot/code/12821
Author: arjenmarkus
Date: 2013-12-06 07:22:11 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Add the "rectangular" optional argument to plshades. With this change example x22f gives exactly the same results as x22c.
Modified Paths:
--------------
trunk/examples/f95/x22f.f90
Modified: trunk/examples/f95/x22f.f90
===================================================================
--- trunk/examples/f95/x22f.f90 2013-12-06 07:20:46 UTC (rev 12820)
+++ trunk/examples/f95/x22f.f90 2013-12-06 07:22:11 UTC (rev 12821)
@@ -48,7 +48,7 @@
! Set arrow style using arrow_x and arrow_y the
! plot using these arrows
call plsvect(arrow_x, arrow_y, fill)
- call constriction( 1 )
+ call constriction( 1 )
! Set arrow style using arrow_x and arrow_y the
! plot using these arrows
@@ -180,7 +180,7 @@
subroutine constriction2()
use plplot, PI => PL_PI
implicit none
-
+
integer i, j, nx, ny, nc, nseg
parameter (nx=20, ny=20, nc=11, nseg=20)
@@ -191,7 +191,7 @@
real(kind=plflt) clev(nc);
common /transform_data/ ymax
character(len=1) defined
-
+
external transform
dx = 1.0_plflt
@@ -202,9 +202,9 @@
ymin = -dble(ny)/2.0_plflt*dy
ymax = dble(ny)/2.0_plflt*dy
-
+
call plstransform( transform )
-
+
Q = 2.0_plflt
do i=1,nx
xx = (dble(i)-dble(nx)/2.0_plflt-0.5_plflt)*dx
@@ -227,9 +227,9 @@
'#frPLplot Example 22 - constriction with plstransform')
call plcol0(2)
call plshades(u, defined, xmin + dx / 2.0_plflt, &
- xmax - dx / 2.0_plflt, &
+ xmax - dx / 2.0_plflt, &
ymin + dy / 2.0_plflt, ymax - dy / 2.0_plflt, &
- clev, 0.0_plflt, 1, 1.0_plflt)
+ clev, 0.0_plflt, 1, 1.0_plflt, .false. )
scaling = -1.0_plflt
call plvect(u,v,scaling,xg,yg)
call plpath(nseg, xmin, ymax, xmax, ymax)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-12-06 07:20:50
|
Revision: 12820
http://sourceforge.net/p/plplot/code/12820
Author: arjenmarkus
Date: 2013-12-06 07:20:46 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Support the "rectangular" argument to plshades
Modified Paths:
--------------
trunk/bindings/f95/sccont.c
trunk/bindings/f95/sfstubs.f90
Modified: trunk/bindings/f95/sccont.c
===================================================================
--- trunk/bindings/f95/sccont.c 2013-12-06 00:23:27 UTC (rev 12819)
+++ trunk/bindings/f95/sccont.c 2013-12-06 07:20:46 UTC (rev 12820)
@@ -73,12 +73,12 @@
void PLSHADES07( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
- PLINT *cont_color, PLFLT *cont_width, PLINT *lx );
+ PLINT *cont_color, PLFLT *cont_width, PLINT *lx, PLINT *rect );
void PLSHADES17( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
PLINT *cont_color, PLFLT *cont_width,
- PLFLT *xg1, PLFLT *yg1, PLINT *lx );
+ PLFLT *xg1, PLFLT *yg1, PLINT *lx, PLINT *rect );
void PLSHADES27( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
@@ -519,9 +519,8 @@
PLSHADES07( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
- PLINT *cont_color, PLFLT *cont_width, PLINT *lx )
+ PLINT *cont_color, PLFLT *cont_width, PLINT *lx, PLINT *rect )
{
- PLINT rect = 1;
PLFLT ** a;
int i, j;
@@ -539,7 +538,7 @@
*xmin, *xmax, *ymin, *ymax,
clevel, *nlevel, *fill_width,
*cont_color, *cont_width,
- c_plfill, rect, NULL, NULL );
+ c_plfill, *rect, NULL, NULL );
// Clean up memory allocated for a
plFree2dGrid( a, *nx, *ny );
@@ -550,9 +549,8 @@
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
PLINT *cont_color, PLFLT *cont_width,
- PLFLT *xg1, PLFLT *yg1, PLINT *lx )
+ PLFLT *xg1, PLFLT *yg1, PLINT *lx, PLINT *rect )
{
- PLINT rect = 1;
PLFLT ** a;
int i, j;
PLcGrid cgrid;
@@ -576,12 +574,15 @@
*xmin, *xmax, *ymin, *ymax,
clevel, *nlevel, *fill_width,
*cont_color, *cont_width,
- c_plfill, rect, pltr1, ( PLPointer ) & cgrid );
+ c_plfill, *rect, pltr1, ( PLPointer ) & cgrid );
// Clean up memory allocated for a
plFree2dGrid( a, *nx, *ny );
}
+
+// Note that in this case the rectangular argument should always be 0,
+// it makes no sense to propagate it as an optional argument
void
PLSHADES27( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
Modified: trunk/bindings/f95/sfstubs.f90
===================================================================
--- trunk/bindings/f95/sfstubs.f90 2013-12-06 00:23:27 UTC (rev 12819)
+++ trunk/bindings/f95/sfstubs.f90 2013-12-06 07:20:46 UTC (rev 12820)
@@ -502,22 +502,30 @@
subroutine plshades_multiple_0(z, defined, &
xmin, xmax, ymin, ymax, &
clevel, fill_width, &
- cont_color, cont_width )
+ cont_color, cont_width, rectangular)
implicit none
character defined*(*)
integer cont_color
+ logical, optional :: rectangular
real(kind=plflt) fill_width, cont_width
real(kind=plflt) clevel(:)
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax
+ integer rect
+
! call plstrf2c(dnam, string1)
+ rect = 1
+ if ( present(rectangular) ) then
+ rect = merge( 1, 0, rectangular )
+ endif
+
s1 = transfer( string1, s1 )
call plshades07(z, size(z,1), size(z,2), s1, &
xmin, xmax, ymin, ymax, &
clevel, size(clevel), fill_width, &
- cont_color, cont_width, size(z,1))
+ cont_color, cont_width, size(z,1), rect)
end subroutine
@@ -526,23 +534,31 @@
subroutine plshades_multiple_1(z, defined, &
xmin, xmax, ymin, ymax, &
clevel, fill_width, &
- cont_color, cont_width, xg1, yg1)
+ cont_color, cont_width, xg1, yg1, rectangular)
implicit none
character defined*(*)
integer cont_color
+ logical, optional :: rectangular
real(kind=plflt) fill_width, cont_width
real(kind=plflt) clevel(:)
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
xg1(:), yg1(:)
+ integer rect
+
! call plstrf2c(dnam, string1)
+ rect = 1
+ if ( present(rectangular) ) then
+ rect = merge( 1, 0, rectangular )
+ endif
+
s1 = transfer( string1, s1 )
call plshades17(z, size(z,1), size(z,2), s1, &
xmin, xmax, ymin, ymax, &
clevel, size(clevel), fill_width, &
- cont_color, cont_width, xg1, yg1, size(z,1))
+ cont_color, cont_width, xg1, yg1, size(z,1), rect)
end subroutine
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-06 00:23:30
|
Revision: 12819
http://sourceforge.net/p/plplot/code/12819
Author: airwin
Date: 2013-12-06 00:23:27 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Correct typo, all ==> build_all.
Modified Paths:
--------------
trunk/cmake/epa_build/README
Modified: trunk/cmake/epa_build/README
===================================================================
--- trunk/cmake/epa_build/README 2013-12-06 00:12:13 UTC (rev 12818)
+++ trunk/cmake/epa_build/README 2013-12-06 00:23:27 UTC (rev 12819)
@@ -117,10 +117,10 @@
make help
# I recommend building all of them on Linux.
-make all >& all.out
+make build_all >& build_all.out
-# Check all.out for any errors
-less all.out
+# Check build_all.out for any errors
+less build_all.out
B. Build and test a lite version of PLplot (without building or using
major soft dependencies such as pango/cairo, Qt4, and wxwidgets)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-06 00:12:18
|
Revision: 12818
http://sourceforge.net/p/plplot/code/12818
Author: airwin
Date: 2013-12-06 00:12:13 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Replace ${CMAKE_SOURCE_DIR}/${PACKAGE} by the equivalent (and slightly
more understandable) ${CMAKE_CURRENT_SOURCE_DIR}.
Tested by: Alan W. Irwin <ai...@us...> on Linux using
epa_build with BUILD_THE_BUILDTOOLS OFF (the default) and the
build_plplot target (which builds, tests, and installs all configured
PLplot primary, secondary, etc., dependencies (including pango/cairo
and wxwidgets) before building, testing, and installing PLplot itself
(with the test_noninteractive target used for the testing part of that
task). Running this build_plplot target took 0.5 hours and verifies at
least on Linux that the new add_subdirectory paradigm for the CMake
logic used for epa_build is working well.
Modified Paths:
--------------
trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
trunk/cmake/epa_build/itk/CMakeLists.txt
trunk/cmake/epa_build/iwidgets/CMakeLists.txt
trunk/cmake/epa_build/libagg/CMakeLists.txt
trunk/cmake/epa_build/libqhull/CMakeLists.txt
trunk/cmake/epa_build/ndiff/CMakeLists.txt
trunk/cmake/epa_build/shapelib/CMakeLists.txt
trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt
Modified: trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xml/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/docbook-xml/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -59,10 +59,10 @@
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
APPEND
)
Modified: trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -58,10 +58,10 @@
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
APPEND
)
Modified: trunk/cmake/epa_build/itk/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itk/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/itk/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -73,11 +73,11 @@
COMMAND ${CMAKE_COMMAND} -E echo
"Provide an exactly equivalent \"Itk\" and \"itk\" form of the package name to follow what is implemented for itcl version 4."
# This patch has been publicly distributed at https://sourceforge.net/p/incrtcl/patches/52/
- COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/itk4_case.patch
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/itk4_case.patch
COMMAND ${CMAKE_COMMAND} -E echo
"Add generic/itkDecls.h to the list of itk headers that must be installed."
# This patch has been publicly distributed at https://sourceforge.net/p/incrtcl/patches/53/
- COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/itk4_header_list.patch
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/itk4_header_list.patch
APPEND
)
Modified: trunk/cmake/epa_build/iwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/iwidgets/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/iwidgets/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -79,9 +79,9 @@
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
COMMAND echo "Apply iwidgets4.1 source code patch"
- COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}4.1.patch
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}4.1.patch
COMMAND echo "Apply patch to support both iwidgets and Iwidgets package names"
- COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}4_case.patch
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}4_case.patch
APPEND
)
@@ -90,7 +90,7 @@
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
COMMAND echo "Add CMake-based build system"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
APPEND
)
Modified: trunk/cmake/epa_build/libagg/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libagg/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/libagg/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -65,10 +65,10 @@
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
APPEND
)
Modified: trunk/cmake/epa_build/libqhull/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libqhull/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/libqhull/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -57,26 +57,26 @@
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt
${EPA_BASE}/Source/build_${PACKAGE}/src/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/${PACKAGE}.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/${PACKAGE}.h
${EPA_BASE}/Source/build_${PACKAGE}/src/${PACKAGE}.h
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/mem.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/mem.h
${EPA_BASE}/Source/build_${PACKAGE}/src/mem.h
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/unix.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/unix.c
${EPA_BASE}/Source/build_${PACKAGE}/src/unix.c
COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/${PACKAGE}.h
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/mem.h
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/unix.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/${PACKAGE}.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/mem.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/unix.c
APPEND
)
Modified: trunk/cmake/epa_build/ndiff/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/ndiff/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/ndiff/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -63,14 +63,14 @@
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/config.h.cmake
+ ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
${EPA_BASE}/Source/build_${PACKAGE}/config.h.cmake
COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/config.h.cmake
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
APPEND
)
Modified: trunk/cmake/epa_build/shapelib/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/shapelib/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/shapelib/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -76,14 +76,14 @@
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -DURL:STRING=${shape_eg_data_URL} -DFILE:FILEPATH=${EPA_BASE}/Download/build_${PACKAGE}/shape_eg_data.zip -DMD5:STRING=${shape_eg_data_URL_MD5} -P ${CMAKE_SOURCE_DIR}/download_check.cmake
COMMAND ${CMAKE_COMMAND} -E remove_directory ${EPA_BASE}/Source/build_${PACKAGE}/eg_data
COMMAND ${UNZIP_EXECUTABLE} -q ${EPA_BASE}/Download/build_${PACKAGE}/shape_eg_data.zip -d ${EPA_BASE}/Source/build_${PACKAGE}/eg_data
COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
${CMAKE_SOURCE_DIR}/download_check.cmake
# N.B. no file dependencies are worthwhile for the eg_data
# chain above since it all starts with a download.
Modified: trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt 2013-12-06 00:12:13 UTC (rev 12818)
@@ -46,7 +46,7 @@
build_${PACKAGE}
DEPENDS ${dependencies_targets}
# The entire source code is just one CMakeLists.txt file.
- DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
+ DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_CMAKE_COMMAND} ${EP_BASE}/Source/build_${PACKAGE}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
BUILD_IN_SOURCE OFF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-05 22:59:37
|
Revision: 12817
http://sourceforge.net/p/plplot/code/12817
Author: airwin
Date: 2013-12-05 22:59:35 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Fix dependencies handling bug (the last one found by the complicated
dependencies in the build_plplot case) and comment out the debug
messages that allowed me to debug this issue.
Modified Paths:
--------------
trunk/cmake/epa_build/CMakeLists.txt
Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt 2013-12-05 22:56:28 UTC (rev 12816)
+++ trunk/cmake/epa_build/CMakeLists.txt 2013-12-05 22:59:35 UTC (rev 12817)
@@ -167,7 +167,7 @@
_source_PATH
)
- message(STATUS "DEBUG: entering ${_PACKAGE} = ${${_PACKAGE}}")
+ #message(STATUS "DEBUG DEPENDENCY HANDLING: entering ${_PACKAGE} = ${${_PACKAGE}}")
get_property(saved_started_subdirectories_LIST GLOBAL PROPERTY EPA_started_subdirectories_LIST)
set_property(GLOBAL APPEND PROPERTY EPA_started_subdirectories_LIST ${${_PACKAGE}})
get_property(started_subdirectories_LIST GLOBAL PROPERTY EPA_started_subdirectories_LIST)
@@ -184,26 +184,31 @@
endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
endforeach(build_configuration ${${_dependences_LIST}})
- # remaining_dependencies_LIST contains the dependencies left over
- # from the above removals that have not already been finished.
- set(remaining_dependencies_LIST ${${_dependencies_LIST}})
+ #message(STATUS "DEBUG DEPENDENCY HANDLING: ${_PACKAGE} = ${${_PACKAGE}} has the following list of expurgated dependencies: ${${_dependencies_LIST}}")
+
+ # Initial value of finished_subdirectories_LIST required for following
+ # loop logic to work correctly.
get_property(finished_subdirectories_LIST GLOBAL PROPERTY EPA_finished_subdirectories_LIST)
- if(remaining_dependencies_LIST AND finished_subdirectories_LIST)
- list(REMOVE_ITEM remaining_dependencies_LIST ${finished_subdirectories_LIST})
- endif(remaining_dependencies_LIST AND finished_subdirectories_LIST)
-
- foreach(build_configuration ${remaining_dependencies_LIST})
+ foreach(build_configuration ${${_dependencies_LIST}})
list(FIND started_subdirectories_LIST ${build_configuration} index)
if(index GREATER -1)
message(FATAL_ERROR "Circular dependency: package ${build_configuration} depends on package ${${_PACKAGE}} which depends on package ${build_configuration}.")
endif(index GREATER -1)
- add_subdirectory(
- ${CMAKE_SOURCE_DIR}/${build_configuration}
- ${CMAKE_BINARY_DIR}/${build_configuration}
- )
- endforeach(build_configuration ${remaining_dependencies_LIST})
- set_property(GLOBAL PROPERTY EPA_started_subdirectories_LIST ${saved_started_subdirectories_LIST})
+ list(FIND finished_subdirectories_LIST ${build_configuration} index)
+ if(index LESS 0)
+ # Only if build_configuration is not in finished_subdirectories_LIST.
+ add_subdirectory(
+ ${CMAKE_SOURCE_DIR}/${build_configuration}
+ ${CMAKE_BINARY_DIR}/${build_configuration}
+ )
+ # GLOBAL property EPA_finished_subdirectories_LIST has the subdirectory
+ # name appended to it for the above add_subdirectory call.
+ # So must update finished_subdirectories_LIST
+ # in order for the next test of build_configuration to be valid.
+ get_property(finished_subdirectories_LIST GLOBAL PROPERTY EPA_finished_subdirectories_LIST)
+ endif(index LESS 0)
+ endforeach(build_configuration ${${_dependencies_LIST}})
set(${_dependencies_targets})
foreach(build_configuration ${${_dependencies_LIST}})
@@ -220,15 +225,22 @@
endif(MSYS_PLATFORM)
#message(STATUS "DEBUG: (modified for ${${_PACKAGE}}) ${_EPA_PATH} = ${${_EPA_PATH}}")
+ # Update global properties consistent with a successful conclusion of this
+ # function call.
+ set_property(GLOBAL PROPERTY EPA_started_subdirectories_LIST ${saved_started_subdirectories_LIST})
+
set_property(GLOBAL APPEND PROPERTY EPA_build_targets_LIST build_${${_PACKAGE}})
set_property(GLOBAL APPEND PROPERTY EPA_finished_subdirectories_LIST ${${_PACKAGE}})
+ # Temporary debugging of dependencies.
+ #get_property(finished_subdirectories_LIST GLOBAL PROPERTY EPA_finished_subdirectories_LIST)
+ #message(STATUS "DEBUG DEPENDENCY HANDLING: finished_subdirectories_LIST = ${finished_subdirectories_LIST}")
# Propagate changed output arguments to parent scope of function.
set(${_dependencies_LIST} ${${_dependencies_LIST}} PARENT_SCOPE)
set(${_dependencies_targets} ${${_dependencies_targets}} PARENT_SCOPE)
set(${_EPA_PATH} ${${_EPA_PATH}} PARENT_SCOPE)
set(${_source_PATH} ${${_source_PATH}} PARENT_SCOPE)
- message(STATUS "DEBUG: leaving ${_PACKAGE} = ${${_PACKAGE}}")
+ #message(STATUS "DEBUG DEPENDENCY HANDLING: leaving ${_PACKAGE} = ${${_PACKAGE}}")
endfunction(epa_boilerplate)
# This gives the full pathname of the associated build tool for at
@@ -350,6 +362,10 @@
endif(NOT ${EXECUTABLE}_EXECUTABLE)
endforeach(executable ${executables_LIST})
+ # List sufficient buildtool configurations so they will suck in
+ # the remaining buildtool configurations via dependencies.
+ # Order does not matter because the dependency logic takes
+ # care of any ordering issues.
set(subdirectories_LIST
cmake
pkg-config
@@ -369,14 +385,16 @@
iwidgets4.0
)
else(BUILD_THE_BUILDTOOLS)
- # List of all configurations. Order doesn't matter because multiple
- # attempts to include the same configuration (via dependencies) are ignored.
+ # List sufficient normal package configurations so they will suck in
+ # the remaining configurations via dependencies.
+ # Order does not matter because the dependency logic takes
+ # care of any ordering issues.
set(subdirectories_LIST
ndiff
- #plplot
- #plplot_lite
- #wxwidgets
- #pango
+ plplot
+ plplot_lite
+ wxwidgets
+ pango
)
endif(BUILD_THE_BUILDTOOLS)
@@ -384,7 +402,7 @@
set_property(GLOBAL PROPERTY EPA_finished_subdirectories_LIST)
set_property(GLOBAL PROPERTY EPA_build_targets_LIST)
-message(STATUS "DEBUG: subdirectories_LIST = ${subdirectories_LIST}")
+#message(STATUS "DEBUG DEPENDENCY HANDLING (for outer subdirectories loop): subdirectories_LIST = ${subdirectories_LIST}")
# Using a while loop seems obvious here
# because each add_subdirectory command can generate others
@@ -404,8 +422,8 @@
add_subdirectory(${subdirectory})
get_property(finished_subdirectories_LIST GLOBAL PROPERTY EPA_finished_subdirectories_LIST)
list(REMOVE_ITEM subdirectories_LIST ${finished_subdirectories_LIST})
- message(STATUS "DEBUG: visited ${subdirectory}")
- message(STATUS "DEBUG: subdirectories_LIST = ${subdirectories_LIST}")
+# message(STATUS "DEBUG DEPENDENCY HANDLING (for outer subdirectories loop): visited ${subdirectory}")
+# message(STATUS "DEBUG DEPENDENCY HANDLING (for outer subdirectories loop): subdirectories_LIST = ${subdirectories_LIST}")
list(LENGTH subdirectories_LIST LENGTH_subdirectories_LIST)
if(LENGTH_subdirectories_LIST EQUAL 0)
break()
@@ -414,4 +432,5 @@
add_custom_target(build_all)
get_property(build_targets_LIST GLOBAL PROPERTY EPA_build_targets_LIST)
+message(STATUS "The target build_all has the following dependent targets: ${build_targets_LIST}")
add_dependencies(build_all ${build_targets_LIST})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-05 22:56:31
|
Revision: 12816
http://sourceforge.net/p/plplot/code/12816
Author: airwin
Date: 2013-12-05 22:56:28 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Update this reversed patch to the latest automatically configured version of
itstools/CMakeLists.txt.
Modified Paths:
--------------
trunk/cmake/epa_build/configured_pango.patch
Modified: trunk/cmake/epa_build/configured_pango.patch
===================================================================
--- trunk/cmake/epa_build/configured_pango.patch 2013-12-05 22:52:36 UTC (rev 12815)
+++ trunk/cmake/epa_build/configured_pango.patch 2013-12-05 22:56:28 UTC (rev 12816)
@@ -1,58 +1,19 @@
Index: itstool/CMakeLists.txt
===================================================================
---- itstool/CMakeLists.txt (revision 12790)
+--- itstool/CMakeLists.txt (revision 12812)
+++ itstool/CMakeLists.txt (working copy)
-@@ -64,7 +64,6 @@
- set(${BP_PACKAGE}_URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
- set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
- set(${BP_PACKAGE}_DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa)
--set(${BP_PACKAGE}_PATCH itstool-1.2.0-python-location-fixes.patch)
+@@ -62,14 +62,12 @@
+ set(URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
+ set(DOWNLOAD_HASH_TYPE SHA256)
+ set(DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa)
+-set(PATCH itstool-1.2.0-python-location-fixes.patch)
- # Data that is related to the PATH that must be used.
- if(MSYS_PLATFORM)
-@@ -93,7 +92,6 @@
- DEPENDS ${${BP_PACKAGE}_dependencies_targets}
- URL ${${BP_PACKAGE}_URL}
- URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
-- PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${${BP_PACKAGE}_PATCH}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND}
- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
+ ExternalProject_Add(
+ build_${PACKAGE}
+ DEPENDS ${dependencies_targets}
+ URL ${URL}
+ URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+- PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${PATCH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
BUILD_IN_SOURCE OFF
-Index: configured_pango.patch
-===================================================================
---- configured_pango.patch (revision 12800)
-+++ configured_pango.patch (working copy)
-@@ -1,20 +1,20 @@
- Index: itstool/CMakeLists.txt
- ===================================================================
----- itstool/CMakeLists.txt (revision 12790)
-+--- itstool/CMakeLists.txt (revision 12802)
- +++ itstool/CMakeLists.txt (working copy)
--@@ -64,7 +64,6 @@
-- set(${BP_PACKAGE}_URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
-- set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
-- set(${BP_PACKAGE}_DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa)
---set(${BP_PACKAGE}_PATCH itstool-1.2.0-python-location-fixes.patch)
-+@@ -71,7 +71,6 @@
-+ set(URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
-+ set(DOWNLOAD_HASH_TYPE SHA256)
-+ set(DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa)
-+-set(PATCH itstool-1.2.0-python-location-fixes.patch)
-
- # Data that is related to the PATH that must be used.
- if(MSYS_PLATFORM)
--@@ -93,7 +92,6 @@
-- DEPENDS ${${BP_PACKAGE}_dependencies_targets}
-- URL ${${BP_PACKAGE}_URL}
-- URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
--- PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${${BP_PACKAGE}_PATCH}
-- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND}
-- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
-+@@ -98,7 +97,6 @@
-+ DEPENDS ${dependencies_targets}
-+ URL ${URL}
-+ URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-+- PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${PATCH}
-+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${SET_CFLAGS} ${SET_CXXFLAGS} ${source_PATH}/${EPA_CONFIGURE_COMMAND}
-+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BP_PARALLEL_MAKE_COMMAND}
- BUILD_IN_SOURCE OFF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-05 22:52:39
|
Revision: 12815
http://sourceforge.net/p/plplot/code/12815
Author: airwin
Date: 2013-12-05 22:52:36 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Hopefully this is the last correction from the BP_ prefix to the
correct EPA_ prefix for variable names. This
affects the swig build in the BUILD_THE_BUILDTOOLS case
(which libpcre library to use)
and fixes the libxml2 build.
Modified Paths:
--------------
trunk/cmake/epa_build/add_packages.xml
trunk/cmake/epa_build/libxml2/CMakeLists.txt
trunk/cmake/epa_build/swig/CMakeLists.txt
Modified: trunk/cmake/epa_build/add_packages.xml
===================================================================
--- trunk/cmake/epa_build/add_packages.xml 2013-12-05 22:46:13 UTC (rev 12814)
+++ trunk/cmake/epa_build/add_packages.xml 2013-12-05 22:52:36 UTC (rev 12815)
@@ -21,7 +21,7 @@
<!-- without these python shenanigans the python components of libxml2 are
installed with the system prefix rather than desired special prefix
-->
- <autotools id="libxml2" makeargs="PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages">
+ <autotools id="libxml2" makeargs="PYTHON_SITE_PACKAGES=${EPA_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages">
<branch hash="md5:9c0cfef285d5c4a5c80d00904ddab380" module="sources/libxml2-2.9.1.tar.gz" repo="http://xmlsoft.org/" size="983500" version="2.9.1"/>
<!-- This package (which installs nothing on Unix platforms) is
required as a workaround for the xmlcatalog argument mangling that
@@ -44,7 +44,7 @@
<autotools autogenargs="--enable-unicode-properties --enable-pcre16 --enable-pcre32 --disable-static" id="libpcre">
<branch hash="md5:21514018448ac10062ece7a668fca949" module="pcre/pcre-8.33.tar.bz2" repo="http://downloads.sourceforge.net/" size="1211146" version="8.33"/>
</autotools>
- <autotools autogenargs="--with-pcre-prefix=${BP_CMAKE_INSTALL_PREFIX}" id="swig">
+ <autotools autogenargs="--with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}" id="swig">
<branch hash="sha256:63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e" module="swig/swig/swig-2.0.11/swig-2.0.11.tar.gz" repo="http://downloads.sourceforge.net/" size="1211146" version="6.8"/>
<dependencies>
<dep package="libpcre"/>
Modified: trunk/cmake/epa_build/libxml2/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libxml2/CMakeLists.txt 2013-12-05 22:46:13 UTC (rev 12814)
+++ trunk/cmake/epa_build/libxml2/CMakeLists.txt 2013-12-05 22:52:36 UTC (rev 12815)
@@ -69,7 +69,7 @@
URL ${URL}
URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND}
- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${EPA_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages
BUILD_IN_SOURCE OFF
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages install
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${EPA_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages install
)
Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt 2013-12-05 22:46:13 UTC (rev 12814)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt 2013-12-05 22:52:36 UTC (rev 12815)
@@ -68,7 +68,7 @@
DEPENDS ${dependencies_targets}
URL ${URL}
URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${BP_CMAKE_INSTALL_PREFIX}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
BUILD_IN_SOURCE OFF
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
