Datatip: Fix drag after change graphic_object type from string to integer 91/9391/1
Pedro Arthur [Sat, 6 Oct 2012 22:32:35 +0000 (19:32 -0300)]
Change-Id: I48df94e10691648197ceed18d7905637d7294bb5

37 files changed:
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/datatip/Datatip.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/polyline/Polyline.java
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Gui_Import.def
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/macros/%h_load.sci
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/macros/%h_save.sci
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_datatips_property.c [deleted file]
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_datatips_property.c [deleted file]
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/sci_datatipcreate.cpp
scilab/modules/gui/sci_gateway/cpp/sci_useeditor.cpp
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/cpp/CallDatatipCreateField.cpp [deleted file]
scilab/modules/gui/src/cpp/CallDatatipCreateField.hxx [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipCommon.java
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipCreate.java
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipDelete.java
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipDrag.java
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipMove.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/EntityPicker.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/ObjectSearcher.java
scilab/modules/gui/src/jni/Datatip.giws.xml

index cbaff63..e4b90da 100644 (file)
 #define __GO_UI_MESSAGE__                  295
 #define __GO_UI_MESSAGE_SIZE__             296
 
-#define __GO_DATATIPS__                    297
-#define __GO_DATATIPS_SIZE__               298
-#define __GO_DATATIP_DATA__                299
-#define __GO_DATATIP_ORIENTATION__         300
-#define __GO_DATATIP_3COMPONENT__          301
-#define __GO_DATATIP_AUTOORIENTATION__          302
+#define __GO_DATATIP__                    297
+#define __GO_DATATIP_DATA__                298
+#define __GO_DATATIP_ORIENTATION__         299
+#define __GO_DATATIP_3COMPONENT__          300
+#define __GO_DATATIP_AUTOORIENTATION__          301
 
 
 #endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */
index 65b073f..a41c319 100644 (file)
@@ -250,7 +250,7 @@ public class Datatip extends Text {
      * @return Type as String
      */
     public Integer getType() {
-        return GraphicObjectProperties.__GO_DATATIPS__;
+        return GraphicObjectProperties.__GO_DATATIP__;
     }
 
 }
index d4fe384..23a2797 100644 (file)
@@ -218,7 +218,7 @@ public abstract class GraphicObject implements Cloneable {
                 return Type.PROGRESSIONBAR;
             case __GO_WAITBAR__ :
                 return Type.WAITBAR;
-            case __GO_DATATIPS__:
+            case __GO_DATATIP__:
                 return Type.DATATIP;
             default :
                 return Type.UNKNOWNOBJECT;
index 739c68d..c505022 100644 (file)
@@ -356,12 +356,11 @@ public class GraphicObjectProperties {
     public static final int __GO_UI_MESSAGE__ =             295;
     public static final int __GO_UI_MESSAGE_SIZE__ =        296;
 
-    public static final int __GO_DATATIPS__ =               297;
-    public static final int __GO_DATATIPS_SIZE__ =          298;
-    public static final int __GO_DATATIP_DATA__ =           299;
-    public static final int __GO_DATATIP_ORIENTATION__ =    300;
-    public static final int __GO_DATATIP_3COMPONENT__ =     301;
-    public static final int __GO_DATATIP_AUTOORIENTATION__ =     302;
+    public static final int __GO_DATATIP__ =               297;
+    public static final int __GO_DATATIP_DATA__ =           298;
+    public static final int __GO_DATATIP_ORIENTATION__ =    299;
+    public static final int __GO_DATATIP_3COMPONENT__ =     300;
+    public static final int __GO_DATATIP_AUTOORIENTATION__ =     301;
 
 
 }
index 9044e68..e1f6748 100644 (file)
@@ -30,7 +30,7 @@ public class Polyline extends ClippableContouredObject {
     /** Polyline properties names */
     private enum PolylineProperty { CLOSED, ARROWSIZEFACTOR, POLYLINESTYLE,
                                     INTERPCOLORVECTOR, INTERPCOLORVECTORSET, INTERPCOLORMODE,
-                                    XSHIFT, YSHIFT, ZSHIFT, BARWIDTH, DATATIPS, DATATIPSSIZE
+                                    XSHIFT, YSHIFT, ZSHIFT, BARWIDTH
                                   };
 
     /** Specifies whether the polyline is closed */
@@ -63,8 +63,6 @@ public class Polyline extends ClippableContouredObject {
     /** Bar width */
     private double barWidth;
 
-    /** Datatips property */
-    private Double[] datatips;
 
     /** Constructor */
     public Polyline() {
@@ -79,7 +77,6 @@ public class Polyline extends ClippableContouredObject {
         yShift = null;
         zShift = null;
         barWidth = 0.0;
-        datatips = new Double[0];
     }
 
     @Override
@@ -114,10 +111,6 @@ public class Polyline extends ClippableContouredObject {
                 return PolylineProperty.ZSHIFT;
             case __GO_BAR_WIDTH__ :
                 return PolylineProperty.BARWIDTH;
-            case __GO_DATATIPS__:
-                return PolylineProperty.DATATIPS;
-            case __GO_DATATIPS_SIZE__:
-                return PolylineProperty.DATATIPSSIZE;
             default :
                 return super.getPropertyFromName(propertyName);
         }
@@ -149,10 +142,6 @@ public class Polyline extends ClippableContouredObject {
             return getZShift();
         } else if (property == PolylineProperty.BARWIDTH) {
             return getBarWidth();
-        } else if (property == PolylineProperty.DATATIPS) {
-            return getDatatips();
-        } else if (property == PolylineProperty.DATATIPSSIZE) {
-            return getDatatipsSize();
         } else {
             return super.getProperty(property);
         }
@@ -186,8 +175,6 @@ public class Polyline extends ClippableContouredObject {
                 setZShift((double[]) value);
             } else if (property == PolylineProperty.BARWIDTH) {
                 setBarWidth((Double) value);
-            } else if (property == PolylineProperty.DATATIPS) {
-                setDatatips((Double[]) value);
             } else {
                 return super.setProperty(property, value);
             }
@@ -359,28 +346,6 @@ public class Polyline extends ClippableContouredObject {
     }
 
     /**
-    * @param datatips datatips coordinates
-     */
-    public void setDatatips(Double[] datatips) {
-        this.datatips = datatips;
-    }
-
-    /**
-    * @return the datatips coordinates
-     */
-    public Double[] getDatatips() {
-        return datatips;
-    }
-
-    /**
-    * Return the number of datatips
-    * @return the number of datatips
-    */
-    public int getDatatipsSize() {
-        return datatips.length / 2;
-    }
-
-    /**
      * @return Type as String
      */
     public Integer getType() {
index cdd3d81..295d5d1 100644 (file)
 @DECLARE@ __GO_UI_MESSAGE__ @EQUAL@             295 @END@
 @DECLARE@ __GO_UI_MESSAGE_SIZE__ @EQUAL@        296 @END@
 
-@DECLARE@ __GO_DATATIPS__ @EQUAL@               297 @END@
-@DECLARE@ __GO_DATATIPS_SIZE__ @EQUAL@          298 @END@
-@DECLARE@ __GO_DATATIP_DATA__ @EQUAL@           299 @END@
-@DECLARE@ __GO_DATATIP_ORIENTATION__ @EQUAL@    300 @END@
-@DECLARE@ __GO_DATATIP_3COMPONENT__ @EQUAL@     301 @END@
-@DECLARE@ __GO_DATATIP_AUTOORIENTATION__ @EQUAL@     302 @END@
+@DECLARE@ __GO_DATATIP__ @EQUAL@               297 @END@
+@DECLARE@ __GO_DATATIP_DATA__ @EQUAL@           298 @END@
+@DECLARE@ __GO_DATATIP_ORIENTATION__ @EQUAL@    299 @END@
+@DECLARE@ __GO_DATATIP_3COMPONENT__ @EQUAL@     300 @END@
+@DECLARE@ __GO_DATATIP_AUTOORIENTATION__ @EQUAL@     301 @END@
 
index a37536f..d7e8c7f 100644 (file)
@@ -42,7 +42,6 @@ getJxgetmouseXCoordinate
 getJxgetmouseMouseButtonNumber
 CallJxgetmouse
 CallJxgetmouseWithOptions
-CallDatatipCreateField
 setMenuParent
 SetUicontrolPosition
 SetConsoleShowHiddenHandles
index 18adeb2..bcac778 100644 (file)
@@ -43,7 +43,6 @@ src/c/getHandleProperty/get_current_axes_property.c \
 src/c/getHandleProperty/get_bar_width_property.c \
 src/c/getHandleProperty/get_font_color_property.c \
 src/c/getHandleProperty/get_default_axes_property.c \
-src/c/getHandleProperty/get_datatips_property.c \
 src/c/getHandleProperty/get_y_shift_property.c \
 src/c/getHandleProperty/get_immediate_drawing_property.c \
 src/c/getHandleProperty/get_current_entity_property.c \
@@ -201,7 +200,6 @@ src/c/getHandleProperty/set_font_foreground_property.c \
 src/c/getHandleProperty/set_text_box_mode_property.c \
 src/c/getHandleProperty/set_bar_layout_property.c \
 src/c/getHandleProperty/set_bar_width_property.c \
-src/c/getHandleProperty/set_datatips_property.c \
 src/c/getHandleProperty/SetPropertyStatus.c \
 src/c/getHandleProperty/set_font_style_property.c \
 src/c/getHandleProperty/set_surface_mode_property.c \
index aba0a77..066d8e0 100644 (file)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -129,12 +112,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscigraphics_la_etcdir)" \
        "$(DESTDIR)$(libscigraphics_la_rootdir)" \
@@ -160,7 +137,6 @@ am__objects_1 = libscigraphics_algo_la-GetCommandArg.lo \
        libscigraphics_algo_la-get_bar_width_property.lo \
        libscigraphics_algo_la-get_font_color_property.lo \
        libscigraphics_algo_la-get_default_axes_property.lo \
-       libscigraphics_algo_la-get_datatips_property.lo \
        libscigraphics_algo_la-get_y_shift_property.lo \
        libscigraphics_algo_la-get_immediate_drawing_property.lo \
        libscigraphics_algo_la-get_current_entity_property.lo \
@@ -318,7 +294,6 @@ am__objects_1 = libscigraphics_algo_la-GetCommandArg.lo \
        libscigraphics_algo_la-set_text_box_mode_property.lo \
        libscigraphics_algo_la-set_bar_layout_property.lo \
        libscigraphics_algo_la-set_bar_width_property.lo \
-       libscigraphics_algo_la-set_datatips_property.lo \
        libscigraphics_algo_la-SetPropertyStatus.lo \
        libscigraphics_algo_la-set_font_style_property.lo \
        libscigraphics_algo_la-set_surface_mode_property.lo \
@@ -531,11 +506,6 @@ SOURCES = $(libscigraphics_algo_la_SOURCES) \
 DIST_SOURCES = $(libscigraphics_algo_la_SOURCES) \
        $(libscigraphics_disable_la_SOURCES) \
        $(libscigraphics_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DATA = $(libscigraphics_la_etc_DATA) $(libscigraphics_la_root_DATA) \
        $(libscigraphics_la_sci_gateway_DATA) \
        $(nobase_libscigraphics_la_ged_DATA)
@@ -826,7 +796,6 @@ src/c/getHandleProperty/get_current_axes_property.c \
 src/c/getHandleProperty/get_bar_width_property.c \
 src/c/getHandleProperty/get_font_color_property.c \
 src/c/getHandleProperty/get_default_axes_property.c \
-src/c/getHandleProperty/get_datatips_property.c \
 src/c/getHandleProperty/get_y_shift_property.c \
 src/c/getHandleProperty/get_immediate_drawing_property.c \
 src/c/getHandleProperty/get_current_entity_property.c \
@@ -984,7 +953,6 @@ src/c/getHandleProperty/set_font_foreground_property.c \
 src/c/getHandleProperty/set_text_box_mode_property.c \
 src/c/getHandleProperty/set_bar_layout_property.c \
 src/c/getHandleProperty/set_bar_width_property.c \
-src/c/getHandleProperty/set_datatips_property.c \
 src/c/getHandleProperty/SetPropertyStatus.c \
 src/c/getHandleProperty/set_font_style_property.c \
 src/c/getHandleProperty/set_surface_mode_property.c \
@@ -1373,7 +1341,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
        esac;
-$(top_srcdir)/Makefile.incl.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1394,6 +1361,7 @@ clean-noinstLTLIBRARIES:
        done
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
+       test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
        @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1401,8 +1369,6 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
-         echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
        }
@@ -1424,11 +1390,11 @@ clean-pkglibLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-libscigraphics-algo.la: $(libscigraphics_algo_la_OBJECTS) $(libscigraphics_algo_la_DEPENDENCIES) $(EXTRA_libscigraphics_algo_la_DEPENDENCIES) 
+libscigraphics-algo.la: $(libscigraphics_algo_la_OBJECTS) $(libscigraphics_algo_la_DEPENDENCIES) 
        $(LINK) $(am_libscigraphics_algo_la_rpath) $(libscigraphics_algo_la_OBJECTS) $(libscigraphics_algo_la_LIBADD) $(LIBS)
-libscigraphics-disable.la: $(libscigraphics_disable_la_OBJECTS) $(libscigraphics_disable_la_DEPENDENCIES) $(EXTRA_libscigraphics_disable_la_DEPENDENCIES) 
+libscigraphics-disable.la: $(libscigraphics_disable_la_OBJECTS) $(libscigraphics_disable_la_DEPENDENCIES) 
        $(LINK) -rpath $(pkglibdir) $(libscigraphics_disable_la_OBJECTS) $(libscigraphics_disable_la_LIBADD) $(LIBS)
-libscigraphics.la: $(libscigraphics_la_OBJECTS) $(libscigraphics_la_DEPENDENCIES) $(EXTRA_libscigraphics_la_DEPENDENCIES) 
+libscigraphics.la: $(libscigraphics_la_OBJECTS) $(libscigraphics_la_DEPENDENCIES) 
        $(LINK) $(am_libscigraphics_la_rpath) $(libscigraphics_la_OBJECTS) $(libscigraphics_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -1505,7 +1471,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_data_mapping_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_data_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_datatip_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_datatips_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_default_axes_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_default_figure_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_event_handler_enable_property.Plo@am__quote@
@@ -1651,7 +1616,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_data_mapping_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_data_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_datatip_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_datatips_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_default_values_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_event_handler_enable_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_event_handler_property.Plo@am__quote@
@@ -1956,13 +1920,6 @@ libscigraphics_algo_la-get_default_axes_property.lo: src/c/getHandleProperty/get
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_default_axes_property.lo `test -f 'src/c/getHandleProperty/get_default_axes_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_default_axes_property.c
 
-libscigraphics_algo_la-get_datatips_property.lo: src/c/getHandleProperty/get_datatips_property.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-get_datatips_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-get_datatips_property.Tpo -c -o libscigraphics_algo_la-get_datatips_property.lo `test -f 'src/c/getHandleProperty/get_datatips_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_datatips_property.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigraphics_algo_la-get_datatips_property.Tpo $(DEPDIR)/libscigraphics_algo_la-get_datatips_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/getHandleProperty/get_datatips_property.c' object='libscigraphics_algo_la-get_datatips_property.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_datatips_property.lo `test -f 'src/c/getHandleProperty/get_datatips_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_datatips_property.c
-
 libscigraphics_algo_la-get_y_shift_property.lo: src/c/getHandleProperty/get_y_shift_property.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-get_y_shift_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-get_y_shift_property.Tpo -c -o libscigraphics_algo_la-get_y_shift_property.lo `test -f 'src/c/getHandleProperty/get_y_shift_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_y_shift_property.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigraphics_algo_la-get_y_shift_property.Tpo $(DEPDIR)/libscigraphics_algo_la-get_y_shift_property.Plo
@@ -3062,13 +3019,6 @@ libscigraphics_algo_la-set_bar_width_property.lo: src/c/getHandleProperty/set_ba
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_bar_width_property.lo `test -f 'src/c/getHandleProperty/set_bar_width_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_bar_width_property.c
 
-libscigraphics_algo_la-set_datatips_property.lo: src/c/getHandleProperty/set_datatips_property.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-set_datatips_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-set_datatips_property.Tpo -c -o libscigraphics_algo_la-set_datatips_property.lo `test -f 'src/c/getHandleProperty/set_datatips_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_datatips_property.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigraphics_algo_la-set_datatips_property.Tpo $(DEPDIR)/libscigraphics_algo_la-set_datatips_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/getHandleProperty/set_datatips_property.c' object='libscigraphics_algo_la-set_datatips_property.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_datatips_property.lo `test -f 'src/c/getHandleProperty/set_datatips_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_datatips_property.c
-
 libscigraphics_algo_la-SetPropertyStatus.lo: src/c/getHandleProperty/SetPropertyStatus.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-SetPropertyStatus.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-SetPropertyStatus.Tpo -c -o libscigraphics_algo_la-SetPropertyStatus.lo `test -f 'src/c/getHandleProperty/SetPropertyStatus.c' || echo '$(srcdir)/'`src/c/getHandleProperty/SetPropertyStatus.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigraphics_algo_la-SetPropertyStatus.Tpo $(DEPDIR)/libscigraphics_algo_la-SetPropertyStatus.Plo
@@ -4434,11 +4384,8 @@ clean-libtool:
        -rm -rf .libs _libs
 install-libscigraphics_la_etcDATA: $(libscigraphics_la_etc_DATA)
        @$(NORMAL_INSTALL)
+       test -z "$(libscigraphics_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_etcdir)"
        @list='$(libscigraphics_la_etc_DATA)'; test -n "$(libscigraphics_la_etcdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscigraphics_la_etcdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_etcdir)" || exit 1; \
-       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -4452,14 +4399,13 @@ uninstall-libscigraphics_la_etcDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(libscigraphics_la_etc_DATA)'; test -n "$(libscigraphics_la_etcdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libscigraphics_la_etcdir)'; $(am__uninstall_files_from_dir)
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscigraphics_la_etcdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscigraphics_la_etcdir)" && rm -f $$files
 install-libscigraphics_la_rootDATA: $(libscigraphics_la_root_DATA)
        @$(NORMAL_INSTALL)
+       test -z "$(libscigraphics_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_rootdir)"
        @list='$(libscigraphics_la_root_DATA)'; test -n "$(libscigraphics_la_rootdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscigraphics_la_rootdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_rootdir)" || exit 1; \
-       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -4473,14 +4419,13 @@ uninstall-libscigraphics_la_rootDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(libscigraphics_la_root_DATA)'; test -n "$(libscigraphics_la_rootdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libscigraphics_la_rootdir)'; $(am__uninstall_files_from_dir)
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscigraphics_la_rootdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscigraphics_la_rootdir)" && rm -f $$files
 install-libscigraphics_la_sci_gatewayDATA: $(libscigraphics_la_sci_gateway_DATA)
        @$(NORMAL_INSTALL)
+       test -z "$(libscigraphics_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_sci_gatewaydir)"
        @list='$(libscigraphics_la_sci_gateway_DATA)'; test -n "$(libscigraphics_la_sci_gatewaydir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscigraphics_la_sci_gatewaydir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_sci_gatewaydir)" || exit 1; \
-       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -4494,21 +4439,20 @@ uninstall-libscigraphics_la_sci_gatewayDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(libscigraphics_la_sci_gateway_DATA)'; test -n "$(libscigraphics_la_sci_gatewaydir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libscigraphics_la_sci_gatewaydir)'; $(am__uninstall_files_from_dir)
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscigraphics_la_sci_gatewaydir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscigraphics_la_sci_gatewaydir)" && rm -f $$files
 install-nobase_libscigraphics_la_gedDATA: $(nobase_libscigraphics_la_ged_DATA)
        @$(NORMAL_INSTALL)
+       test -z "$(libscigraphics_la_geddir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_geddir)"
        @list='$(nobase_libscigraphics_la_ged_DATA)'; test -n "$(libscigraphics_la_geddir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscigraphics_la_geddir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_geddir)" || exit 1; \
-       fi; \
        $(am__nobase_list) | while read dir files; do \
          xfiles=; for file in $$files; do \
            if test -f "$$file"; then xfiles="$$xfiles $$file"; \
            else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
          test -z "$$xfiles" || { \
            test "x$$dir" = x. || { \
-             echo " $(MKDIR_P) '$(DESTDIR)$(libscigraphics_la_geddir)/$$dir'"; \
+             echo "$(MKDIR_P) '$(DESTDIR)$(libscigraphics_la_geddir)/$$dir'"; \
              $(MKDIR_P) "$(DESTDIR)$(libscigraphics_la_geddir)/$$dir"; }; \
            echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(libscigraphics_la_geddir)/$$dir'"; \
            $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(libscigraphics_la_geddir)/$$dir" || exit $$?; }; \
@@ -4518,7 +4462,9 @@ uninstall-nobase_libscigraphics_la_gedDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(nobase_libscigraphics_la_ged_DATA)'; test -n "$(libscigraphics_la_geddir)" || list=; \
        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-       dir='$(DESTDIR)$(libscigraphics_la_geddir)'; $(am__uninstall_files_from_dir)
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscigraphics_la_geddir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscigraphics_la_geddir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -4620,15 +4566,10 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-       if test -z '$(STRIP)'; then \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-             install; \
-       else \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-       fi
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
index c16516b..ff907e1 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -227,7 +227,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_background_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_bar_layout_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_bar_width_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\get_datatips_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_box_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_callback_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_callback_type_property.c" />
@@ -448,7 +447,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\set_background_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_bar_layout_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_bar_width_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\set_datatips_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_box_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_callback_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_callback_type_property.c" />
@@ -684,4 +682,4 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index c3a74b8..abfdc91 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="src\c\getHandleProperty\get_bar_width_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\get_datatips_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\get_box_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\set_bar_width_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\set_datatips_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\set_box_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index b005064..5ec4ff3 100644 (file)
@@ -581,7 +581,6 @@ function [h,immediate_drawing] = load_graphichandle(fd)
       bar_width = mget( 1, 'dl', fd ) ; // bar_width
     end
 
-    datatips=matrix(mget(mget(1,'il',fd),"dl",fd),-1,3) // datatips
 
     clip_state     = ascii(mget(mget(1,characterFormat,fd),characterFormat,fd)) // clip_state
 
index c943286..a8351ab 100644 (file)
@@ -86,7 +86,6 @@ function %h_p(h)
                 "y_shift = "+bys
                 "z_shift = "+bzs
                 "bar_width = "+sci2exp(h.bar_width)
-                "datatips = matrix "+strcat(string(size(h.datatips)),'x')
                 "clip_state = "+sci2exp(h.clip_state)
                 "clip_box = "+sci2exp(h.clip_box)
                 "user_data = "+fmtuser_data(u)
index 295e44b..7fb7a43 100644 (file)
@@ -291,9 +291,6 @@ function save_graphichandle(h,fd)
     
     mput( h.bar_width, 'dl', fd ) ; // bar_width
 
-    mput(size(h.datatips,'*'),'il',fd); // datatips
-    mput(h.datatips,'dl',fd);
-
     mput(length(h.clip_state),characterFormat,fd); // clip_state
     mput(ascii(h.clip_state),characterFormat,fd);
     if h.clip_state=='on' then
index 71e3c90..14e0294 100644 (file)
@@ -46,7 +46,7 @@ typedef struct
  * don't forget to modify it each time the propertyTable
  * is modified.
  */
-#define NB_PROPERTIES 167
+#define NB_PROPERTIES 166
 
 /**
  * list of all property names and associated functions in scilab
@@ -98,7 +98,6 @@ static getHashTableCouple propertyTable[NB_PROPERTIES] =
     {"mark_background", get_mark_background_property},
     {"bar_layout", get_bar_layout_property},
     {"bar_width", get_bar_width_property},
-    {"datatips", get_datatips_property},
     {"x_shift", get_x_shift_property},
     {"y_shift", get_y_shift_property},
     {"z_shift", get_z_shift_property},
index 8c21dc1..865cfd9 100644 (file)
@@ -52,7 +52,7 @@ typedef struct
 * don't forget to modify it each time the propertyTable
 * is modified.
 */
-#define NB_PROPERTIES 162
+#define NB_PROPERTIES 161
 
 /**
 * list of all property names and associated functions in scilab
@@ -101,7 +101,6 @@ static setHashTableCouple propertyTable[NB_PROPERTIES] =
     {"mark_background", set_mark_background_property},
     {"bar_layout", set_bar_layout_property},
     {"bar_width", set_bar_width_property},
-    {"datatips", set_datatips_property},
     {"x_shift", set_x_shift_property},
     {"y_shift", set_y_shift_property},
     {"z_shift", set_z_shift_property},
index f78e65e..2986422 100644 (file)
@@ -88,7 +88,6 @@ int get_mark_foreground_property(void* _pvCtx, char* pobjUID);
 int get_mark_background_property(void* _pvCtx, char* pobjUID);
 int get_bar_layout_property(void* _pvCtx, char* pobjUID);
 int get_bar_width_property(void* _pvCtx, char* pobjUID);
-int get_datatips_property(void* _pvCtx, char* pobjUID);
 int get_x_shift_property(void* _pvCtx, char* pobjUID);
 int get_y_shift_property(void* _pvCtx, char* pobjUID);
 int get_z_shift_property(void* _pvCtx, char* pobjUID);
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_datatips_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_datatips_property.c
deleted file mode 100644 (file)
index 7c05411..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Gustavo Barbosa Libotte
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-/*------------------------------------------------------------------------*/
-/* file: get_datatips_property.c                                          */
-/* desc: function to retrieve in Scilab the datatips field of a           */
-/*        handle                                                          */
-/*------------------------------------------------------------------------*/
-
-#include "getHandleProperty.h"
-#include "returnProperty.h"
-#include "Scierror.h"
-#include "localization.h"
-
-#include "getGraphicObjectProperty.h"
-#include "graphicObjectProperties.h"
-
-/*--------------------------------------------------------------------------*/
-int get_datatips_property(void* _pvCtx, char* pobjUID)
-{
-    double *pdblDatatips = NULL;
-
-    int iDatatipsSize = 0;
-    int * piDatatipsSize = &iDatatipsSize;
-
-    getGraphicObjectProperty(pobjUID, __GO_DATATIPS_SIZE__, jni_int, (void **)&piDatatipsSize);
-    getGraphicObjectProperty(pobjUID, __GO_DATATIPS__, jni_double_vector, (void **)&pdblDatatips);
-    if ( pdblDatatips == NULL )
-    {
-        Scierror(999, _("'%s' does not exist for this handle.\n"), "datatips");
-        return -1;
-    }
-
-    return sciReturnMatrix(_pvCtx, pdblDatatips, iDatatipsSize, 2);
-}
-/*--------------------------------------------------------------------------*/
index 3709e1c..85e0979 100644 (file)
@@ -30,32 +30,60 @@ static char *getTypeNameFromInt(int _iType)
 {
     switch (_iType)
     {
-    case __GO_ARC__ :                       return "Arc";
-    case __GO_AXES__ :                      return "Axes";
-    case __GO_AXESMODEL__ :                 return "AxesModel";
-    case __GO_AXIS__ :                      return "Axis";
-    case __GO_CHAMP__ :                     return "Champ";
-    case __GO_COMPOUND__ :                  return "Compound";
-    case __GO_FAC3D__ :                     return "Fac3d";
-    case __GO_FEC__ :                       return "Fec";
-    case __GO_FIGURE__ :                    return "Figure";
-    case __GO_FIGUREMODEL__ :               return "FigureModel";
-    case __GO_GRAYPLOT__ :                  return "Grayplot";
-    case __GO_LABEL__ :                     return "Label";
-    case __GO_LEGEND__ :                    return "Legend";
-    case __GO_MATPLOT__ :                   return "Matplot";
-    case __GO_PLOT3D__ :                    return "Plot3d";
-    case __GO_POLYLINE__ :                  return "Polyline";
-    case __GO_RECTANGLE__ :                 return "Rectangle";
-    case __GO_SEGS__ :                      return "Segs";
-    case __GO_TEXT__ :                      return "Text";
-    case __GO_UICONTROL__ :                 return "uicontrol";
-    case __GO_UIMENU__ :                    return "uimenu";
-    case __GO_UICONTEXTMENU__ :             return "uicontextmenu";
-    case __GO_CONSOLE__ :                   return "Console";
-    case __GO_SHOWHIDDENHANDLES__ :         return "ShowHiddenHandles";
-    case __GO_WAITBAR__ :                   return "Waitbar";
-    default :                               return "????";
+        case __GO_ARC__ :
+            return "Arc";
+        case __GO_AXES__ :
+            return "Axes";
+        case __GO_AXESMODEL__ :
+            return "AxesModel";
+        case __GO_AXIS__ :
+            return "Axis";
+        case __GO_CHAMP__ :
+            return "Champ";
+        case __GO_COMPOUND__ :
+            return "Compound";
+        case __GO_FAC3D__ :
+            return "Fac3d";
+        case __GO_FEC__ :
+            return "Fec";
+        case __GO_FIGURE__ :
+            return "Figure";
+        case __GO_FIGUREMODEL__ :
+            return "FigureModel";
+        case __GO_GRAYPLOT__ :
+            return "Grayplot";
+        case __GO_LABEL__ :
+            return "Label";
+        case __GO_LEGEND__ :
+            return "Legend";
+        case __GO_MATPLOT__ :
+            return "Matplot";
+        case __GO_PLOT3D__ :
+            return "Plot3d";
+        case __GO_POLYLINE__ :
+            return "Polyline";
+        case __GO_RECTANGLE__ :
+            return "Rectangle";
+        case __GO_SEGS__ :
+            return "Segs";
+        case __GO_TEXT__ :
+            return "Text";
+        case __GO_UICONTROL__ :
+            return "uicontrol";
+        case __GO_UIMENU__ :
+            return "uimenu";
+        case __GO_UICONTEXTMENU__ :
+            return "uicontextmenu";
+        case __GO_CONSOLE__ :
+            return "Console";
+        case __GO_SHOWHIDDENHANDLES__ :
+            return "ShowHiddenHandles";
+        case __GO_WAITBAR__ :
+            return "Waitbar";
+        case __GO_DATATIP__:
+            return "Datatip";
+        default :
+            return "????";
     }
 }
 
index 4f04a40..bdc9b92 100644 (file)
@@ -86,7 +86,6 @@ int set_mark_size_property(void* _pvCtx, char* pobj, size_t stackPointer, int va
 int set_mark_foreground_property(void* _pvCtx, char* pobj, size_t stackPointer, int valueType, int nbRow, int nbCol);
 int set_mark_background_property(void* _pvCtx, char* pobj, size_t stackPointer, int valueType, int nbRow, int nbCol);
 int set_bar_width_property(void* _pvCtx, char* pobj, size_t stackPointer, int valueType, int nbRow, int nbCol);
-int set_datatips_property(void* _pvCtx, char* pobjUID, size_t stackPointer, int valueType, int nbRow, int nbCol );
 int set_bar_layout_property(void* _pvCtx, char* pobj, size_t stackPointer, int valueType, int nbRow, int nbCol);
 int set_x_shift_property(void* _pvCtx, char* pobj, size_t stackPointer, int valueType, int nbRow, int nbCol);
 int set_y_shift_property(void* _pvCtx, char* pobj, size_t stackPointer, int valueType, int nbRow, int nbCol);
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_datatips_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_datatips_property.c
deleted file mode 100644 (file)
index 2a7fad4..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Gustavo Barbosa Libotte
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-/*------------------------------------------------------------------------*/
-/* file: set_datatips_property.c                                          */
-/* desc: function to modify in Scilab the datatips field of               */
-/*        a handle                                                        */
-/*------------------------------------------------------------------------*/
-
-#include "setHandleProperty.h"
-#include "SetProperty.h"
-#include "getPropertyAssignedValue.h"
-#include "Scierror.h"
-#include "localization.h"
-#include "SetPropertyStatus.h"
-#include "MALLOC.h"
-
-#include "setGraphicObjectProperty.h"
-#include "getGraphicObjectProperty.h"
-#include "graphicObjectProperties.h"
-
-#include "CallDatatipCreateField.h"
-
-/*------------------------------------------------------------------------*/
-int set_datatips_property(void* _pvCtx, char* pobjUID, size_t stackPointer, int valueType, int nbRow, int nbCol)
-{
-    BOOL status = FALSE;
-    double* currentDatatipsCoords;
-    double* newDatatipsCoords;
-    double *pvecx;
-    int nPoints = 0;
-    int *piNPoints = &nPoints;
-    int i;
-
-    getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_X__, jni_double_vector, (void**)&pvecx);
-
-    getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_NUM_ELEMENTS__, jni_int, (void**) &piNPoints);
-
-    if ( !( valueType == sci_matrix ) )
-    {
-        Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "datatips");
-        return SET_PROPERTY_ERROR ;
-    }
-
-    if ( !( nbRow * nbCol % 2 == 0 ) )
-    {
-        Scierror(999, _("Wrong number of input arguments for '%s' property: X and Y expected.\n"), "datatips");
-        return SET_PROPERTY_ERROR ;
-    }
-
-    currentDatatipsCoords = getDoubleMatrixFromStack(stackPointer);
-
-    for (i = 0 ; i < nbRow * nbCol ; i = i + 2)
-    {
-        if (currentDatatipsCoords[i] > pvecx[nPoints - 1] || currentDatatipsCoords[i] < pvecx[0])
-        {
-            Scierror(999, _("Invalid input argument for '%s' property: %g is out of bounds.\n"), "datatips", currentDatatipsCoords[i]);
-            return SET_PROPERTY_ERROR ;
-        }
-    }
-
-    newDatatipsCoords = CallDatatipCreateField((char*)pobjUID, currentDatatipsCoords, nbRow * nbCol);
-
-    status = setGraphicObjectProperty(pobjUID, __GO_DATATIPS__, newDatatipsCoords, jni_double_vector, nbRow * nbCol);
-
-    FREE(newDatatipsCoords);
-
-    if (status == TRUE)
-    {
-        return SET_PROPERTY_SUCCEED;
-    }
-    else
-    {
-        Scierror(999, _("'%s' does not exist for this handle.\n"), "datatips");
-        return SET_PROPERTY_ERROR;
-    }
-}
-/*------------------------------------------------------------------------*/
index b1a4e7d..3cece65 100755 (executable)
@@ -134,8 +134,7 @@ src/jni/ScilabDisplayTree.cpp \
 src/jni/EditorManager.cpp \
 src/jni/StartGED.cpp \
 src/jni/DatatipFunctions.cpp \
-src/jni/StartPlotBrowser.cpp \
-src/cpp/CallDatatipCreateField.cpp
+src/jni/StartPlotBrowser.cpp
 
 GIWS_WRAPPERS = \
 src/jni/SwingView.giws.xml \
index bda2944..632c4b3 100644 (file)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -134,12 +117,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscigui_la_etcdir)" \
        "$(DESTDIR)$(libscigui_la_rootdir)" \
@@ -229,8 +206,7 @@ am__objects_2 = libscigui_algo_la-InitUIMenu.lo \
        libscigui_algo_la-EditorManager.lo \
        libscigui_algo_la-StartGED.lo \
        libscigui_algo_la-DatatipFunctions.lo \
-       libscigui_algo_la-StartPlotBrowser.lo \
-       libscigui_algo_la-CallDatatipCreateField.lo
+       libscigui_algo_la-StartPlotBrowser.lo
 am_libscigui_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscigui_algo_la_OBJECTS = $(am_libscigui_algo_la_OBJECTS)
 @GUI_TRUE@am_libscigui_algo_la_rpath =
