From: Dimitrios Eftaxiopoulos Date: Mon, 25 Apr 2011 23:30:55 +0000 (+0300) Subject: Merge commit 'upstream/1.11.1.1' X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~226 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=39730a055560e74ec1ab9aaf799267454205d5e8;p=mathgl.git Merge commit 'upstream/1.11.1.1' Conflicts: ChangeLog.txt TODO configure debian/changelog debian/control debian/copyright debian/libmgl-fltk5.install debian/libmgl5.install debian/mathgl.install debian/mgl2cpp.1 debian/mgl2eps.1 debian/mgl2gif.1 debian/mgl2png.1 debian/mgl2svg.1 debian/mglview.1 debian/patches/dircategory-and-direntry-mathgl-en-texi.patch debian/patches/series debian/python-mathgl.install debian/rules examples/full_test.cpp include/mgl/mgl.h include/mgl/mgl_ab.h include/mgl/mgl_define.h mgl/Makefile.in mgl/mgl_ab.cpp mgl/mgl_crust.cpp mgl/mgl_data_io.cpp mgl/mgl_exec.cpp mgl/mgl_zb.cpp mgl/mgl_zb2.cpp texinfo/Makefile.am texinfo/Makefile.in texinfo/mgl_en.texi texinfo/mgl_ru.texi --- 39730a055560e74ec1ab9aaf799267454205d5e8 diff --cc .directory index 458b98e,0000000..912f489 mode 100644,000000..100644 --- a/.directory +++ b/.directory @@@ -1,6 -1,0 +1,3 @@@ +[Dolphin] - Timestamp=2011,4,26,1,58,58 ++Timestamp=2011,4,26,2,6,20 +Version=2 - - [Settings] - ShowDotFiles=true diff --cc ChangeLog.txt index a4ae6e1,5cbe2fa..954fe79 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@@ -1,3 -1,7 +1,10 @@@ ++<<<<<<< HEAD ++======= + 1.11.1 Released 18 March 2011 + - Improve IDTF export + - Minor changes and bugfixes + ++>>>>>>> upstream/1.11.1.1 1.11.0.1 Released 15 November 2010 - Bugfix for reading textual data files (mostly under win32). - Docs update. diff --cc TODO index c41c6e3,b599d10..b013975 --- a/TODO +++ b/TODO @@@ -10,6 -10,17 +10,20 @@@ 4. Add plot Circle() as Error() but with marks instead of error boxes (default 'o') + alpha-transpared if filled 5. Export to LaTeX formats - (pgf/tikz) or metapost if possible (like EPS). 6. Use '~' for old style textual arguments!!! ++<<<<<<< HEAD ++======= + 7. Pipes in mgl2png, mgl2eps, ... (stdin, stdout) + 8. Multithreading + 9. Number of proc from get_nprocs_conf() (#include ) + 10.Arbitrary line/curve coordinates if z=nan + 11.Add apperture for light (partially is done) + 12.Add diffusive light (no dependence of normale but have direction) + 13. утилиты (mgl2png и пр.) вылетают, если в коментариях русские буквы + 14. Last ' isn't send as call argument!!! + 15. MGL docs -- text what formulas are applicable for scalars too. + 16. Manual labels in string with '\n' separator + 17. Venn() diagram-like -- transparent circles with manual colors and sizes -- may be a variant of Mark()??? ++>>>>>>> upstream/1.11.1.1 11. Update STIX fonts (new release) + create PWT fonts 12. Problem with \calB and so on (\calH, ...) -- they are present only in italic font :(. @@@ -25,7 -36,7 +39,11 @@@ 29. Multithreading by "subplots" -- for parser first of all !!! 30. Sample about pthread using. ++<<<<<<< HEAD + ++======= + 31. Add help about cmake and GIF/JPEG to the "Installation and using" ++>>>>>>> upstream/1.11.1.1 32. Regroup pictures in WWW by big classes + combo plots ========================= diff --cc configure index 8245fcd,fa5d32b..01ccd69 --- a/configure +++ b/configure @@@ -1,6 -1,6 +1,10 @@@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ++<<<<<<< HEAD +# Generated by GNU Autoconf 2.67 for mathgl 1.10. ++======= + # Generated by GNU Autoconf 2.67 for mathgl 1.11. ++>>>>>>> upstream/1.11.1.1 # # Report bugs to . # @@@ -1782,7 -1791,7 +1795,11 @@@ f test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF ++<<<<<<< HEAD +mathgl configure 1.10 ++======= + mathgl configure 1.11 ++>>>>>>> upstream/1.11.1.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@@ -2272,7 -2281,7 +2289,11 @@@ cat >config.log <<_ACEO This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. ++<<<<<<< HEAD +It was created by mathgl $as_me 1.10, which was ++======= + It was created by mathgl $as_me 1.11, which was ++>>>>>>> upstream/1.11.1.1 generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@@ -2621,7 -2630,7 +2642,11 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn ++<<<<<<< HEAD +MGL_RELEASE=1.10 ++======= + MGL_RELEASE=1.11 ++>>>>>>> upstream/1.11.1.1 @@@ -5503,13 -5518,13 +5534,23 @@@ if test "${lt_cv_nm_interface+set}" = s else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext ++<<<<<<< HEAD + (eval echo "\"\$as_me:5506: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:5509: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:5512: output\"" >&5) ++======= + (eval echo "\"\$as_me:5521: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:5524: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:5527: output\"" >&5) ++>>>>>>> upstream/1.11.1.1 cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@@ -6712,7 -6727,7 +6753,11 @@@ ia64-*-hpux* ;; *-*-irix6*) # Find out which ABI we are using. ++<<<<<<< HEAD + echo '#line 6715 "configure"' > conftest.$ac_ext ++======= + echo '#line 6730 "configure"' > conftest.$ac_ext ++>>>>>>> upstream/1.11.1.1 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@@ -8760,11 -8775,11 +8805,19 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ++<<<<<<< HEAD + (eval echo "\"\$as_me:8763: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:8767: \$? = $ac_status" >&5 ++======= + (eval echo "\"\$as_me:8778: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:8782: \$? = $ac_status" >&5 ++>>>>>>> upstream/1.11.1.1 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@@ -9099,11 -9114,11 +9152,19 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ++<<<<<<< HEAD + (eval echo "\"\$as_me:9102: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:9106: \$? = $ac_status" >&5 ++======= + (eval echo "\"\$as_me:9117: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:9121: \$? = $ac_status" >&5 ++>>>>>>> upstream/1.11.1.1 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@@ -9204,11 -9219,11 +9265,19 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ++<<<<<<< HEAD + (eval echo "\"\$as_me:9207: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:9211: \$? = $ac_status" >&5 ++======= + (eval echo "\"\$as_me:9222: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:9226: \$? = $ac_status" >&5 ++>>>>>>> upstream/1.11.1.1 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@@ -9259,11 -9274,11 +9328,19 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ++<<<<<<< HEAD + (eval echo "\"\$as_me:9262: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:9266: \$? = $ac_status" >&5 ++======= + (eval echo "\"\$as_me:9277: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:9281: \$? = $ac_status" >&5 ++>>>>>>> upstream/1.11.1.1 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@@ -11643,7 -11658,7 +11720,11 @@@ els lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF ++<<<<<<< HEAD +#line 11646 "configure" ++======= + #line 11661 "configure" ++>>>>>>> upstream/1.11.1.1 #include "confdefs.h" #if HAVE_DLFCN_H @@@ -11739,7 -11754,7 +11820,11 @@@ els lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF ++<<<<<<< HEAD +#line 11742 "configure" ++======= + #line 11757 "configure" ++>>>>>>> upstream/1.11.1.1 #include "confdefs.h" #if HAVE_DLFCN_H @@@ -13695,11 -13710,11 +13780,19 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ++<<<<<<< HEAD + (eval echo "\"\$as_me:13698: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:13702: \$? = $ac_status" >&5 ++======= + (eval echo "\"\$as_me:13713: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:13717: \$? = $ac_status" >&5 ++>>>>>>> upstream/1.11.1.1 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@@ -13794,11 -13809,11 +13887,19 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ++<<<<<<< HEAD + (eval echo "\"\$as_me:13797: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:13801: \$? = $ac_status" >&5 ++======= + (eval echo "\"\$as_me:13812: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:13816: \$? = $ac_status" >&5 ++>>>>>>> upstream/1.11.1.1 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@@ -13846,11 -13861,11 +13947,19 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ++<<<<<<< HEAD + (eval echo "\"\$as_me:13849: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:13853: \$? = $ac_status" >&5 ++======= + (eval echo "\"\$as_me:13864: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:13868: \$? = $ac_status" >&5 ++>>>>>>> upstream/1.11.1.1 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@@ -15360,7 -15376,7 +15470,11 @@@ els hdf4=false fi ++<<<<<<< HEAD +ac_fn_c_check_header_mongrel "$LINENO" "hdf/mfhdf.h" "ac_cv_header_hdf_mfhdf_h" "$ac_includes_default" ++======= + ac_fn_cxx_check_header_mongrel "$LINENO" "hdf/mfhdf.h" "ac_cv_header_hdf_mfhdf_h" "$ac_includes_default" ++>>>>>>> upstream/1.11.1.1 if test "x$ac_cv_header_hdf_mfhdf_h" = x""yes; then : (test x$all = xtrue || test x$hdf4 = xtrue) && HDF4_FLAGS=-DHAVE_HDF4 else @@@ -15388,7 -15404,7 +15502,11 @@@ return main () return 0; } _ACEOF ++<<<<<<< HEAD +if ac_fn_c_try_link "$LINENO"; then : ++======= + if ac_fn_cxx_try_link "$LINENO"; then : ++>>>>>>> upstream/1.11.1.1 ac_cv_lib_df_main=yes else ac_cv_lib_df_main=no @@@ -17127,6 -17316,14 +17418,17 @@@ Usually this means the macro was only i fi if test -z "${USE_JPEG_TRUE}" && test -z "${USE_JPEG_FALSE}"; then as_fn_error $? "conditional \"USE_JPEG\" was never defined. ++<<<<<<< HEAD ++======= + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${USE_PDF_TRUE}" && test -z "${USE_PDF_FALSE}"; then + as_fn_error $? "conditional \"USE_PDF\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${USE_U3D_TRUE}" && test -z "${USE_U3D_FALSE}"; then + as_fn_error $? "conditional \"USE_U3D\" was never defined. ++>>>>>>> upstream/1.11.1.1 Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_FLTK_TRUE}" && test -z "${USE_FLTK_FALSE}"; then @@@ -17565,7 -17762,7 +17867,11 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" ++<<<<<<< HEAD +This file was extended by mathgl $as_me 1.10, which was ++======= + This file was extended by mathgl $as_me 1.11, which was ++>>>>>>> upstream/1.11.1.1 generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@@ -17631,7 -17828,7 +17937,11 @@@ _ACEO cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ ++<<<<<<< HEAD +mathgl config.status 1.10 ++======= + mathgl config.status 1.11 ++>>>>>>> upstream/1.11.1.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --cc configure.ac index b4afae5,fc44305..1354803 --- a/configure.ac +++ b/configure.ac @@@ -1,8 -1,8 +1,11 @@@ - AC_INIT([mathgl], [1.10], [mathgl.abalakin@gmail.com]) + AC_INIT([mathgl], [1.11], [mathgl.abalakin@gmail.com]) + + MGL_RELEASE=1.11 + AC_SUBST(MGL_RELEASE) +MGL_RELEASE=1.10 +AC_SUBST(MGL_RELEASE) + AC_CONFIG_MACRO_DIR([config]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR(mgl) diff --cc examples/full_test.cpp index df3af66,0827244..41a8d98 --- a/examples/full_test.cpp +++ b/examples/full_test.cpp @@@ -600,7 -616,7 +616,11 @@@ void smgl_sample6(mglGraph *gr) // diff //----------------------------------------------------------------------------- void smgl_sample5(mglGraph *gr) // pen styles { ++<<<<<<< HEAD + if(type==5) gr->Puts(mglPoint(0,1.2),"line styles not supported","rL"); ++======= + if(type==5 || type==9 || type==10) gr->Puts(mglPoint(0,1.2),"line styles not supported","rL"); ++>>>>>>> upstream/1.11.1.1 mreal d,x1,x2,x0,y=0.95; d=0.3, x0=0.2, x1=0.5, x2=0.6; gr->Line(mglPoint(x0,1-0*d),mglPoint(x1,1-0*d),"k-"); gr->Puts(mglPoint(x2,y-0*d),"Solid '-'","rL"); @@@ -1021,6 -1040,7 +1044,10 @@@ void smgl_stereo(mglGraph *gr gr->Box(); gr->Surf(a); gr->SubPlot(2,1,1); gr->Rotate(40,60-3); gr->Box(); gr->Surf(a); ++<<<<<<< HEAD ++======= + gr->Rotate(0,0); // for unrotate in IDTF ++>>>>>>> upstream/1.11.1.1 } //----------------------------------------------------------------------------- void smgl_tile(mglGraph *gr) diff --cc include/mgl/mgl.h index b9aa8a4,5ebe75d..28eb3fc --- a/include/mgl/mgl.h +++ b/include/mgl/mgl.h @@@ -294,7 -298,7 +298,11 @@@ public /// Set angle of view indepently from mglGraph::Rotate(). virtual void View(mreal tetx,mreal tetz,mreal tety=0); inline int GetWarn() { return WarnCode; }; ++<<<<<<< HEAD + void DefaultPlotParam(); ///< Set default parameter for plotting ++======= + virtual void DefaultPlotParam(); ///< Set default parameter for plotting ++>>>>>>> upstream/1.11.1.1 /// Zoom in or zoom out (if Zoom(0, 0, 1, 1)) a part of picture void Zoom(mreal x1, mreal y1, mreal x2, mreal y2); /// Clear transformation matrix. diff --cc include/mgl/mgl_ab.h index 862f52a,9b29346..c24cf34 --- a/include/mgl/mgl_ab.h +++ b/include/mgl/mgl_ab.h @@@ -52,9 -52,11 +52,15 @@@ using mglGraph::Legend bool Alpha(bool enable); bool Light(bool enable); void Light(int n, bool enable); - void Light(int n,mglPoint p, mglColor c=WC, mreal br=0.5, bool infty=true); + void Light(int n,mglPoint p, mglColor c=WC, mreal br=0.5, bool infty=true, mreal ap=0); ++<<<<<<< HEAD + void InPlot(mreal x1,mreal x2,mreal y1,mreal y2, bool rel=false); ++======= + virtual void InPlot(mreal x1,mreal x2,mreal y1,mreal y2, bool rel=false); + virtual void DefaultPlotParam(); ///< Set default parameter for plotting + virtual void Rotate(mreal TetX,mreal TetZ,mreal TetY=0); ++>>>>>>> upstream/1.11.1.1 void StickPlot(int num, int i, mreal tet, mreal phi); void Aspect(mreal Ax,mreal Ay,mreal Az); void RotateN(mreal Tet,mreal x,mreal y,mreal z); diff --cc include/mgl/mgl_define.h index 6c85c13,fdba9fd..c73a394 --- a/include/mgl/mgl_define.h +++ b/include/mgl/mgl_define.h @@@ -31,6 -31,7 +31,10 @@@ //#ifdef WIN32 #ifdef _MSC_VER ++<<<<<<< HEAD ++======= + #define chdir _chdir // BORLAND has chdir ++>>>>>>> upstream/1.11.1.1 #include const unsigned long mgl_nan[2] = {0xffffffff, 0x7fffffff}; #define NANd (*(double*)mgl_nan) @@@ -39,9 -40,6 +43,12 @@@ #define NAN NANd #else #define NAN NANd ++<<<<<<< HEAD +#endif +#ifdef _MSC_VER +#define chdir _chdir // BORLAND has chdir ++======= ++>>>>>>> upstream/1.11.1.1 #endif #endif diff --cc mgl/Makefile.in index 899e46b,877f8aa..6106989 --- a/mgl/Makefile.in +++ b/mgl/Makefile.in @@@ -44,6 -44,7 +44,10 @@@ host_triplet = @host @USE_HDF5_TRUE@am__append_8 = $(HDF5_LIBS) @USE_GIF_TRUE@am__append_9 = $(GIF_LIBS) @USE_JPEG_TRUE@am__append_10 = $(JPEG_LIBS) ++<<<<<<< HEAD ++======= + @USE_U3D_TRUE@am__append_11 = $(U3D_LIBS) ++>>>>>>> upstream/1.11.1.1 subdir = mgl DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@@ -85,10 -86,12 +89,19 @@@ am__DEPENDENCIES_1 @USE_HDF5_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) @USE_GIF_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) @USE_JPEG_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) ++<<<<<<< HEAD +libmgl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \ + $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) ++======= + @USE_U3D_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) + libmgl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \ + $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \ + $(am__DEPENDENCIES_8) ++>>>>>>> upstream/1.11.1.1 am_libmgl_la_OBJECTS = libmgl_la-mgl_data_cf.lo libmgl_la-mgl_axis.lo \ libmgl_la-mgl_data_png.lo libmgl_la-mgl_zb2.lo \ libmgl_la-mgl_c.lo libmgl_la-mgl_eps.lo libmgl_la-mgl_font.lo \ @@@ -306,7 -310,7 +320,11 @@@ WIDGETS = $(am__append_1) $(am__append_ $(am__append_4) libmgl_la_LIBADD = $(PNG_LIBS) $(GL_LIBS) $(LOPENMP) $(am__append_5) \ $(am__append_6) $(am__append_7) $(am__append_8) \ ++<<<<<<< HEAD + $(am__append_9) $(am__append_10) ++======= + $(am__append_9) $(am__append_10) $(am__append_11) ++>>>>>>> upstream/1.11.1.1 libmgl_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE) libmgl_la_CXXFLAGS = $(WIDGETS) -DMGL_FONT_PATH=\"$(datadir)/$(PACKAGE)/fonts/\" \ -DMOD_LIB_DIR=\"$(libdir)/mgl/\" $(HDF5_FLAGS) $(HDF4_FLAGS) $(GIF_FLAGS) $(JPEG_FLAGS) \ diff --cc mgl/mgl_ab.cpp index 53dba12,072df2f..5b69427 --- a/mgl/mgl_ab.cpp +++ b/mgl/mgl_ab.cpp @@@ -2,24 -2,24 +2,24 @@@ * mgl_ab.cpp is part of Math Graphic Library * Copyright (C) 2007 Alexey Balakin * * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Library General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Library General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ #include #include -#include +#include #include "mgl/mgl_ab.h" #define imax(a,b) (a)>(b) ? (a) : (b) @@@ -45,6 -45,16 +45,19 @@@ mglGraphAB::mglGraphAB(int w,int h) : m //----------------------------------------------------------------------------- mglGraphAB::~mglGraphAB() { if(G) { delete []G; delete []G4; delete []OI; } } ++<<<<<<< HEAD ++======= + //----------------------------------------------------------------------------- + void mglGraphAB::DefaultPlotParam() + { + mglGraph::DefaultPlotParam(); + } + //----------------------------------------------------------------------------- + void mglGraphAB::Rotate(mreal TetX,mreal TetZ,mreal TetY) + { + mglGraph::Rotate( TetX,TetZ,TetY ); + } ++>>>>>>> upstream/1.11.1.1 //----------------------------------------------------------------------------- void mglGraphAB::Pop() { @@@ -351,27 -362,27 +365,47 @@@ mreal mglGraphAB::Putsw(mglPoint p,mglP } //----------------------------------------------------------------------------- void mglGraphAB::Putsw(mglPoint p, const wchar_t *wcs, const char *font, mreal size, char dir, mreal sh) - { + { static int nl_shift = 0; - static int cgid=1; StartGroup("Putsw",cgid++); + static int cgid=1; StartGroup("Putsw",cgid++); if(font && strchr(font, 'A')) { Labelw(p.x, p.y, wcs,font,size,false); return; } ++<<<<<<< HEAD + if(font && strchr(font, 'a')) { Labelw(p.x, p.y, wcs,font,size,true); return; } + + wchar_t *wcl; + unsigned wn=0; + const wchar_t *wnl=0; + for(wn=0;wn>>>>>> upstream/1.11.1.1 bool upside = ( (((_sx==-1) ^ (Org.y==Max.y || Org.z==Max.z)) && (dir=='x' || dir=='X')) || (((_sy==-1) ^ (Org.x==Max.x || Org.z==Max.z)) && (dir=='y' || dir=='Y')) || @@@ -473,7 -484,7 +507,11 @@@ strcat(font1,ch); } } ++<<<<<<< HEAD + zoomx1=x1; zoomx2=x2; zoomy1=y1; zoomy2=y2; ++======= + zoomx1=x1; zoomx2=x2; zoomy1=y1; zoomy2=y2; ++>>>>>>> upstream/1.11.1.1 yPos -= nl_shift*0.11/PlotFactor*fsize; fnt->Puts(wcs,font1,col); Pop(); delete []font1; EndGroup(); @@@ -488,7 -499,7 +526,11 @@@ void mglGraphAB::Legend(int n, wchar_t static int cgid=1; StartGroup("Legend",cgid++); mreal pp[15], r=GetRatio(), rh, rw, s3=PlotFactor; if(size<=0) size = -size*FontSize; ++<<<<<<< HEAD + if(!font || !(*font)) font="L"; ++======= + if(!font || !(*font)) font="L"; ++>>>>>>> upstream/1.11.1.1 char *pA, *ff = new char[strlen(font)+1]; strcpy(ff,font); llen *= 1.5; @@@ -503,12 -514,12 +545,21 @@@ w = w>j ? w:j; } w = (w + llen*1.1f); // add space for lines ++<<<<<<< HEAD + + bool rel = true; + if((pA=strchr(ff,'A'))) + { + *pA = 'L'; + rel = false; ++======= + + bool rel = true; + if((pA=strchr(ff,'A'))) + { + *pA = 'L'; + rel = false; ++>>>>>>> upstream/1.11.1.1 } Push(); Identity(rel); // memcpy(B,B1,9*sizeof(mreal)); if(LegendBox) // draw bounding box @@@ -536,12 -547,12 +587,21 @@@ // ScalePoint(pp[0],pp[1],pp[2]); ScalePoint(pp[3],pp[4],pp[5]); ScalePoint(pp[6],pp[7],pp[8]); pPos=0; curv_plot(2,pp,0); ++<<<<<<< HEAD + if(m) for(int j=0;j>>>>>> upstream/1.11.1.1 } SelectPen(TranspType!=2 ? "k-1":"w-1"); Putsw(mglPoint(x+(style[i][0]!=0?llen:0), y+i*h+0.3f*h, s3), text[i], ff, size); diff --cc mgl/mgl_crust.cpp index d25fd25,ff87b8c..41d770f --- a/mgl/mgl_crust.cpp +++ b/mgl/mgl_crust.cpp @@@ -81,33 -81,20 +81,49 @@@ void mglGraph::TriPlot(const mglData &n void mglGraph::tricont_line(mreal val, long i, long k1, long k2, long k3, const mglData &x, const mglData &y, const mglData &z, const mglData &a, mreal zVal) { ++<<<<<<< HEAD + mreal d1,d2,p1[3],p2[3],c1[4],c2[4]; ++======= + mreal d1,d2,pp[6]; ++>>>>>>> upstream/1.11.1.1 mglColor q1,q2,q3; d1 = _d(val,z.a[k1],z.a[k2]); d2 = _d(val,z.a[k1],z.a[k3]); if(d1<0 || d1>1 || d2<0 || d2>1) return; ++<<<<<<< HEAD + p1[2] = p2[2] = zVal; + + p1[0] = x.a[k1]*(1-d1)+x.a[k2]*d1; + p1[1] = y.a[k1]*(1-d1)+y.a[k2]*d1; + if(!ScalePoint(p1[0],p1[1],p1[2])) return; + p2[0] = x.a[k1]*(1-d2)+x.a[k3]*d2; + p2[1] = y.a[k1]*(1-d2)+y.a[k3]*d2; + if(!ScalePoint(p1[0],p1[1],p1[2])) return; + if(a.nx==x.nx) + { + q1 = GetC(a.a[k1]); q2 = GetC(a.a[k2]); q3 = GetC(a.a[k3]); + c1[0] = q1.r*(1-d1)+q2.r*d1; c2[0] = q1.r*(1-d2)+q3.r*d2; + c1[2] = q1.g*(1-d1)+q2.g*d1; c2[2] = q1.g*(1-d2)+q3.g*d2; + c1[3] = q1.b*(1-d1)+q2.b*d1; c2[3] = q1.b*(1-d2)+q3.b*d2; + c1[3]=c2[3]=1; + } + else + { + q1 = GetC(a.a[i]); c1[0]=q1.r; c1[1]=q1.g; c1[2]=q1.b; c1[3]=1; + memcpy(c2,c1,4*sizeof(mreal)); + } + line_plot(p1,p2,c1,c2); ++======= + pp[2] = pp[5] = zVal; + + pp[0] = x.a[k1]*(1-d1)+x.a[k2]*d1; + pp[1] = y.a[k1]*(1-d1)+y.a[k2]*d1; + if(!ScalePoint(pp[0],pp[1],pp[2])) return; + pp[3] = x.a[k1]*(1-d2)+x.a[k3]*d2; + pp[4] = y.a[k1]*(1-d2)+y.a[k3]*d2; + if(!ScalePoint(pp[3],pp[4],pp[5])) return; + curv_plot(2,pp,0); ++>>>>>>> upstream/1.11.1.1 } //----------------------------------------------------------------------------- void mglGraph::TriContV(const mglData &v, const mglData &nums, const mglData &x, const mglData &y, const mglData &z, const mglData &a, const char *sch,mreal zVal) @@@ -126,6 -113,7 +142,10 @@@ k2 = long(nums.a[3*i+1]+0.1); if(k2<0 || k2>=n) continue; k3 = long(nums.a[3*i+2]+0.1); if(k3<0 || k3>=n) continue; val = isnan(zVal) ? v.a[k] : zVal; ++<<<<<<< HEAD ++======= + DefColor(GetC(v.a[k])); ++>>>>>>> upstream/1.11.1.1 tricont_line(v.a[k], i,k1,k2,k3,x,y,z,a,val); tricont_line(v.a[k], i,k2,k1,k3,x,y,z,a,val); tricont_line(v.a[k], i,k3,k2,k1,x,y,z,a,val); @@@ -133,7 -121,7 +153,11 @@@ } //----------------------------------------------------------------------------- void mglGraph::TriCont(const mglData &nums, const mglData &x, const mglData &y, const mglData &z, const mglData &a, const char *sch, int Num, mreal zVal) ++<<<<<<< HEAD +{ ++======= + { ++>>>>>>> upstream/1.11.1.1 if(Num<1) { SetWarn(mglWarnCnt,"Cont"); return; } mglData v(Num); for(long i=0;i #include #include ++<<<<<<< HEAD +#include ++======= + #include ++>>>>>>> upstream/1.11.1.1 #ifdef HAVE_HDF5 #include #endif #ifdef HAVE_HDF4 ++<<<<<<< HEAD +#define intf hdf4_intf +#include +#undef intf ++======= + #define intf hdf4_intf + #include + #undef intf ++>>>>>>> upstream/1.11.1.1 #endif #ifndef WIN32 @@@ -302,19 -302,19 +312,31 @@@ void mglData::Save(const char *fname,in } fclose(fp); } + //----------------------------------------------------------------------------- + char *mgl_read_gz(gzFile fp) + { + long size=1024,n=0,m; + char *buf=(char*)malloc(size); + while((m=gzread(fp,buf+size*n,size))>0) + { + if(m0) + { + if(m>>>>>> upstream/1.11.1.1 nb = strlen(buf); gzclose(fp); bool first=false,com=false; @@@ -337,7 -337,7 +363,11 @@@ if(buf[i]=='#') while(!isn(buf[i]) && i' ' && !first) first=true; ++<<<<<<< HEAD + if(first && (ch==' ' || ch=='\t') && buf[i+1]>' ') k++; ++======= + if(first && (ch==' ' || ch=='\t') && buf[i+1]>' ') k++; ++>>>>>>> upstream/1.11.1.1 } first = false; for(i=0;i>>>>>> upstream/1.11.1.1 return Read(fname,k,m,l); } //----------------------------------------------------------------------------- @@@ -382,7 -382,7 +416,11 @@@ bool mglData::Read(const char *fname,in gzFile fp = gzopen(fname,"r"); if(!fp) return false; Create(mx,my,mz); ++<<<<<<< HEAD + char *buf = mgl_read_gz(fp); ++======= + char *buf = mgl_read_gz(fp); ++>>>>>>> upstream/1.11.1.1 long nb = strlen(buf); gzclose(fp); register long i=0, j=0, k=0; @@@ -408,8 -408,8 +446,13 @@@ char *s=buf+j; while(buf[j]>' ' && j=nx*ny*nz) break; ++======= + a[i] = atof(s); + i++; if(i>=nx*ny*nz) break; ++>>>>>>> upstream/1.11.1.1 } free(buf); return true; @@@ -421,7 -421,7 +464,11 @@@ bool mglData::ReadMat(const char *fname gzFile fp = gzopen(fname,"r"); if(!fp) return false; nx = ny = nz = 1; NewId(); ++<<<<<<< HEAD + char *buf = mgl_read_gz(fp); ++======= + char *buf = mgl_read_gz(fp); ++>>>>>>> upstream/1.11.1.1 long nb = strlen(buf); gzclose(fp); register long i=0,j=0; @@@ -912,42 -912,42 +959,81 @@@ void mglData::Fill(const char *eq, mglP } //----------------------------------------------------------------------------- void mglData::ReadHDF4(const char *fname,const char *data) ++<<<<<<< HEAD +{ +#ifdef HAVE_HDF4 + int32 sd = SDstart(fname,DFACC_READ), nn, i; + if(sd==-1) return; // is not a HDF4 file + char name[64]; + SDfileinfo(sd,&nn,&i); + for(i=0;i>>>>>> upstream/1.11.1.1 } //----------------------------------------------------------------------------- #ifdef HAVE_HDF5 @@@ -991,14 -991,14 +1077,22 @@@ void mglData::ReadHDF(const char *fname { hid_t hf,hd,hs; hsize_t dims[3]; ++<<<<<<< HEAD + long rank, res = H5Fis_hdf5(fname); ++======= + long rank, res = H5Fis_hdf5(fname); ++>>>>>>> upstream/1.11.1.1 if(res<=0) { ReadHDF4(fname,data); return; } hf = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT); if(hf<0) return; #ifndef H5_USE_16_API hd = H5Dopen(hf,data,H5P_DEFAULT); #else hd = H5Dopen(hf,data); ++<<<<<<< HEAD +#endif ++======= + #endif ++>>>>>>> upstream/1.11.1.1 if(hd<0) return; hs = H5Dget_space(hd); rank = H5Sget_simple_extent_ndims(hs); diff --cc mgl/mgl_exec.cpp index f0b9c4c,9c9a0a6..e8d02bb --- a/mgl/mgl_exec.cpp +++ b/mgl/mgl_exec.cpp @@@ -1139,13 -1139,13 +1139,23 @@@ int mgls_grad(mglGraph *gr, long , mglA void mglc_grad(wchar_t out[1024], long , mglArg *a, int k[10]) { if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1) ++<<<<<<< HEAD + mglprintf(out,1024,L"gr->Grad(%s, %s, %s, %s, \"%s\", %d, %g);", + a[0].s, a[1].s, a[2].s, a[3].s, k[4]==2?a[4].s:"", k[5]==3?iint(a[5].v):5); + else if(k[0]==1 && k[1]==1 && k[2]==1) + mglprintf(out,1024,L"gr->Grad(%s, %s, %s, \"%s\", %d, %g);", + a[0].s, a[1].s, a[2].s, k[3]==2?a[3].s:"", k[4]==3?iint(a[4].v):5, k[5]==3?a[5].v:NAN); + else if(k[0]==1) + mglprintf(out,1024,L"gr->Grad(%s, \"%s\", %d, %g);", ++======= + mglprintf(out,1024,L"gr->Grad(%s, %s, %s, %s, \"%s\", %d, %g);", + a[0].s, a[1].s, a[2].s, a[3].s, k[4]==2?a[4].s:"", k[5]==3?iint(a[5].v):5); + else if(k[0]==1 && k[1]==1 && k[2]==1) + mglprintf(out,1024,L"gr->Grad(%s, %s, %s, \"%s\", %d, %g);", + a[0].s, a[1].s, a[2].s, k[3]==2?a[3].s:"", k[4]==3?iint(a[4].v):5, k[5]==3?a[5].v:NAN); + else if(k[0]==1) + mglprintf(out,1024,L"gr->Grad(%s, \"%s\", %d, %g);", ++>>>>>>> upstream/1.11.1.1 a[0].s, k[1]==2?a[1].s:"", k[2]==3?iint(a[2].v):5, k[3]==3?a[3].v:NAN); } //----------------------------------------------------------------------------- @@@ -1166,7 -1166,7 +1176,11 @@@ void mglc_fill(wchar_t out[1024], long mglprintf(out,1024,L"%s.Fill(%g, %g, '%c');", a[0].s, a[1].v,a[2].v, k[3]==2?a[3].s[0]:'x'); } //----------------------------------------------------------------------------- ++<<<<<<< HEAD +int mgls_fillsample(mglGraph *gr, long , mglArg *a, int k[10]) ++======= + int mgls_fillsample(mglGraph *, long , mglArg *a, int k[10]) ++>>>>>>> upstream/1.11.1.1 { if(k[0]==1 && k[1]==3 && k[2]==2) a[0].d->FillSample(iint(a[1].v), a[2].s); else return 1; @@@ -1289,7 -1289,7 +1303,11 @@@ int mgls_light(mglGraph *gr, long , mgl else if(k[1]!=3) gr->Light(a[0].v!=0); else if(k[2]==3 && k[3]==3) gr->Light(iint(a[0].v),mglPoint(a[1].v,a[2].v,a[3].v), ++<<<<<<< HEAD + k[4]==2?a[4].s[0]:'w',k[5]==3?a[5].v:0.5,true); ++======= + k[4]==2?a[4].s[0]:'w',k[5]==3?a[5].v:0.5,true,k[6]==3?a[6].v:0); ++>>>>>>> upstream/1.11.1.1 else gr->Light(iint(a[0].v),a[1].v!=0); return 0; } @@@ -1299,7 -1299,8 +1317,12 @@@ void mglc_light(wchar_t out[1024], lon else if(k[0]!=3) return; else if(k[1]!=3) mglprintf(out,1024,L"gr->Light(%s);", a[0].v!=0 ? "true":"false"); else if(k[2]==3 && k[3]==3) ++<<<<<<< HEAD + mglprintf(out,1024,L"gr->Light(%d, mglPoint(%g, %g, %g), '%c', %g, true);", iint(a[0].v), a[1].v, a[2].v, a[3].v, k[4]==2?a[4].s[0]:'w', k[5]==3?a[5].v:0.5); ++======= + mglprintf(out,1024,L"gr->Light(%d, mglPoint(%g, %g, %g), '%c', %g, true, %g);", + iint(a[0].v), a[1].v, a[2].v, a[3].v, k[4]==2?a[4].s[0]:'w', k[5]==3?a[5].v:0.5, k[6]==3?a[6].v:0); ++>>>>>>> upstream/1.11.1.1 else mglprintf(out,1024,L"gr->Light(%d, %s);", iint(a[0].v), a[1].v!=0 ? "true":"false"); } //----------------------------------------------------------------------------- @@@ -1833,7 -1834,7 +1856,11 @@@ int mgls_squeeze(mglGraph *, long , mgl void mglc_squeeze(wchar_t out[1024], long , mglArg *a, int k[10]) { if(k[0]==1 && k[1]==3) ++<<<<<<< HEAD + mglprintf(out,1024,L"%s.Squeeze(%d, %d, %d, %s);", a[0].s, iint(a[1].v), ++======= + mglprintf(out,1024,L"%s.Squeeze(%d, %d, %d, %s);", a[0].s, iint(a[1].v), ++>>>>>>> upstream/1.11.1.1 k[2]==3?iint(a[2].v):1, k[3]==3?iint(a[3].v):1, k[4]==3 && a[4].v>0 ? "true":"false"); } //----------------------------------------------------------------------------- @@@ -2273,8 -2274,8 +2300,13 @@@ int mgls_tricont(mglGraph *gr, long , m gr->TriContV(*(a[0].d),*(a[1].d),*(a[2].d),*(a[3].d),*(a[4].d),*(a[5].d),k[6]==2?a[6].s:0,k[7]==3?a[7].v:NAN); else if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1 && k[4]==1) gr->TriContV(*(a[0].d),*(a[1].d),*(a[2].d),*(a[3].d),*(a[4].d),k[5]==2?a[5].s:0,k[6]==3?a[6].v:NAN); ++<<<<<<< HEAD + else if(k[0]==1 && k[1]==1 && k[2]==1 && k[5]==1) + gr->TriCont(*(a[0].d),*(a[1].d),*(a[2].d),*(a[3].d),k[4]==2?a[4].s:0,k[5]==3?a[5].v:NAN); ++======= + else if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1) + gr->TriCont(*(a[0].d),*(a[1].d),*(a[2].d),*(a[3].d),k[4]==2?a[4].s:0,7,k[5]==3?a[5].v:NAN); ++>>>>>>> upstream/1.11.1.1 else return 1; return 0; } @@@ -2287,7 -2288,7 +2319,11 @@@ void mglc_tricont(wchar_t out[1024], lo mglprintf(out,1024,L"gr->TriContV(%s, %s, %s, %s, %s, \"%s\", %g);", a[0].s, a[1].s, a[2].s, a[3].s, a[4].s, k[5]==2?a[5].s:"",k[6]==3?a[6].v:NAN); else if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1) ++<<<<<<< HEAD + mglprintf(out,1024,L"gr->TriCont(%s, %s, %s, %s, \"%s\", %g);", ++======= + mglprintf(out,1024,L"gr->TriCont(%s, %s, %s, %s, \"%s\", 7, %g);", ++>>>>>>> upstream/1.11.1.1 a[0].s, a[1].s, a[2].s, a[3].s, k[4]==2?a[4].s:"", k[5]==3?a[5].v:NAN); } //----------------------------------------------------------------------------- @@@ -3489,6 -3490,23 +3525,26 @@@ void mglc_roll(wchar_t out[1024], long a[0].s, a[1].s[0], iint(a[2].v)); } //----------------------------------------------------------------------------- ++<<<<<<< HEAD ++======= + int mgls_triangulate(mglGraph *, long , mglArg *a, int k[10]) + { + if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1) + *(a[0].d) = mglTriangulation(*(a[1].d), *(a[2].d), *(a[3].d), k[4]==3?a[4].v:0); + else if(k[0]==1 && k[1]==1 && k[2]==1) + *(a[0].d) = mglTriangulation(*(a[1].d), *(a[2].d), k[3]==3?a[3].v:0); + else return 1; + return 0; + } + void mglc_triangulate(wchar_t out[1024], long , mglArg *a, int k[10]) + { + if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1) + mglprintf(out,1024,L"%s = mglTriangulation(%s, %s, %s, %g);",a[0].s, a[1].s, a[2].s, a[3].s, k[4]==3?a[4].v:0); + else if(k[0]==1 && k[1]==1 && k[2]==1) + mglprintf(out,1024,L"%s = mglTriangulation(%s, %s, %g);",a[0].s, a[1].s, a[2].s, k[3]==3?a[3].v:0); + } + //----------------------------------------------------------------------------- ++>>>>>>> upstream/1.11.1.1 mglCommand mgls_base_cmd[] = { {L"addlegend",L"Add legend entry",L"addlegend 'txt' 'fmt'", mgls_addlegend, mglc_addlegend, false, 2}, {L"addto",L"Add data or number",L"addto Var Dat|Var num", mgls_addto, mglc_addto, false, 3}, @@@ -3680,6 -3698,7 +3736,10 @@@ {L"transparent",L"Switch off transparency",L"transparent val", mgls_transparent, mglc_transparent, false, 2}, //!!! OLD !!! {L"transpose",L"Transpose data array",L"transpose Dat ['dir']", mgls_transpose, mglc_transpose, false, 3}, {L"transptype",L"Set type transparency",L"transptype val", mgls_transptype, mglc_transptype, false, 2}, ++<<<<<<< HEAD ++======= + {L"triangulate",L"Find triangles of randomly placed points",L"triangulate Res Xdat Ydat [er]|Res Xdat Ydat Zdat [er]", mgls_triangulate, mglc_triangulate, true, 3}, ++>>>>>>> upstream/1.11.1.1 {L"tricont",L"Draw contour lines for surface of triangles",L"tricont Vdat Idat Xdat Ydat ['fmt']|Vdat Idat Xdat Ydat Zdat ['fmt']|Vdat Idat Xdat Ydat Zdat Cdat ['fmt'] ", mgls_tricont, mglc_tricont, false, 0}, {L"triplot",L"Draw surface of triangles",L"triplot Idat Xdat Ydat ['fmt']|Idat Xdat Ydat Zdat ['fmt']|Idat Xdat Ydat Zdat Cdat ['fmt'] ", mgls_triplot, mglc_triplot, false, 0}, {L"tube",L"Draw curve by tube",L"tube Ydat Rdat ['fmt' zval]|Ydat rval ['fmt' zval]|Xdat Ydat Rdat ['fmt' zval]|Xdat Ydat rval ['fmt' zval]|Xdat Ydat Zdat Rdat ['fmt']|Xdat Ydat Zdat rval ['fmt']", mgls_tube, mglc_tube, false, 0}, diff --cc mgl/mgl_zb.cpp index c152739,1fdbd96..2029083 --- a/mgl/mgl_zb.cpp +++ b/mgl/mgl_zb.cpp @@@ -837,33 -843,33 +843,53 @@@ void mglGraphAB::mark_plot(mreal *pp, c { case 'P': p[0] = pp[0]-ss; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]-ss; ++<<<<<<< HEAD + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss; p[1] = pp[1]-ss; p[3] = pp[0]-ss; p[4] = pp[1]+ss; + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss; p[1] = pp[1]+ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]+ss; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; + mglGraphAB::line_plot(p,p+3,CDef,CDef); ++======= + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss; p[1] = pp[1]-ss; p[3] = pp[0]-ss; p[4] = pp[1]+ss; + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss; p[1] = pp[1]+ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]+ss; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; + line_plot(p,p+3,CDef,CDef); ++>>>>>>> upstream/1.11.1.1 case '+': p[0] = pp[0]-ss; p[1] = pp[1]; p[3] = pp[0]+ss; p[4] = pp[1]; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); p[0] = pp[0]; p[1] = pp[1]-ss; p[3] = pp[0]; p[4] = pp[1]+ss; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); break; case 'X': p[0] = pp[0]-ss; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]-ss; ++<<<<<<< HEAD + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss; p[1] = pp[1]-ss; p[3] = pp[0]-ss; p[4] = pp[1]+ss; + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss; p[1] = pp[1]+ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]+ss; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; + mglGraphAB::line_plot(p,p+3,CDef,CDef); ++======= + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss; p[1] = pp[1]-ss; p[3] = pp[0]-ss; p[4] = pp[1]+ss; + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss; p[1] = pp[1]+ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]+ss; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; + line_plot(p,p+3,CDef,CDef); ++>>>>>>> upstream/1.11.1.1 case 'x': p[0] = pp[0]-ss; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]+ss; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); p[0] = pp[0]+ss; p[1] = pp[1]-ss; p[3] = pp[0]-ss; p[4] = pp[1]+ss; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); break; case 'S': for(i=long(-ss-1);i<=long(ss+1);i++) for(j=long(-ss-1);j<=long(ss+1);j++) @@@ -884,29 -890,29 +910,37 @@@ pnt_plot(long(pp[0])+i,long(pp[1])+j,zv,cs); case 'd': p[0] = pp[0]; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); p[0] = pp[0]+ss; p[1] = pp[1]; p[3] = pp[0]; p[4] = pp[1]+ss; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); p[0] = pp[0]; p[1] = pp[1]+ss; p[3] = pp[0]-ss; p[4] = pp[1]; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); p[0] = pp[0]-ss; p[1] = pp[1]; p[3] = pp[0]; p[4] = pp[1]-ss; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); + break; + case 'Y': + p[0] = pp[0]; p[1] = pp[1]-ss; p[3] = pp[0]; p[4] = pp[1]; + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-0.8*ss; p[1] = pp[1]+0.6*ss; p[3] = pp[0]; p[4] = pp[1]; + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]+0.8*ss; p[1] = pp[1]+0.6*ss; p[3] = pp[0]; p[4] = pp[1]; + mglGraphAB::line_plot(p,p+3,CDef,CDef); break; + case 'Y': + p[0] = pp[0]; p[1] = pp[1]-ss; p[3] = pp[0]; p[4] = pp[1]; + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-0.8*ss; p[1] = pp[1]+0.6*ss; p[3] = pp[0]; p[4] = pp[1]; + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]+0.8*ss; p[1] = pp[1]+0.6*ss; p[3] = pp[0]; p[4] = pp[1]; + line_plot(p,p+3,CDef,CDef); + break; case '*': p[0] = pp[0]-ss; p[1] = pp[1]; p[3] = pp[0]+ss; p[4] = pp[1]; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); p[0] = pp[0]-0.6*ss; p[1] = pp[1]-0.8*ss; p[3] = pp[0]+0.6*ss; p[4] = pp[1]+0.8*ss; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); p[0] = pp[0]-0.6*ss; p[1] = pp[1]+0.8*ss; p[3] = pp[0]+0.6*ss; p[4] = pp[1]-0.8*ss; - line_plot(p,p+3,CDef,CDef); + mglGraphAB::line_plot(p,p+3,CDef,CDef); break; case 'T': for(i=long(-ss-1);i<=long(ss+1);i++) for(j=long(-ss/2-1);j<=long(ss+1);j++) @@@ -938,11 -944,11 +972,19 @@@ pnt_plot(long(pp[0])+j,long(pp[1])+i,zv,cs); case '<': p[0] = pp[0]+ss/2; p[1] = pp[1]-ss; p[3] = pp[0]-ss; p[4] = pp[1]; ++<<<<<<< HEAD + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]+ss/2; p[1] = pp[1]+ss; p[3] = pp[0]-ss; p[4] = pp[1]; + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = p[3] = pp[0]+ss/2; p[1] = pp[1]-ss; p[4] = pp[1]+ss; + mglGraphAB::line_plot(p,p+3,CDef,CDef); ++======= + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]+ss/2; p[1] = pp[1]+ss; p[3] = pp[0]-ss; p[4] = pp[1]; + line_plot(p,p+3,CDef,CDef); + p[0] = p[3] = pp[0]+ss/2; p[1] = pp[1]-ss; p[4] = pp[1]+ss; + line_plot(p,p+3,CDef,CDef); ++>>>>>>> upstream/1.11.1.1 break; case 'R': for(i=long(-ss-1);i<=long(ss+1);i++) for(j=long(-ss/2-1);j<=long(ss+1);j++) @@@ -950,11 -956,11 +992,19 @@@ pnt_plot(long(pp[0])+j,long(pp[1])+i,zv,cs); case '>': p[0] = pp[0]-ss/2; p[1] = pp[1]-ss; p[3] = pp[0]+ss; p[4] = pp[1]; ++<<<<<<< HEAD + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss/2; p[1] = pp[1]+ss; p[3] = pp[0]+ss; p[4] = pp[1]; + mglGraphAB::line_plot(p,p+3,CDef,CDef); + p[0] = p[3] = pp[0]-ss/2; p[1] = pp[1]-ss; p[4] = pp[1]+ss; + mglGraphAB::line_plot(p,p+3,CDef,CDef); ++======= + line_plot(p,p+3,CDef,CDef); + p[0] = pp[0]-ss/2; p[1] = pp[1]+ss; p[3] = pp[0]+ss; p[4] = pp[1]; + line_plot(p,p+3,CDef,CDef); + p[0] = p[3] = pp[0]-ss/2; p[1] = pp[1]-ss; p[4] = pp[1]+ss; + line_plot(p,p+3,CDef,CDef); ++>>>>>>> upstream/1.11.1.1 break; case 'O': for(i=long(-ss);i<=long(ss);i++) for(j=long(-ss);j<=long(ss);j++) diff --cc mgl/mgl_zb2.cpp index 1c2f7a0,10c192d..51547c4 --- a/mgl/mgl_zb2.cpp +++ b/mgl/mgl_zb2.cpp @@@ -728,7 -728,7 +728,11 @@@ void mglGraphAB::glyph_fill(mreal x,mre PostScale(p,3); p[2]+=pw; p[5]+=pw; p[8]+=pw; bool ul=UseLight; UseLight=false; ++<<<<<<< HEAD + mglGraphAB::trig_plot(p,p+3,p+6,c,c,c); ++======= + mglGraphAB::trig_plot(p,p+3,p+6,c,c,c); ++>>>>>>> upstream/1.11.1.1 UseLight=ul; } } diff --cc texinfo/Makefile.am index 82ec329,d35c1b3..6cefa14 --- a/texinfo/Makefile.am +++ b/texinfo/Makefile.am @@@ -1,8 -1,7 +1,12 @@@ SUBDIRS = png . CLEANFILES = mathgl_en.info mathgl_en.info-1 mathgl_en.info-2 mathgl_en.info-3 mgl_en.info \ ++<<<<<<< HEAD +mathgl_ru.info mathgl_ru.info-1 mathgl_ru.info-2 mathgl_ru.info-3 mathgl_ru.info-4 mgl_ru.info \ +mgl_ru.info-* ++======= + mathgl_ru.info mathgl_ru.info-1 mathgl_ru.info-2 mathgl_ru.info-3 mathgl_ru.info-4 mgl_ru.info ++>>>>>>> upstream/1.11.1.1 MAKEINFOHTML = texi2html TEXI2PDF = texi2pdf diff --cc texinfo/Makefile.in index 96b3257,38515ef..f4f0762 --- a/texinfo/Makefile.in +++ b/texinfo/Makefile.in @@@ -296,8 -297,7 +297,12 @@@ top_builddir = @top_builddir top_srcdir = @top_srcdir@ SUBDIRS = png . CLEANFILES = mathgl_en.info mathgl_en.info-1 mathgl_en.info-2 mathgl_en.info-3 mgl_en.info \ ++<<<<<<< HEAD +mathgl_ru.info mathgl_ru.info-1 mathgl_ru.info-2 mathgl_ru.info-3 mathgl_ru.info-4 mgl_ru.info \ +mgl_ru.info-* ++======= + mathgl_ru.info mathgl_ru.info-1 mathgl_ru.info-2 mathgl_ru.info-3 mathgl_ru.info-4 mgl_ru.info ++>>>>>>> upstream/1.11.1.1 MAKEINFOHTML = texi2html TEXI2PDF = texi2pdf diff --cc texinfo/mgl_en.texi index 68d7c34,66c5f81..63878e4 --- a/texinfo/mgl_en.texi +++ b/texinfo/mgl_en.texi @@@ -25,10 -25,10 +25,17 @@@ supports it in developing GNU and promo @end quotation @end copying ++<<<<<<< HEAD +@dircategory MathGL documentation system +@direntry +* MathGL: (mathgl). The library for scientific graphics. +@end direntry ++======= + @c @dircategory MathGL documentation system + @c @direntry + @c * MathGL: (mathgl). The library for scientific graphics. + @c @end direntry ++>>>>>>> upstream/1.11.1.1 @titlepage @title MGL script language diff --cc texinfo/mgl_ru.texi index 7a6b702,cee1571..2746e2e --- a/texinfo/mgl_ru.texi +++ b/texinfo/mgl_ru.texi @@@ -27,10 -27,10 +27,17 @@@ supports it in developing GNU and promo @end quotation @end copying ++<<<<<<< HEAD +@dircategory MathGL documentation system +@direntry +* MathGL: (mathgl). The library for scientific graphics. +@end direntry ++======= + @c @dircategory MathGL documentation system + @c @direntry + @c * MathGL: (mathgl). The library for scientific graphics. + @c @end direntry ++>>>>>>> upstream/1.11.1.1 @titlepage @title Язык MGL