@@ -297,11 +273,6 @@ SOURCES = $(libscigui_algo_la_SOURCES) $(libscigui_disable_la_SOURCES) \
        $(libscigui_la_SOURCES)
 DIST_SOURCES = $(libscigui_algo_la_SOURCES) \
        $(libscigui_disable_la_SOURCES) $(libscigui_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DATA = $(libscigui_la_etc_DATA) $(libscigui_la_root_DATA) \
        $(libscigui_la_sci_gateway_DATA) \
        $(nobase_libscigui_la_icons_DATA)
@@ -680,8 +651,7 @@ src/jni/ScilabDisplayTree.cpp \
 src/jni/EditorManager.cpp \
 src/jni/StartGED.cpp \
 src/jni/DatatipFunctions.cpp \
-src/jni/StartPlotBrowser.cpp \
-src/cpp/CallDatatipCreateField.cpp
+src/jni/StartPlotBrowser.cpp
 
 GIWS_WRAPPERS = \
 src/jni/SwingView.giws.xml \
@@ -1032,7 +1002,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
        esac;
-$(top_srcdir)/Makefile.incl.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1053,6 +1022,7 @@ clean-noinstLTLIBRARIES:
        done
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
+       test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
        @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1060,8 +1030,6 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
-         echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
        }
@@ -1083,11 +1051,11 @@ clean-pkglibLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-libscigui-algo.la: $(libscigui_algo_la_OBJECTS) $(libscigui_algo_la_DEPENDENCIES) $(EXTRA_libscigui_algo_la_DEPENDENCIES) 
+libscigui-algo.la: $(libscigui_algo_la_OBJECTS) $(libscigui_algo_la_DEPENDENCIES) 
        $(CXXLINK) $(am_libscigui_algo_la_rpath) $(libscigui_algo_la_OBJECTS) $(libscigui_algo_la_LIBADD) $(LIBS)
-libscigui-disable.la: $(libscigui_disable_la_OBJECTS) $(libscigui_disable_la_DEPENDENCIES) $(EXTRA_libscigui_disable_la_DEPENDENCIES) 
+libscigui-disable.la: $(libscigui_disable_la_OBJECTS) $(libscigui_disable_la_DEPENDENCIES) 
        $(LINK) -rpath $(pkglibdir) $(libscigui_disable_la_OBJECTS) $(libscigui_disable_la_LIBADD) $(LIBS)
-libscigui.la: $(libscigui_la_OBJECTS) $(libscigui_la_DEPENDENCIES) $(EXTRA_libscigui_la_DEPENDENCIES) 
+libscigui.la: $(libscigui_la_OBJECTS) $(libscigui_la_DEPENDENCIES) 
        $(CXXLINK) $(am_libscigui_la_rpath) $(libscigui_la_OBJECTS) $(libscigui_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -1098,7 +1066,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-CallClipboard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-CallColorChooser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-CallDatatipCreateField.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-CallFontChooser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-CallHelpBrowser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-CallJuigetfile.Plo@am__quote@
@@ -2040,13 +2007,6 @@ libscigui_algo_la-StartPlotBrowser.lo: src/jni/StartPlotBrowser.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-StartPlotBrowser.lo `test -f 'src/jni/StartPlotBrowser.cpp' || echo '$(srcdir)/'`src/jni/StartPlotBrowser.cpp
 
-libscigui_algo_la-CallDatatipCreateField.lo: src/cpp/CallDatatipCreateField.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-CallDatatipCreateField.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-CallDatatipCreateField.Tpo -c -o libscigui_algo_la-CallDatatipCreateField.lo `test -f 'src/cpp/CallDatatipCreateField.cpp' || echo '$(srcdir)/'`src/cpp/CallDatatipCreateField.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-CallDatatipCreateField.Tpo $(DEPDIR)/libscigui_algo_la-CallDatatipCreateField.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/CallDatatipCreateField.cpp' object='libscigui_algo_la-CallDatatipCreateField.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-CallDatatipCreateField.lo `test -f 'src/cpp/CallDatatipCreateField.cpp' || echo '$(srcdir)/'`src/cpp/CallDatatipCreateField.cpp
-
 libscigui_la-sci_printsetupbox.lo: sci_gateway/cpp/sci_printsetupbox.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_la-sci_printsetupbox.lo -MD -MP -MF $(DEPDIR)/libscigui_la-sci_printsetupbox.Tpo -c -o libscigui_la-sci_printsetupbox.lo `test -f 'sci_gateway/cpp/sci_printsetupbox.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_printsetupbox.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_la-sci_printsetupbox.Tpo $(DEPDIR)/libscigui_la-sci_printsetupbox.Plo
@@ -2194,11 +2154,8 @@ clean-libtool:
        -rm -rf .libs _libs
 install-libscigui_la_etcDATA: $(libscigui_la_etc_DATA)
        @$(NORMAL_INSTALL)
+       test -z "$(libscigui_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigui_la_etcdir)"
        @list='$(libscigui_la_etc_DATA)'; test -n "$(libscigui_la_etcdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscigui_la_etcdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscigui_la_etcdir)" || exit 1; \
-       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2212,14 +2169,13 @@ uninstall-libscigui_la_etcDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(libscigui_la_etc_DATA)'; test -n "$(libscigui_la_etcdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libscigui_la_etcdir)'; $(am__uninstall_files_from_dir)
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscigui_la_etcdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscigui_la_etcdir)" && rm -f $$files
 install-libscigui_la_rootDATA: $(libscigui_la_root_DATA)
        @$(NORMAL_INSTALL)
+       test -z "$(libscigui_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigui_la_rootdir)"
        @list='$(libscigui_la_root_DATA)'; test -n "$(libscigui_la_rootdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscigui_la_rootdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscigui_la_rootdir)" || exit 1; \
-       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2233,14 +2189,13 @@ uninstall-libscigui_la_rootDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(libscigui_la_root_DATA)'; test -n "$(libscigui_la_rootdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libscigui_la_rootdir)'; $(am__uninstall_files_from_dir)
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscigui_la_rootdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscigui_la_rootdir)" && rm -f $$files
 install-libscigui_la_sci_gatewayDATA: $(libscigui_la_sci_gateway_DATA)
        @$(NORMAL_INSTALL)
+       test -z "$(libscigui_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libscigui_la_sci_gatewaydir)"
        @list='$(libscigui_la_sci_gateway_DATA)'; test -n "$(libscigui_la_sci_gatewaydir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscigui_la_sci_gatewaydir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscigui_la_sci_gatewaydir)" || exit 1; \
-       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2254,21 +2209,20 @@ uninstall-libscigui_la_sci_gatewayDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(libscigui_la_sci_gateway_DATA)'; test -n "$(libscigui_la_sci_gatewaydir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libscigui_la_sci_gatewaydir)'; $(am__uninstall_files_from_dir)
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscigui_la_sci_gatewaydir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscigui_la_sci_gatewaydir)" && rm -f $$files
 install-nobase_libscigui_la_iconsDATA: $(nobase_libscigui_la_icons_DATA)
        @$(NORMAL_INSTALL)
+       test -z "$(libscigui_la_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigui_la_iconsdir)"
        @list='$(nobase_libscigui_la_icons_DATA)'; test -n "$(libscigui_la_iconsdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscigui_la_iconsdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscigui_la_iconsdir)" || exit 1; \
-       fi; \
        $(am__nobase_list) | while read dir files; do \
          xfiles=; for file in $$files; do \
            if test -f "$$file"; then xfiles="$$xfiles $$file"; \
            else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
          test -z "$$xfiles" || { \
            test "x$$dir" = x. || { \
-             echo " $(MKDIR_P) '$(DESTDIR)$(libscigui_la_iconsdir)/$$dir'"; \
+             echo "$(MKDIR_P) '$(DESTDIR)$(libscigui_la_iconsdir)/$$dir'"; \
              $(MKDIR_P) "$(DESTDIR)$(libscigui_la_iconsdir)/$$dir"; }; \
            echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(libscigui_la_iconsdir)/$$dir'"; \
            $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(libscigui_la_iconsdir)/$$dir" || exit $$?; }; \
@@ -2278,7 +2232,9 @@ uninstall-nobase_libscigui_la_iconsDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(nobase_libscigui_la_icons_DATA)'; test -n "$(libscigui_la_iconsdir)" || list=; \
        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-       dir='$(DESTDIR)$(libscigui_la_iconsdir)'; $(am__uninstall_files_from_dir)
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscigui_la_iconsdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscigui_la_iconsdir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -2382,15 +2338,10 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-       if test -z '$(STRIP)'; then \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-             install; \
-       else \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-       fi
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
index e2ea188..2cbd9a2 100755 (executable)
@@ -92,7 +92,6 @@ int sci_datatipcreate(char *fname, unsigned long fname_len)
             /* Create Datatip Using "datatip_handle = datatipCreate(polyline_handle,pt)" */
 
             datatip_handler = DatatipCreate::createDatatipProgramCoord(getScilabJavaVM(), (char*)pstFigureUID, pdblReal, 2);
-            //char* DatatipCreate::createDatatipProgramCoord (JavaVM * jvm_, char const* polylineUid, double const* coordDoubleXY, int coordDoubleXYSize);
         }
 
     }
index 50a6e83..3999d43 100644 (file)
@@ -11,9 +11,9 @@
  *
  */
 
-#include "EditorManager.hxx"
 #include "GiwsException.hxx"
 #include "ScilabView.hxx"
+#include "EditorManager.hxx"
 
 extern "C"
 {
@@ -51,7 +51,7 @@ int sci_useeditor(char *fname, unsigned long fname_len)
 
     if (m1 * n1 != 1)
     {
-        Scierror(999, _("%s: Wrong size for input argument #%d: A integer expected.\n"), fname, m1*n1);
+        Scierror(999, _("%s: Wrong size for input argument #%d: A integer expected.\n"), fname, m1 * n1);
         return FALSE;
     }
 
@@ -88,7 +88,7 @@ int sci_useeditor(char *fname, unsigned long fname_len)
         }
 
     }
-    catch(const GiwsException::JniException & e)
+    catch (const GiwsException::JniException & e)
     {
         Scierror(999, _("%s: A Java exception arisen:\n%s"), fname, e.whatStr().c_str());
         return FALSE;
index 5b6fb1e..aae8852 100755 (executable)
     <ClCompile Include="..\cpp\CallFontChooser.cpp" />
     <ClCompile Include="..\cpp\CallHelpBrowser.cpp" />
     <ClCompile Include="..\cpp\CallJuigetfile.cpp" />
-    <ClCompile Include="..\cpp\CallDatatipCreateField.cpp" />
     <ClCompile Include="..\cpp\CallJxclick.cpp" />
     <ClCompile Include="..\cpp\CallJxgetmouse.cpp" />
     <ClCompile Include="..\cpp\CallMessageBox.cpp" />
     <ClInclude Include="..\..\includes\CallJuigetfile.h" />
     <ClInclude Include="..\..\includes\CallJuigetfile.hxx" />
     <ClInclude Include="..\..\includes\CallJxclick.h" />
-    <ClInclude Include="..\..\includes\CallDatatipCreateField.h" />
     <ClInclude Include="..\..\includes\CallJxgetmouse.h" />
     <ClInclude Include="..\..\includes\CallMessageBox.h" />
     <ClInclude Include="..\..\includes\ContextMenu.h" />
     <ClInclude Include="..\cpp\CallHelpBrowser.hxx" />
     <ClInclude Include="..\cpp\CallJxclick.hxx" />
     <ClInclude Include="..\cpp\CallJxgetmouse.hxx" />
-    <ClInclude Include="..\cpp\CallDatatipCreateField.hxx" />
     <ClInclude Include="..\cpp\CallMainWindow.hxx" />
     <ClInclude Include="..\cpp\CallMessageBox.hxx" />
     <ClInclude Include="..\cpp\ContextMenu.hxx" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index d16dc15..83e8b6f 100755 (executable)
@@ -47,9 +47,6 @@
     <ClCompile Include="..\cpp\CallJxclick.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\cpp\CallDatatipCreateField.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\cpp\CallJxgetmouse.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClInclude Include="..\cpp\CallJxgetmouse.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\CallDatatipCreateField.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\cpp\CallMainWindow.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\includes\CallJxclick.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\CallDatatipCreateField.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\includes\CallJxgetmouse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/gui/src/cpp/CallDatatipCreateField.cpp b/scilab/modules/gui/src/cpp/CallDatatipCreateField.cpp
deleted file mode 100644 (file)
index 48d4646..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Gustavo Barbosa Libotte
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-#include "CallDatatipCreateField.hxx"
-
-using namespace org_scilab_modules_gui_datatip;
-
-double* CallDatatipCreateField(char const* polylineUid, double const* coordDoubleXY, int coordDoubleXYSize)
-{
-    return DatatipCreate::createDatatipField(getScilabJavaVM(), polylineUid, coordDoubleXY, coordDoubleXYSize);
-}
diff --git a/scilab/modules/gui/src/cpp/CallDatatipCreateField.hxx b/scilab/modules/gui/src/cpp/CallDatatipCreateField.hxx
deleted file mode 100644 (file)
index 5d71c10..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __CALLDATATIPCREATEFIELD_HXX__
-#define __CALLDATATIPCREATEFIELD_HXX__
-
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Gustavo Barbosa Libotte
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-#include "DatatipFunctions.hxx"
-extern "C" {
-#include "getScilabJavaVM.h"
-#include "CallDatatipCreateField.h"
-}
-
-#endif
index ff8225e..3d40a09 100644 (file)
@@ -49,8 +49,8 @@ public class DatatipCommon {
 
         if (dataX != null) {
             for (int i = 0; i < dataX.length - 1; ++i) {
-                double min = Math.min(dataX[i], dataX[i+1]);
-                double max = Math.max(dataX[i], dataX[i+1]);
+                double min = Math.min(dataX[i], dataX[i + 1]);
+                double max = Math.max(dataX[i], dataX[i + 1]);
 
                 if (x >= min && x <= max) {
                     index = i;
@@ -58,7 +58,7 @@ public class DatatipCommon {
                 }
             }
             if (index == -1) {
-            /* x out of polyline bounds, return the closest segment bound*/
+                /* x out of polyline bounds, return the closest segment bound*/
 
                 double min = Math.min(dataX[0], dataX[dataX.length - 1]);
                 double max = Math.max(dataX[0], dataX[dataX.length - 1]);
@@ -70,7 +70,7 @@ public class DatatipCommon {
                     index = (max == dataX[0]) ? 0 : (dataX.length - 2);
                 }
             }
-            return new Segment(index, dataX[index], dataX[index+1], dataY[index], dataY[index+1]);
+            return new Segment(index, dataX[index], dataX[index + 1], dataY[index], dataY[index + 1]);
         }
         return null;
     }
@@ -88,16 +88,16 @@ public class DatatipCommon {
             if (xDiff != 0.0) {
                 double ca = (seg.y1 - seg.y0) / xDiff;
                 double y = seg.y0 + ca * (x - seg.x0);
-                return new Double[]{x, y, 0.0};
+                return new Double[] {x, y, 0.0};
             } else {
                 /*angular coeficent -> inf, return the first point*/
-                return new Double[]{seg.x0, seg.y0, 0.0};
+                return new Double[] {seg.x0, seg.y0, 0.0};
             }
         } else {
             if (seg.pointIndex == 0) {
-                return new Double[]{seg.x0, seg.y0, 0.0};
+                return new Double[] {seg.x0, seg.y0, 0.0};
             } else {
-                return new Double[]{seg.x1, seg.y1, 0.0};
+                return new Double[] {seg.x1, seg.y1, 0.0};
             }
         }
     }
@@ -107,7 +107,7 @@ public class DatatipCommon {
      */
     public static String getParentPolyline(String datatip) {
         String parent = (String)GraphicController.getController().getProperty(datatip, __GO_PARENT__);
-        String parentType = (String)GraphicController.getController().getProperty(parent, __GO_TYPE__);
+        Integer parentType = (Integer)GraphicController.getController().getProperty(parent, __GO_TYPE__);
         if (parentType.equals(__GO_POLYLINE__)) {
             return parent;
         } else {
@@ -116,12 +116,12 @@ public class DatatipCommon {
     }
 
     /*
-     * Given a pixel coordinate return the transformed axis coordinate 
+     * Given a pixel coordinate return the transformed axis coordinate
      */
     public static double[] getTransformedPosition(String figure, Integer[] pos) {
 
         String axes = AxesHandler.clickedAxes(figure, pos);
-        double[] position = {1.0*pos[0], 1.0*pos[1], 0.0};
+        double[] position = {1.0 * pos[0], 1.0 * pos[1], 0.0};
         return CallRenderer.get2dViewFromPixelCoordinates(axes, position);
     }
 }
index 0504879..e721084 100755 (executable)
@@ -33,15 +33,8 @@ import org.scilab.modules.gui.datatip.DatatipDrag;
  */
 public class DatatipCreate {
 
-    private static Integer[] datatipBounds = new Integer[2];
-    public static Double[] datatipPosition = new Double[3];
-    private static double[] pixelMouseCoordDouble = new double[2];
-    public static double[] coordDoubleXY = new double[] {0.0, 0.0};
-    public static Integer[] coordInteger = new Integer[] {0, 0};
-    public static double[] graphicCoord = new double[3];
-    public static double[] datatipCoordinates = new double[2];
     static EntityPicker ep = new EntityPicker();
-    public static String newDatatip = null;
+
 
 
     /**
@@ -59,8 +52,7 @@ public class DatatipCreate {
         String polylineUid = ep.pick (figureUid, coordIntX, coordIntY);
         String axesUid = datatipAxesHandler(figureUid, pixelMouseCoordInt);
         double[] pixelMouseCoordDouble = transformPixelCoordToDouble(pixelMouseCoordInt);
-        graphicCoord = transformPixelCoordToGraphic(axesUid, pixelMouseCoordDouble);
-        insertPoint (polylineUid, graphicCoord[0], graphicCoord[1]);
+        double[] graphicCoord = transformPixelCoordToGraphic(axesUid, pixelMouseCoordDouble);
         String newDatatip = datatipProperties (graphicCoord, polylineUid);
         return newDatatip;
     }
@@ -90,8 +82,7 @@ public class DatatipCreate {
                 position = new double[] {seg.x0, seg.y0, 0.0};
             }
 
-            insertPoint (polylineUid, position[0], position[1]);
-            newDatatip = datatipProperties (position, polylineUid);
+            String newDatatip = datatipProperties (position, polylineUid);
             return newDatatip;
 
         }
@@ -100,82 +91,6 @@ public class DatatipCreate {
     }
 
 
-    public static double[] createDatatipField (String polylineUid, double[] coordDoubleXY) {
-
-        double[] fieldArray = new double[coordDoubleXY.length];
-
-        String compoundUid = (String) GraphicController.getController().getProperty(polylineUid, GraphicObjectProperties.__GO_PARENT__);
-        String axesUid = (String) GraphicController.getController().getProperty(compoundUid, GraphicObjectProperties.__GO_PARENT__);
-        String figureUid = (String) GraphicController.getController().getProperty(axesUid, GraphicObjectProperties.__GO_PARENT__);
-
-        String[] childrenUid = (String[]) GraphicController.getController().getProperty(polylineUid, GraphicObjectProperties.__GO_CHILDREN__);
-        for (int i = 0 ; i < childrenUid.length ; i++) {
-            Integer objType = (Integer)GraphicController.getController().getProperty(childrenUid[i], GraphicObjectProperties.__GO_TYPE__);
-            if (objType == GraphicObjectProperties.__GO_DATATIPS__) {
-                GraphicController.getController().removeRelationShipAndDelete(childrenUid[i]);
-            }
-        }
-
-        for (int i = 0 ; i < (coordDoubleXY.length / 2) ; i++) {
-            datatipCoordinates[0] = coordDoubleXY[2 * i];
-            datatipCoordinates[1] = coordDoubleXY[2 * i + 1];
-
-            int middleLineFactor = 0;
-            coordInteger = getDatatipPositionInteger (datatipCoordinates, axesUid);
-            int yVerify = 0;
-            Integer[] axesDimension = new Integer[] {0, 0};
-            axesDimension = (Integer[])GraphicController.getController().getProperty(figureUid, GraphicObjectProperties.__GO_AXES_SIZE__);
-
-            String polylineUidEnd = null;
-            for (yVerify = 0 ; yVerify < axesDimension[1] ; yVerify++) {
-                polylineUidEnd = ep.pick (figureUid, coordInteger[0], yVerify);
-                if (polylineUidEnd != null) {
-                    if (polylineUidEnd.equals(polylineUid)) {
-                        middleLineFactor++;
-                    }
-                }
-            }
-
-            if (middleLineFactor < 20) {
-
-                for (yVerify = 0 ; yVerify < axesDimension[1] ; yVerify++) {
-                    polylineUidEnd = ep.pick (figureUid, coordInteger[0], yVerify);
-                    if (polylineUidEnd != null) {
-                        if (polylineUidEnd.equals(polylineUid)) {
-                            break;
-                        }
-                    }
-                }
-
-                Integer newX = 0;
-                Integer newY = 0;
-                newX = coordInteger[0];
-                newY = yVerify + (middleLineFactor / 2);
-
-                Integer[] pixelMouseCoordInt = new Integer[] {0, 0};
-                pixelMouseCoordInt[0] = newX;
-                pixelMouseCoordInt[1] = newY;
-
-                pixelMouseCoordDouble = transformPixelCoordToDouble(pixelMouseCoordInt);
-
-                graphicCoord = transformPixelCoordToGraphic (axesUid, pixelMouseCoordDouble);
-
-                newDatatip = datatipProperties (graphicCoord, polylineUid);
-                fieldArray[i] = graphicCoord[0];
-                fieldArray[i + (coordDoubleXY.length / 2)] = graphicCoord[1];
-
-            } else {
-                graphicCoord[0] = datatipCoordinates[0];
-                graphicCoord[1] = datatipCoordinates[1];
-                newDatatip = datatipProperties (graphicCoord, polylineUid);
-                fieldArray[i] = datatipCoordinates[0];
-                fieldArray[i + (coordDoubleXY.length / 2)] = datatipCoordinates[1];
-            }
-        }
-
-        return fieldArray;
-    }
-
     /**
     * Given an integer index that belongs to the polyline create a datatip.
     *
@@ -192,9 +107,9 @@ public class DatatipCreate {
         } else if (indexPoint <= 0) {
             indexPoint = 1;
         }
+        double[] coordDoubleXY = new double[2];
         coordDoubleXY[0] = DataX[indexPoint - 1];
         coordDoubleXY[1] = DataY[indexPoint - 1];
-        insertPoint (polylineUid, coordDoubleXY[0], coordDoubleXY[1]);
         String newDatatip = datatipProperties(coordDoubleXY, polylineUid);
         return newDatatip;
     }
@@ -219,6 +134,7 @@ public class DatatipCreate {
         int xInt = (int) pixelCoordinates[0];
         int yInt = (int) pixelCoordinates[1];
 
+        Integer[] coordInteger = new Integer[2];
         coordInteger[0] = (Integer) xInt;
         coordInteger[1] = (Integer) yInt;
 
@@ -234,8 +150,7 @@ public class DatatipCreate {
     */
     public static String datatipAxesHandler(String figureUid, Integer[] pixelMouseCoordInt) {
 
-        String axesUid = AxesHandler.clickedAxes(figureUid, pixelMouseCoordInt);
-        return axesUid;
+        return AxesHandler.clickedAxes(figureUid, pixelMouseCoordInt);
     }
 
     /**
@@ -246,6 +161,7 @@ public class DatatipCreate {
     */
     public static double[] transformPixelCoordToDouble(Integer[] pixelMouseCoordInt) {
 
+        double[] pixelMouseCoordDouble = new double[3];
         for (int i = 0 ; i < pixelMouseCoordInt.length ; i++) {
             pixelMouseCoordDouble[i] = (double) pixelMouseCoordInt[i];
         }
@@ -260,9 +176,7 @@ public class DatatipCreate {
     * @return Graphic coordinates related to inserted pixel coordinates.
     */
     public static double[] transformPixelCoordToGraphic(String axesUid, double[] pixelMouseCoordDouble) {
-
-        graphicCoord = CallRenderer.get2dViewFromPixelCoordinates(axesUid, pixelMouseCoordDouble);
-        return graphicCoord;
+        return CallRenderer.get2dViewFromPixelCoordinates(axesUid, pixelMouseCoordDouble);
     }
 
     /**
@@ -272,7 +186,7 @@ public class DatatipCreate {
     */
     public static String askToCreateObject() {
 
-        String newDatatip = GraphicController.getController().askObject(GraphicObject.getTypeFromName(GraphicObjectProperties.__GO_DATATIPS__));
+        String newDatatip = GraphicController.getController().askObject(GraphicObject.getTypeFromName(GraphicObjectProperties.__GO_DATATIP__));
         return newDatatip;
     }
 
@@ -285,6 +199,7 @@ public class DatatipCreate {
     */
     public static Double[] setDatatipPosition (double[] graphicCoord) {
 
+        Double[] datatipPosition = new Double[3];
         datatipPosition[0] = graphicCoord[0];
         datatipPosition[1] = graphicCoord[1];
         datatipPosition[2] = 0.0;
@@ -295,25 +210,25 @@ public class DatatipCreate {
     * Set all default datatip properties;
     *
     * @param graphicCoord double array with graphic position x and y.
-    * @param axesUid Axes handler string.
+    * @param polyline the polyline handler string.
     * @return Datatip handler string.
     */
-    private static String datatipProperties (double[] graphicCoord, String axesUid) {
+    private static String datatipProperties (double[] graphicCoord, String polyline) {
 
         String newDatatip = askToCreateObject();
-        datatipPosition = setDatatipPosition(graphicCoord);
+        Double[] datatipPosition = setDatatipPosition(graphicCoord);
 
         GraphicController.getController().setProperty(newDatatip, GraphicObjectProperties.__GO_DATATIP_DATA__, datatipPosition);
-        GraphicController.getController().setGraphicObjectRelationship(axesUid, newDatatip);
+        GraphicController.getController().setGraphicObjectRelationship(polyline, newDatatip);
         return newDatatip;
     }
 
     /**
-    * Set interpolation mode of a polyline;
-    *
-    * @param polylineUid Polyline handler string.
-    * @param interpMode Boolean to control interpolation mode
-    */
+     * Set interpolation mode of a polyline;
+     *
+     * @param polylineUid Polyline handler string.
+     * @param interpMode Boolean to control interpolation mode
+     */
     public static void datatipSetInterp (String polylineUid, boolean interpMode) {
 
         if (interpMode) {
@@ -325,30 +240,4 @@ public class DatatipCreate {
         }
     }
 
-    /**
-    * Insert the coordinates of a created datatip in the datatips field in the polyline
-    *
-    * @param polylineUid Polyline handler string.
-    * @param coordX Coordinate x of the datatip.
-    * @param coordY Coordinate y of the datatip.
-    */
-    private static void insertPoint (String polylineUid, double coordX, double coordY) {
-
-        Double[] currentDatatips = (Double[]) GraphicController.getController().getProperty(polylineUid, GraphicObjectProperties.__GO_DATATIPS__);
-        Integer numDatatips = (Integer) GraphicController.getController().getProperty(polylineUid, GraphicObjectProperties.__GO_DATATIPS_SIZE__);
-        int allocArray = (2 * numDatatips) + 2;
-        Double[] newDatatips = new Double[allocArray];
-        int j = 0;
-        for (int i = 0 ; i < newDatatips.length ; i++) {
-            if (i == numDatatips) {
-                newDatatips[i] = coordX;
-            } else if (i == (newDatatips.length - 1)) {
-                newDatatips[i] = coordY;
-            } else {
-                newDatatips[i] = currentDatatips[j];
-                j++;
-            }
-        }
-        GraphicController.getController().setProperty(polylineUid, GraphicObjectProperties.__GO_DATATIPS__, newDatatips);
-    }
 }
index 45a1e17..41205fa 100644 (file)
@@ -29,7 +29,7 @@ public class DatatipDelete {
     *
     * @param datatipUid Datatip unique identifier.
     */
-    public static void deleteDatatip (String datatipUid) {
+    public static void deleteDatatip(String datatipUid) {
 
         Double[] datatipPosition = (Double[]) GraphicController.getController().getProperty(datatipUid, GraphicObjectProperties.__GO_DATATIP_DATA__);
 
@@ -41,7 +41,6 @@ public class DatatipDelete {
         String polylineUid = DatatipCommon.getParentPolyline(datatipUid);
 
         GraphicController.getController().removeRelationShipAndDelete(datatipUid);
-        removePoint(polylineUid, graphCoordDouble[0], graphCoordDouble[1]);
     }
 
     /**
@@ -50,16 +49,15 @@ public class DatatipDelete {
     * @param polylineUid Polyline unique identifier.
     * @param indexRemove Index of the datatip to be removed.
     */
-    public static void datatipRemoveProgramIndex (String polylineUid, int indexRemove) {
+    public static void datatipRemoveProgramIndex(String polylineUid, int indexRemove) {
 
-        String[] datatips = (new ObjectSearcher()).search(polylineUid, GraphicObjectProperties.__GO_DATATIPS__);
+        String[] datatips = (new ObjectSearcher()).search(polylineUid, GraphicObjectProperties.__GO_DATATIP__);
 
         if (datatips != null) {
             /* use index from 1 .. lenght (like scilab vectors)*/
             if (indexRemove >= 1 && indexRemove <= datatips.length) {
                 Double[] datatipPosition = (Double[]) GraphicController.getController().getProperty(datatips[indexRemove - 1], GraphicObjectProperties.__GO_DATATIP_DATA__);
                 GraphicController.getController().removeRelationShipAndDelete(datatips[indexRemove - 1]);
-                removePoint (polylineUid, datatipPosition[0], datatipPosition[1]);
             }
         }
 
@@ -72,49 +70,8 @@ public class DatatipDelete {
     * @param datatipUid Datatip unique identifier.
     * @param figureUid Figure unique identifier.
     */
-    public static void datatipRemoveProgramHandler (String datatipUid, String figureUid) {
+    public static void datatipRemoveProgramHandler(String datatipUid, String figureUid) {
         deleteDatatip(datatipUid);
     }
 
-
-    /**
-    * Remove the point of the deleted datatip from the datatips field;
-    *
-    * @param polylineUid Polyline unique identifier.
-    * @param coordX Coordinate x to be removed.
-    * @param coordY Coordinate y to be removed.
-    */
-    private static void removePoint (String polylineUid, double coordX, double coordY) {
-
-        Double[] currentDatatips = (Double[]) GraphicController.getController().getProperty(polylineUid, GraphicObjectProperties.__GO_DATATIPS__);
-        if (currentDatatips == null) {
-            return;
-        }
-        Integer numDatatips = (Integer) GraphicController.getController().getProperty(polylineUid, GraphicObjectProperties.__GO_DATATIPS_SIZE__);
-        int xSkip = -1;
-        int ySkip = -1;
-        if (numDatatips > 0) {
-            int allocArray = (2 * numDatatips) - 2;
-            Double[] newDatatips = new Double[allocArray];
-            if (allocArray == 0) {
-                GraphicController.getController().setProperty(polylineUid, GraphicObjectProperties.__GO_DATATIPS__, newDatatips);
-            } else {
-                for (int i = 0 ; i < currentDatatips.length ; i++) {
-                    if (currentDatatips[i] == coordX && currentDatatips[i + numDatatips] == coordY) {
-                        xSkip = i;
-                        ySkip = i + numDatatips;
-                        break;
-                    }
-                }
-                int j = 0;
-                for (int i = 0 ; i < currentDatatips.length ; i++) {
-                    if (i != xSkip & i != ySkip) {
-                        newDatatips[j] = currentDatatips[i];
-                        j++;
-                    }
-                }
-                GraphicController.getController().setProperty(polylineUid, GraphicObjectProperties.__GO_DATATIPS__, newDatatips);
-            }
-        }
-    }
 }
index 28557c0..6ff56fe 100644 (file)
@@ -53,8 +53,6 @@ public class DatatipDrag {
             if (AutoOrientation) {
                 DatatipOrientation.setOrientation(datatipUid, seg);
             }
-
-            DatatipMove.updateDatatipsField(parentPolyline, oldPos[0], oldPos[1], newPos[0], newPos[1]);
         }
     }
 
index 36c775b..e1000e4 100644 (file)
@@ -72,28 +72,4 @@ public class DatatipMove {
         return null;
     }
 
-
-    /**
-    * Update the datatips field in the polyline handler after move
-    *
-    * @param polylineUid Polyline unique identifier.
-    * @param oldX Current position x of the datatip
-    * @param oldY Current position y of the datatip
-    * @param newX New position x of the datatip
-    * @param newX New position y of the datatip
-    */
-    public static void updateDatatipsField (String polylineUid, double oldX, double oldY, double newX, double newY) {
-
-        Double[] currentDatatips = (Double[]) GraphicController.getController().getProperty(polylineUid, __GO_DATATIPS__);
-        Integer numDatatips = (Integer) GraphicController.getController().getProperty(polylineUid, __GO_DATATIPS_SIZE__);
-        for (int i = 0 ; i < currentDatatips.length ; i++) {
-            if (currentDatatips[i] == oldX && currentDatatips[i+numDatatips] == oldY) {
-                currentDatatips[i] = newX;
-                currentDatatips[i+numDatatips] = newY;
-                break;
-            }
-        }
-        GraphicController.getController().setProperty(polylineUid, __GO_DATATIPS__, currentDatatips);
-    }
-
 }
index 281e227..f44cfef 100644 (file)
@@ -445,7 +445,8 @@ public class EntityPicker {
         }
 
         curAxes = AxesHandler.getAxesFromUid(axes);
-        String[] datatips = (new ObjectSearcher()).search(axes, GraphicObjectProperties.__GO_DATATIPS__);
+        String[] datatips = (new ObjectSearcher()).search(axes, GraphicObjectProperties.__GO_DATATIP__);
+
 
         if (datatips != null) {
 
@@ -455,7 +456,6 @@ public class EntityPicker {
             pix_pos[0] += 1.0;
             pix_pos[1] += 1.0;
             double[] c2d2 = CallRenderer.get2dViewFromPixelCoordinates(axes, pix_pos);
-
             double dx = Math.abs(c2d[0] - c2d2[0]);
             double dy = Math.abs(c2d[1] - c2d2[1]);
 
@@ -464,6 +464,7 @@ public class EntityPicker {
                 Double[] tip_pos = (Double[])GraphicController.getController().getProperty(datatips[i], GraphicObjectProperties.__GO_DATATIP_DATA__);
                 double point[] = {tip_pos[0], tip_pos[1], tip_pos[2]};
 
+
                 if (needTransform) {
                     point = transformPoint(curAxes, tip_pos[0], tip_pos[1], tip_pos[2]);
                 }
@@ -480,7 +481,6 @@ public class EntityPicker {
 
             }
         }
-
         return null;
     }
 }
index 8536155..8067aab 100644 (file)
@@ -83,7 +83,7 @@ public class ObjectSearcher {
 
         for (Integer i = 0; i < childCount; ++i ) {
             Integer objType = (Integer)GraphicController.getController().getProperty(childUid[i], GraphicObjectProperties.__GO_TYPE__);
-            if ( objType == type ) {
+            if (objType.equals(type)) {
                 objects.add( childUid[i] );
             } else {
                 getObjects(childUid[i]);
@@ -102,7 +102,7 @@ public class ObjectSearcher {
             boolean found = false;
 
             for (Integer j = 0; j < types.length; ++j) {
-                if (objType == types[j]) {
+                if (objType.equals(types[j])) {
                     objects.add(childUid[i]);
                     found = true;
                     break;
index 43c84e7..1a7d2a0 100755 (executable)
@@ -4,10 +4,6 @@
             <parameter name="polylineUid" type="String"/>
             <parameter name="coordDoubleXY" type="double[]"/>
         </method>
-        <method name="createDatatipField" returnType="double[]" modifier="static">
-            <parameter name="polylineUid" type="String"/>
-            <parameter name="coordDoubleXY" type="double[]"/>
-        </method>
         <method name="createDatatipProgramIndex" returnType="String" modifier="static">
             <parameter name="polylineUid" type="String"/>
             <parameter name="indexPoint" type="int"/>