WIP : remplace graphics UID string by int 22/12922/5
Antoine ELIAS [Mon, 14 Oct 2013 20:51:10 +0000 (22:51 +0200)]
Change-Id: I18acbf751259f6940f7cf52fbe8568262e706d39

874 files changed:
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/graphic_export/sci_gateway/c/xs2file.c
scilab/modules/graphic_export/sci_gateway/cpp/sci_driver.cpp
scilab/modules/graphic_export/sci_gateway/cpp/sci_xend.cpp
scilab/modules/graphic_export/src/cpp/exportToFile.cpp
scilab/modules/graphic_export/src/cpp/exportToFile.hxx
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Driver.java
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java
scilab/modules/graphic_export/src/jni/Driver.cpp
scilab/modules/graphic_export/src/jni/Driver.giws.xml
scilab/modules/graphic_export/src/jni/Driver.hxx
scilab/modules/graphic_export/src/jni/FileExporter.cpp
scilab/modules/graphic_export/src/jni/FileExporter.giws.xml
scilab/modules/graphic_export/src/jni/FileExporter.hxx
scilab/modules/graphic_export/src/jni/JOGLConstant.cpp
scilab/modules/graphic_export/src/jni/JOGLConstant.hxx
scilab/modules/graphic_objects/includes/AxesModel.h
scilab/modules/graphic_objects/includes/CurrentFigure.h
scilab/modules/graphic_objects/includes/CurrentObject.h
scilab/modules/graphic_objects/includes/CurrentSubwin.h
scilab/modules/graphic_objects/includes/DataController.hxx
scilab/modules/graphic_objects/includes/DataLoader.hxx
scilab/modules/graphic_objects/includes/DataModel.hxx
scilab/modules/graphic_objects/includes/Fac3DDecomposer.hxx
scilab/modules/graphic_objects/includes/FigureList.h
scilab/modules/graphic_objects/includes/FigureModel.h
scilab/modules/graphic_objects/includes/HandleManagement.h
scilab/modules/graphic_objects/includes/MatPlotDecomposer.hxx
scilab/modules/graphic_objects/includes/NgonGridDataDecomposer.hxx
scilab/modules/graphic_objects/includes/NgonGridGrayplotDataDecomposer.hxx
scilab/modules/graphic_objects/includes/NgonGridMatplotDataDecomposer.hxx
scilab/modules/graphic_objects/includes/Plot3DDecomposer.hxx
scilab/modules/graphic_objects/includes/PolylineDecomposer.hxx
scilab/modules/graphic_objects/includes/ScilabView.hxx
scilab/modules/graphic_objects/includes/TriangleMeshFecDataDecomposer.hxx
scilab/modules/graphic_objects/includes/createGraphicObject.h
scilab/modules/graphic_objects/includes/deleteGraphicObject.h
scilab/modules/graphic_objects/includes/getConsoleIdentifier.h
scilab/modules/graphic_objects/includes/getGraphicObjectProperty.h
scilab/modules/graphic_objects/includes/setGraphicObjectProperty.h
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/cpp/AxesModel.cpp
scilab/modules/graphic_objects/src/cpp/CurrentFigure.cpp
scilab/modules/graphic_objects/src/cpp/CurrentObject.cpp
scilab/modules/graphic_objects/src/cpp/CurrentSubwin.cpp
scilab/modules/graphic_objects/src/cpp/DataLoader.cpp
scilab/modules/graphic_objects/src/cpp/Fac3DDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/FigureList.cpp
scilab/modules/graphic_objects/src/cpp/FigureModel.cpp
scilab/modules/graphic_objects/src/cpp/HandleManagement.cpp
scilab/modules/graphic_objects/src/cpp/MatPlotDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/NgonGridDataDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/NgonGridGrayplotDataDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/NgonGridMatplotDataDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/Plot3DDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/PolylineDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/ScilabView.cpp
scilab/modules/graphic_objects/src/cpp/TriangleMeshFecDataDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/createGraphicObject.cpp
scilab/modules/graphic_objects/src/cpp/createObjectData.cpp
scilab/modules/graphic_objects/src/cpp/dataModel.cpp
scilab/modules/graphic_objects/src/cpp/deleteGraphicObject.cpp
scilab/modules/graphic_objects/src/cpp/getConsoleIdentifier.cpp
scilab/modules/graphic_objects/src/cpp/getGraphicObjectProperty.cpp
scilab/modules/graphic_objects/src/cpp/pickSurface.cpp
scilab/modules/graphic_objects/src/cpp/setGraphicObjectProperty.cpp
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/CallGraphicController.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoaderJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/GraphicObjectBuilder.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/JavaObjectLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/MainDataLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectData.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectDataJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectRemovedException.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/PolylineData.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/PolylineDataJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ScilabNativeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ScilabNativeViewJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/SurfaceData.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/SurfaceDataJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/arc/ArcDecomposer.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/axes/Axes.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/axes/AxisProperty.java
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/graphicController/GraphicController.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicModel/GraphicModel.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/graphicView/FlattenTreeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/GedTreeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/GraphicView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/GuiLogView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/LogView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/ScilabView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/TreeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/rectangle/RectangleDecomposer.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/utils/MenuBarBuilder.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/utils/MenuBarConfiguration.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/vectfield/ChampDecomposer.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/vectfield/SegsDecomposer.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/vectfield/VectFieldDecomposer.java
scilab/modules/graphic_objects/src/jni/CallGraphicController.cpp
scilab/modules/graphic_objects/src/jni/CallGraphicController.hxx
scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c
scilab/modules/graphic_objects/src/jni/GraphicObjectBuilder.cpp
scilab/modules/graphic_objects/src/jni/GraphicObjectBuilder.hxx
scilab/modules/graphic_objects/src/jni/ObjectData.i
scilab/modules/graphic_objects/src/jni/ObjectData_wrap.c
scilab/modules/graphic_objects/src/jni/PolylineData.i
scilab/modules/graphic_objects/src/jni/PolylineData_wrap.c
scilab/modules/graphic_objects/src/jni/ScilabNativeView.i
scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c
scilab/modules/graphic_objects/src/jni/SurfaceData.i
scilab/modules/graphic_objects/src/jni/SurfaceData_wrap.c
scilab/modules/graphic_objects/src/jni/graphic_objects.giws.xml
scilab/modules/graphic_objects/src/nographic_objects/nographic_objects.c
scilab/modules/graphics/includes/BuildObjects.h
scilab/modules/graphics/includes/CloneObjects.h
scilab/modules/graphics/includes/DrawObjects.h
scilab/modules/graphics/includes/Format.h
scilab/modules/graphics/includes/GetProperty.h
scilab/modules/graphics/includes/InitObjects.h
scilab/modules/graphics/includes/Interaction.h
scilab/modules/graphics/includes/PloEch.h
scilab/modules/graphics/includes/Plot2d.h
scilab/modules/graphics/includes/SetProperty.h
scilab/modules/graphics/includes/axesScale.h
scilab/modules/graphics/sci_gateway/c/sci_Legend.c
scilab/modules/graphics/sci_gateway/c/sci_StringBox.c
scilab/modules/graphics/sci_gateway/c/sci_copy.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_drawaxis.c
scilab/modules/graphics/sci_gateway/c/sci_drawlater.c
scilab/modules/graphics/sci_gateway/c/sci_drawnow.c
scilab/modules/graphics/sci_gateway/c/sci_geom3d.c
scilab/modules/graphics/sci_gateway/c/sci_get.c
scilab/modules/graphics/sci_gateway/c/sci_glue.c
scilab/modules/graphics/sci_gateway/c/sci_is_handle_valid.c
scilab/modules/graphics/sci_gateway/c/sci_move.c
scilab/modules/graphics/sci_gateway/c/sci_newaxes.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c
scilab/modules/graphics/sci_gateway/c/sci_rotate_axes.c
scilab/modules/graphics/sci_gateway/c/sci_rubberbox.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/sci_gateway/c/sci_show_window.c
scilab/modules/graphics/sci_gateway/c/sci_swap_handles.c
scilab/modules/graphics/sci_gateway/c/sci_unglue.c
scilab/modules/graphics/sci_gateway/c/sci_unzoom.c
scilab/modules/graphics/sci_gateway/c/sci_xarc.c
scilab/modules/graphics/sci_gateway/c/sci_xarcs.c
scilab/modules/graphics/sci_gateway/c/sci_xclick.c
scilab/modules/graphics/sci_gateway/c/sci_xdel.c
scilab/modules/graphics/sci_gateway/c/sci_xfarcs.c
scilab/modules/graphics/sci_gateway/c/sci_xfpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/graphics/sci_gateway/c/sci_xgetmouse.c
scilab/modules/graphics/sci_gateway/c/sci_xgrid.c
scilab/modules/graphics/sci_gateway/c/sci_xname.c
scilab/modules/graphics/sci_gateway/c/sci_xpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xrect.c
scilab/modules/graphics/sci_gateway/c/sci_xrects.c
scilab/modules/graphics/sci_gateway/c/sci_xsegs.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/graphics/sci_gateway/c/sci_xstring.c
scilab/modules/graphics/sci_gateway/c/sci_xtitle.c
scilab/modules/graphics/sci_gateway/c/sci_zoom_rect.c
scilab/modules/graphics/src/c/Axes.c
scilab/modules/graphics/src/c/BuildObjects.c
scilab/modules/graphics/src/c/Champ.c
scilab/modules/graphics/src/c/CloneObjects.c
scilab/modules/graphics/src/c/DestroyObjects.c
scilab/modules/graphics/src/c/DrawObjects.c
scilab/modules/graphics/src/c/FeC.c
scilab/modules/graphics/src/c/Format.c
scilab/modules/graphics/src/c/GetCommandArg.c
scilab/modules/graphics/src/c/GetProperty.c
scilab/modules/graphics/src/c/Gray.c
scilab/modules/graphics/src/c/InitObjects.c
scilab/modules/graphics/src/c/Interaction.c
scilab/modules/graphics/src/c/Light.c
scilab/modules/graphics/src/c/Plo2dEch.c
scilab/modules/graphics/src/c/Plo2dn.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/StringBox.c
scilab/modules/graphics/src/c/axesScale.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.h
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.h
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_alignment_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_ambient_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_anti_aliasing_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_arc_drawing_method_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_arrow_size_factor_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_arrow_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_auto_clear_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_auto_dimensionning_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_auto_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_auto_resize_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_auto_rotation_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_auto_scale_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_auto_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_axes_bounds_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_axes_reverse_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_axes_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_axes_visible_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_bar_layout_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_bar_width_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_callback_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_callback_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_cdata_mapping_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_children_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_clip_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_clip_state_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_closed_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_color_flag_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_color_map_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_color_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_color_range_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_colored_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_cube_scaling_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_current_axes_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_current_entity_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_current_figure_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_bounds_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_mapping_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.h
scilab/modules/graphics/src/c/getHandleProperty/get_datatip_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_default_axes_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_default_figure_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_diffuse_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_direction_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_event_handler_enable_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_event_handler_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_closerequestfcn_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_id_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_name_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_resizefcn_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figures_id_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_fill_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_filled_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_font_angle_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_font_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_font_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_font_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_font_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_format_n_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_fractional_font_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_grid_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_grid_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_handle_visible_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_hidden_axis_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_hidden_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_image_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_immediate_drawing_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_info_message_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_interp_color_mode.c
scilab/modules/graphics/src/c/getHandleProperty/get_interp_color_vector.c
scilab/modules/graphics/src/c/getHandleProperty/get_isoview_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_labels_font_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_labels_font_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_labels_font_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_legend_location_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_light_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_line_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_line_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_links_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_log_flags_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_margins_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_size_unit_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_material_shininess_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_old_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_outside_colors_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_parent_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_pixel_drawing_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_pixmap_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_polyline_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_rotation_angles_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_rotation_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_screen_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_segs_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_specular_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_sub_tics_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_surface_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_surface_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tag_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_text_box_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_text_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_text_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_thickness_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tics_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tics_direction_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tics_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tics_segment_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tics_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tight_limits_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_title_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_triangles_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_use_color_material_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_user_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_view_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_viewport_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_visible_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_x_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_x_location_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_x_shift_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_x_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_xtics_coord_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_y_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_y_location_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_y_shift_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_y_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_ytics_coord_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_z_bounds_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_z_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_z_shift_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_z_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_zoom_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_zoom_state_property.c
scilab/modules/graphics/src/c/getHandleProperty/setGetHashTable.h
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_alignment_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_ambient_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_anti_aliasing_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_arc_drawing_method_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_arrow_size_factor_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_arrow_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_auto_clear_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_auto_dimensionning_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_auto_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_auto_resize_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_auto_rotation_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_auto_scale_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_auto_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_axes_bounds_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_axes_reverse_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_axes_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_axes_visible_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_bar_layout_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_bar_width_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_callback_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_callback_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_cdata_mapping_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_children_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_clip_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_clip_state_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_closed_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_color_flag_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_color_map_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_color_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_color_range_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_colored_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_cube_scaling_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_current_axes_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_current_entity_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_current_figure_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_bounds_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_mapping_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_property.h
scilab/modules/graphics/src/c/getHandleProperty/set_datatip_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_default_values_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_diffuse_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_direction_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_event_handler_enable_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_event_handler_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_closerequestfcn_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_id_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_name_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_resizefcn_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_fill_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_filled_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_font_angle_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_font_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_font_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_font_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_font_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_format_n_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_fractional_font_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_grid_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_grid_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_handle_visible_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_hidden_axis_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_hidden_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_image_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_immediate_drawing_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_info_message_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_interp_color_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_interp_color_vector_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_isoview_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_label_font_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_labels_font_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_labels_font_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_legend_location_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_light_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_line_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_line_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_links_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_log_flags_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_margins_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_size_unit_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_material_shininess_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_old_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_outside_colors_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_parent_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_pixel_drawing_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_pixmap_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_polyline_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_rotation_angles_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_rotation_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_screen_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_segs_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_specular_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_sub_tics_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_surface_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_surface_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tag_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_text_box_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_text_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_text_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_thickness_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_direction_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_labels_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_segment_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tight_limits_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_title_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_triangles_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_use_color_material_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_user_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_view_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_viewport_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_visible_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_location_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_shift_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_xtics_coord_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_location_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_shift_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_yticks_coord_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_z_bounds_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_z_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_z_shift_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_z_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_zoom_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_zoom_state_property.c
scilab/modules/graphics/src/c/sciCall.c
scilab/modules/graphics/src/nographics/nographics.c
scilab/modules/gui/includes/CallClipboard.h
scilab/modules/gui/includes/CallJxclick.h
scilab/modules/gui/includes/CallJxgetmouse.h
scilab/modules/gui/includes/ContextMenu.h
scilab/modules/gui/includes/GetConsoleShowHiddenHandles.h
scilab/modules/gui/includes/GetUicontrolBackgroundColor.h
scilab/modules/gui/includes/GetUicontrolFontAngle.h
scilab/modules/gui/includes/GetUicontrolFontName.h
scilab/modules/gui/includes/GetUicontrolFontSize.h
scilab/modules/gui/includes/GetUicontrolFontUnits.h
scilab/modules/gui/includes/GetUicontrolFontWeight.h
scilab/modules/gui/includes/GetUicontrolHorizontalAlignment.h
scilab/modules/gui/includes/GetUicontrolListboxTop.h
scilab/modules/gui/includes/GetUicontrolMax.h
scilab/modules/gui/includes/GetUicontrolMin.h
scilab/modules/gui/includes/GetUicontrolPosition.h
scilab/modules/gui/includes/GetUicontrolRelief.h
scilab/modules/gui/includes/GetUicontrolSliderStep.h
scilab/modules/gui/includes/GetUicontrolString.h
scilab/modules/gui/includes/GetUicontrolStyle.h
scilab/modules/gui/includes/GetUicontrolTooltipString.h
scilab/modules/gui/includes/GetUicontrolUnits.h
scilab/modules/gui/includes/GetUicontrolValue.h
scilab/modules/gui/includes/GetUicontrolVerticalAlignment.h
scilab/modules/gui/includes/GetUimenuChecked.h
scilab/modules/gui/includes/GetUimenuLabel.h
scilab/modules/gui/includes/GetUiobjectEnable.h
scilab/modules/gui/includes/GetUiobjectForegroundColor.h
scilab/modules/gui/includes/InitUIMenu.h
scilab/modules/gui/includes/SetConsoleShowHiddenHandles.h
scilab/modules/gui/includes/SetUicontrolBackgroundColor.h
scilab/modules/gui/includes/SetUicontrolFontAngle.h
scilab/modules/gui/includes/SetUicontrolFontName.h
scilab/modules/gui/includes/SetUicontrolFontSize.h
scilab/modules/gui/includes/SetUicontrolFontUnits.h
scilab/modules/gui/includes/SetUicontrolFontWeight.h
scilab/modules/gui/includes/SetUicontrolHorizontalAlignment.h
scilab/modules/gui/includes/SetUicontrolListboxTop.h
scilab/modules/gui/includes/SetUicontrolMax.h
scilab/modules/gui/includes/SetUicontrolMin.h
scilab/modules/gui/includes/SetUicontrolPosition.h
scilab/modules/gui/includes/SetUicontrolRelief.h
scilab/modules/gui/includes/SetUicontrolSliderStep.h
scilab/modules/gui/includes/SetUicontrolString.h
scilab/modules/gui/includes/SetUicontrolTooltipString.h
scilab/modules/gui/includes/SetUicontrolUnits.h
scilab/modules/gui/includes/SetUicontrolValue.h
scilab/modules/gui/includes/SetUicontrolVerticalAlignment.h
scilab/modules/gui/includes/SetUimenuChecked.h
scilab/modules/gui/includes/SetUimenuLabel.h
scilab/modules/gui/includes/SetUiobjectEnable.h
scilab/modules/gui/includes/SetUiobjectForegroundColor.h
scilab/modules/gui/includes/Toolbar.h
scilab/modules/gui/includes/Widget.h
scilab/modules/gui/sci_gateway/c/sci_delmenu.c
scilab/modules/gui/sci_gateway/c/sci_exportUI.c
scilab/modules/gui/sci_gateway/c/sci_getcallbackobject.c
scilab/modules/gui/sci_gateway/c/sci_mpopup.c
scilab/modules/gui/sci_gateway/c/sci_progressionbar.c
scilab/modules/gui/sci_gateway/c/sci_setmenu.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/c/sci_uimenu.c
scilab/modules/gui/sci_gateway/c/sci_uiwait.c
scilab/modules/gui/sci_gateway/c/sci_unsetmenu.c
scilab/modules/gui/sci_gateway/c/sci_waitbar.c
scilab/modules/gui/sci_gateway/cpp/sci_datatip_manager_mode.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_display.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_interp.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_orient.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_style.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_toggle.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatipcreate.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatipmove.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatipremove.cpp
scilab/modules/gui/sci_gateway/cpp/sci_fire_closing_finished.cpp
scilab/modules/gui/sci_gateway/cpp/sci_openged.cpp
scilab/modules/gui/sci_gateway/cpp/sci_plotbrowser.cpp
scilab/modules/gui/sci_gateway/cpp/sci_useeditor.cpp
scilab/modules/gui/src/c/CreateUIControl.c
scilab/modules/gui/src/c/CreateUIControl.h
scilab/modules/gui/src/c/CreateUimenu.c
scilab/modules/gui/src/c/CreateUimenu.h
scilab/modules/gui/src/cpp/CallClipboard.cpp
scilab/modules/gui/src/cpp/CallJxclick.cpp
scilab/modules/gui/src/cpp/CallJxgetmouse.cpp
scilab/modules/gui/src/cpp/ContextMenu.cpp
scilab/modules/gui/src/cpp/GetConsoleShowHiddenHandles.cpp
scilab/modules/gui/src/cpp/GetUicontrolBackgroundColor.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontAngle.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontName.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontSize.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontUnits.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontWeight.cpp
scilab/modules/gui/src/cpp/GetUicontrolHorizontalAlignment.cpp
scilab/modules/gui/src/cpp/GetUicontrolListboxTop.cpp
scilab/modules/gui/src/cpp/GetUicontrolMax.cpp
scilab/modules/gui/src/cpp/GetUicontrolMin.cpp
scilab/modules/gui/src/cpp/GetUicontrolPosition.cpp
scilab/modules/gui/src/cpp/GetUicontrolRelief.cpp
scilab/modules/gui/src/cpp/GetUicontrolSliderStep.cpp
scilab/modules/gui/src/cpp/GetUicontrolString.cpp
scilab/modules/gui/src/cpp/GetUicontrolStyle.cpp
scilab/modules/gui/src/cpp/GetUicontrolTooltipString.cpp
scilab/modules/gui/src/cpp/GetUicontrolUnits.cpp
scilab/modules/gui/src/cpp/GetUicontrolValue.cpp
scilab/modules/gui/src/cpp/GetUicontrolVerticalAlignment.cpp
scilab/modules/gui/src/cpp/GetUimenuChecked.cpp
scilab/modules/gui/src/cpp/GetUimenuLabel.cpp
scilab/modules/gui/src/cpp/GetUiobjectEnable.cpp
scilab/modules/gui/src/cpp/GetUiobjectForegroundColor.cpp
scilab/modules/gui/src/cpp/InitUIMenu.cpp
scilab/modules/gui/src/cpp/SetConsoleShowHiddenHandles.cpp
scilab/modules/gui/src/cpp/SetUicontrolBackgroundColor.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontAngle.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontName.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontSize.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontUnits.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontWeight.cpp
scilab/modules/gui/src/cpp/SetUicontrolHorizontalAlignment.cpp
scilab/modules/gui/src/cpp/SetUicontrolListboxTop.cpp
scilab/modules/gui/src/cpp/SetUicontrolMax.cpp
scilab/modules/gui/src/cpp/SetUicontrolMin.cpp
scilab/modules/gui/src/cpp/SetUicontrolPosition.cpp
scilab/modules/gui/src/cpp/SetUicontrolRelief.cpp
scilab/modules/gui/src/cpp/SetUicontrolSliderStep.cpp
scilab/modules/gui/src/cpp/SetUicontrolString.cpp
scilab/modules/gui/src/cpp/SetUicontrolTooltipString.cpp
scilab/modules/gui/src/cpp/SetUicontrolUnits.cpp
scilab/modules/gui/src/cpp/SetUicontrolValue.cpp
scilab/modules/gui/src/cpp/SetUicontrolVerticalAlignment.cpp
scilab/modules/gui/src/cpp/SetUimenuChecked.cpp
scilab/modules/gui/src/cpp/SetUimenuLabel.cpp
scilab/modules/gui/src/cpp/SetUiobjectEnable.cpp
scilab/modules/gui/src/cpp/SetUiobjectForegroundColor.cpp
scilab/modules/gui/src/cpp/Toolbar.cpp
scilab/modules/gui/src/cpp/Widget.cpp
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewObject.java
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewWidget.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/checkbox/SwingScilabCheckBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/checkboxmenuitem/SwingScilabCheckBoxMenuItem.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/contextmenu/SwingScilabContextMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/editbox/SwingScilabEditBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/ExportData.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/ExportOptionWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabFrame.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/listbox/SwingScilabListBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/menu/SwingScilabMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/menubar/SwingScilabMenuBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/menuitem/SwingScilabMenuItem.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/popupmenu/SwingScilabPopupMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/pushbutton/SwingScilabPushButton.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/radiobutton/SwingScilabRadioButton.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabScrollPane.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/uiimage/SwingScilabUiImage.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/uitable/SwingScilabUiTable.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/waitbar/SwingScilabWaitBar.java
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/DatatipManager.java
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipManagerMode.java
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipMove.java
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipOrientation.java
scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipSetStyle.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/AxesHandler.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/CommonHandler.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/DataEditor.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/Editor.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/EditorEventListener.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/EditorManager.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/EntityPicker.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/GEDPicker.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/LabelHandler.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/LegendHandler.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/ObjectSearcher.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/PolylineHandler.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/ScilabClipboard.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/SystemClipboard.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/action/ActionDelete.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/action/ActionHide.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/action/ActionLegend.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/action/ActionMove.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/action/ActionPaste.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/action/ActionPasteStyle.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/action/ActionTextEdit.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/action/BaseAction.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/ClickInfos.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalEventFilter.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalEventWatcher.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalMouseEventWatcher.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/Jxclick.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/Jxgetmouse.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/ScilabEventListener.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/callback/CommonCallBack.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/callback/ScilabCloseCallBack.java
scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/ScilabFileChooser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/ScilabFileChooserBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/ColorMapHandler.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/ContentLayout.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/GEDView.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/Inspector.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/InspectorTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/StartGED.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/SwapObject.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/SwingInspector.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/SimpleObject.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/SimpleSection.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/arc/Arc.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/arc/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/arc/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/arc/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/axes/Axes.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/axes/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/axes/Box.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/axes/Camera.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/axes/Label.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/axes/Position.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/axes/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/axes/Tick.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/champ/Champ.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/champ/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/champ/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/datatip/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/datatip/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/datatip/Datatip.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/datatip/Label.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/datatip/Mark.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/fec/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/fec/Fec.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/fec/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/figure/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/figure/Control.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/figure/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/figure/Figure.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/figure/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/imageplot/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/imageplot/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/imageplot/Imageplot.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/label/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/label/Font.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/label/Label.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/label/Position.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/label/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/legend/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/legend/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/legend/Font.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/legend/Legend.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/legend/Position.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/legend/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/polyline/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/polyline/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/polyline/Mark.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/polyline/Polyline.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/polyline/Shift.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/polyline/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Arc.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Axes.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/CameraProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Champ.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/ClippableContouredObject.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/ContouredObject.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Datatip.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Fec.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Figure.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Font.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/GraphicObject.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Imageplot.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Label.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Legend.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Polyline.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/Surface.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/TextObject.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/properties/VectField.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/rectangle/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/rectangle/Mark.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/rectangle/Rectangle.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/rectangle/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/segs/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/segs/Mark.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/segs/Segs.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/segs/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/surface/BaseProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/surface/DataProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/surface/Mark.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/surface/Style.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/graphic_objects/surface/Surface.java
scilab/modules/gui/src/java/org/scilab/modules/gui/graphicWindow/PanelLayout.java
scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/ListCreator.java
scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/PlotBrowser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/PlotBrowserTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/StartPlotBrowser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/SwapFigure.java
scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/SwingPlotBrowser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ImageExporter.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/UnitsConverter.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.giws.xml
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/gui/src/jni/Datatip.giws.xml
scilab/modules/gui/src/jni/DatatipCreate.cpp
scilab/modules/gui/src/jni/DatatipCreate.hxx
scilab/modules/gui/src/jni/DatatipDelete.cpp
scilab/modules/gui/src/jni/DatatipDelete.hxx
scilab/modules/gui/src/jni/DatatipDrag.cpp
scilab/modules/gui/src/jni/DatatipDrag.hxx
scilab/modules/gui/src/jni/DatatipManager.cpp
scilab/modules/gui/src/jni/DatatipManager.hxx
scilab/modules/gui/src/jni/DatatipOrientation.cpp
scilab/modules/gui/src/jni/DatatipOrientation.hxx
scilab/modules/gui/src/jni/DatatipSetStyle.cpp
scilab/modules/gui/src/jni/DatatipSetStyle.hxx
scilab/modules/gui/src/jni/EditorManager.cpp
scilab/modules/gui/src/jni/EditorManager.giws.xml
scilab/modules/gui/src/jni/EditorManager.hxx
scilab/modules/gui/src/jni/Juigetfile.cpp
scilab/modules/gui/src/jni/Juigetfile.hxx
scilab/modules/gui/src/jni/Jxclick.cpp
scilab/modules/gui/src/jni/Jxclick.giws.xml
scilab/modules/gui/src/jni/Jxclick.hxx
scilab/modules/gui/src/jni/Jxgetmouse.cpp
scilab/modules/gui/src/jni/Jxgetmouse.giws.xml
scilab/modules/gui/src/jni/Jxgetmouse.hxx
scilab/modules/gui/src/jni/LookAndFeelManager.cpp
scilab/modules/gui/src/jni/LookAndFeelManager.hxx
scilab/modules/gui/src/jni/ScilabDisplayTree.cpp
scilab/modules/gui/src/jni/ScilabDisplayTree.hxx
scilab/modules/gui/src/jni/StartGED.cpp
scilab/modules/gui/src/jni/StartGED.giws.xml
scilab/modules/gui/src/jni/StartGED.hxx
scilab/modules/gui/src/jni/StartPlotBrowser.cpp
scilab/modules/gui/src/jni/StartPlotBrowser.giws.xml
scilab/modules/gui/src/jni/StartPlotBrowser.hxx
scilab/modules/gui/src/jni/SwingView.cpp
scilab/modules/gui/src/jni/SwingView.hxx
scilab/modules/gui/src/jni/UIElementMapper.cpp
scilab/modules/gui/src/jni/UIElementMapper.hxx
scilab/modules/javasci/Makefile.in
scilab/modules/renderer/includes/GetJavaProperty.h
scilab/modules/renderer/includes/JavaInteraction.h
scilab/modules/renderer/includes/SetJavaProperty.h
scilab/modules/renderer/src/cpp/GetJavaProperty.cpp
scilab/modules/renderer/src/cpp/JavaInteraction.cpp
scilab/modules/renderer/src/cpp/SetJavaProperty.cpp
scilab/modules/renderer/src/java/org/scilab/modules/renderer/CallRenderer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DataManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/FecDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/ScilabTextureManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/arrowDrawing/ArrowDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/ruler/AxesRulerDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/ruler/RulerDrawerManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/contouredObject/ContouredObjectDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/datatip/DatatipTextDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/editor/FigureFrame.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/editor/SciTreeModel.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/interaction/FigureInteraction.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/label/LabelManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/legend/LegendDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/mark/MarkSpriteManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/text/TextManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/util/LightingUtils.java
scilab/modules/renderer/src/jni/CallRenderer.cpp
scilab/modules/renderer/src/jni/CallRenderer.hxx
scilab/modules/renderer/src/jni/XlFontManager.cpp
scilab/modules/renderer/src/jni/XlFontManager.hxx
scilab/modules/renderer/src/jni/renderer.giws.xml
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scicos_blocks/src/cpp/scoUtils.cpp
scilab/modules/scicos_blocks/src/cpp/scoUtils.h

index bf483c0..21b602b 100644 (file)
@@ -183,7 +183,7 @@ public class Scilab {
             // Create a user config file if not already exists
             ConfigManager.createUserCopy();
 
-            String consoleId = GraphicController.getController().askObject(Type.JAVACONSOLE);
+            Integer consoleId = GraphicController.getController().askObject(Type.JAVACONSOLE);
             MenuBarBuilder.buildConsoleMenuBar(consoleId);
 
             SwingScilabConsole sciConsole = ((SwingScilabConsole) ScilabConsole.getConsole().getAsSimpleConsole());
index 6616f35..555a0cc 100644 (file)
@@ -74,7 +74,7 @@ int xs2file(char * fname, ExportFileType fileType )
         ExportOrientation orientation = EXPORT_PORTRAIT; /* default orientation */
         int m1 = 0, n1 = 0;
         int figurenum = -1;
-        char* figureUID = NULL;
+        int figureUID = 0;
         char *status = NULL;
 
         sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddrl1);
@@ -109,7 +109,7 @@ int xs2file(char * fname, ExportFileType fileType )
                 Scierror(999, "%s: Input argument #%d must be a valid figure_id.\n", fname, 1);
                 return 1;
             }
-            figureUID = (char*)getFigureFromIndex(figurenum);
+            figureUID = getFigureFromIndex(figurenum);
         }
         /* check given handle */
         else if (checkInputArgumentType(pvApiCtx, 1, sci_handles))
@@ -133,8 +133,8 @@ int xs2file(char * fname, ExportFileType fileType )
                 return 1;
             }
 
-            figureUID = (char*)getObjectFromHandle((unsigned long) * l1);
-            if (figureUID == NULL)
+            figureUID = getObjectFromHandle((unsigned long) * l1);
+            if (figureUID == 0)
             {
                 Scierror(999, _("%s: Input argument #%d must be a valid handle.\n"), fname, 1);
                 return 1;
index 6762802..9a7930a 100644 (file)
@@ -85,16 +85,15 @@ int sci_driver(char * fname, unsigned long fname_len )
         else if (org_scilab_modules_gui::SwingView::isHeadless(getScilabJavaVM()))
         {
             org_scilab_modules_gui::SwingView::setHeadless(getScilabJavaVM(), false);
-            const char* pstCurrentFigureReference = ScilabView::getCurrentFigure();
-            if (pstCurrentFigureReference != NULL)
+            int CurrentFigureReference = ScilabView::getCurrentFigure();
+            if (CurrentFigureReference != 0)
             {
-                char* uid = strdup(pstCurrentFigureReference);
+                int uid = CurrentFigureReference;
 
                 if (uid)
                 {
                     deleteGraphicObject(uid);
                 }
-                free(uid);
             }
         }
 
index ea36743..63f13d0 100644 (file)
@@ -33,18 +33,17 @@ int sci_xend(char * fname, unsigned long fname_len)
 {
     CheckInputArgument(pvApiCtx, 0, 0);
 
-    const char* pstCurrentFigureReference = ScilabView::getCurrentFigure();
+    int iCurrentFigureReference = ScilabView::getCurrentFigure();
 
-    if (pstCurrentFigureReference != NULL)
+    if (iCurrentFigureReference != 0)
     {
-        char* uid = strdup(pstCurrentFigureReference);
+        int uid = iCurrentFigureReference;
 
         if (uid)
         {
             char * ret = org_scilab_modules_graphic_export::Driver::end(getScilabJavaVM(), uid);
 
             deleteGraphicObject(uid);
-            free(uid);
 
             if (*ret != '\0')
             {
index 6947741..23f3305 100644 (file)
@@ -24,14 +24,14 @@ extern "C"
 
 
 /*---------------------------------------------------------------------------------*/
-char * exportToFile(char * figureUID,
+char * exportToFile(int iFigureUID,
                     const char * fileName,
                     ExportFileType fileType,
                     const float jpegCompressionQuality,
                     ExportOrientation orientation)
 {
     return org_scilab_modules_graphic_export::FileExporter::fileExport(getScilabJavaVM(),
-            figureUID,
+            iFigureUID,
             (char *)fileName,
             fileType,
             jpegCompressionQuality,
index c3cbd71..643cf4c 100644 (file)
@@ -47,7 +47,7 @@ extern "C" {
         EXPORT_LANDSCAPE = 1
     } ExportOrientation;
 
-    char * exportToFile(char * figureUID,
+    char * exportToFile(int iFigureUID,
                         const char * fileName,
                         ExportFileType fileType,
                         const float jpegCompressionQuality,
index 37826c0..ad5d2d3 100644 (file)
@@ -58,7 +58,7 @@ public class Driver {
         return !driver.equalsIgnoreCase("X11") && !driver.equalsIgnoreCase("Rec");
     }
 
-    public static void setDefaultVisitor(String uid) {
+    public static void setDefaultVisitor(int uid) {
         if (isImageRendering()) {
             Export.setVisitor(uid, Export.getType(driver), new ExportParams(-1.0f, 0, true));
         }
@@ -68,7 +68,7 @@ public class Driver {
      * Export the current figure
      * @param uid the uid of the current figure
      */
-    public static String end(String uid) {
+    public static String end(int uid) {
         if (filename == null) {
             return Messages.gettext("xinit must be called before xend.");
         }
index bbe2781..c422d44 100644 (file)
@@ -128,7 +128,7 @@ public class Export {
      * @param params the export paramaters
      * @return the export status
      */
-    public static int export(String uid, int type, String fileName, ExportParams params, boolean headless) {
+    public static int export(Integer uid, int type, String fileName, ExportParams params, boolean headless) {
         // Check that the fileName contains an extension
         int dotPosition = fileName.lastIndexOf('.'); // position of the dot
         boolean extensionFound = false;
@@ -168,7 +168,7 @@ public class Export {
      * @param params the export paramaters
      * @return the export status
      */
-    public static int exportVectorial(String uid, int type, String fileName, ExportParams params, boolean headless) {
+    public static int exportVectorial(Integer uid, int type, String fileName, ExportParams params, boolean headless) {
         if (fileName == null) {
             return INVALID_FILE;
         }
@@ -193,7 +193,7 @@ public class Export {
      * @param file the file where to export
      * @param params the export paramaters
      */
-    public static int exportVectorial(String uid, TYPE type, File file, ExportParams params, boolean headless) throws IOException {
+    public static int exportVectorial(Integer uid, TYPE type, File file, ExportParams params, boolean headless) throws IOException {
         Figure figure = (Figure) GraphicController.getController().getObjectFromId(uid);
 
         if (!headless) {
@@ -209,7 +209,7 @@ public class Export {
             DrawerVisitor oldVisitor = DrawerVisitor.getVisitor(uid);
             DrawerVisitor visitor = new DrawerVisitor(null, canvas, figure) {
                 @Override
-                public void updateObject(String id, int property) {
+                public void updateObject(Integer id, int property) {
                     // Don't update during the export
                 }
             };
@@ -268,7 +268,7 @@ public class Export {
      * @param params the export paramaters
      * @return the export status
      */
-    public static int exportBitmap(String uid, int type, String fileName, boolean fromScreen, ExportParams params) {
+    public static int exportBitmap(Integer uid, int type, String fileName, boolean fromScreen, ExportParams params) {
         if (fileName == null) {
             return INVALID_FILE;
         }
@@ -296,7 +296,7 @@ public class Export {
      * @param fromScreen if true, then use the screen view
      * @param params the export paramaters
      */
-    public static void exportBitmap(String uid, TYPE type, File file, boolean fromScreen, ExportParams params) throws IOException {
+    public static void exportBitmap(Integer uid, TYPE type, File file, boolean fromScreen, ExportParams params) throws IOException {
         if (isBitmapFormat(type)) {
             JoGLCanvas joglCanvas = null;
             if (fromScreen) {
@@ -312,12 +312,12 @@ public class Export {
                 joglCanvas = (JoGLCanvas) JoGLCanvasFactory.createCanvas(dims[0], dims[1]);
                 DrawerVisitor visitor = new DrawerVisitor(null, joglCanvas, figure) {
                     @Override
-                    public void updateObject(String id, int property) {
+                    public void updateObject(Integer id, int property) {
                         // Don't update during the export
                     }
 
                     @Override
-                    public void deleteObject(String id) {
+                    public void deleteObject(Integer id) {
                         // Don't delete during the export
                     }
                 };
@@ -345,7 +345,7 @@ public class Export {
      * @param file the file where to export
      * @param params the export paramaters
      */
-    public static void setVisitor(String uid, int type, final ExportParams params) {
+    public static void setVisitor(Integer uid, int type, final ExportParams params) {
         final Exporter exporter = getExporter(types[type]);
         Figure figure = (Figure) GraphicController.getController().getObjectFromId(uid);
         final Integer[] dims = figure.getAxesSize();
@@ -359,12 +359,12 @@ public class Export {
         canvas.disableDraw();
         DrawerVisitor visitor = new DrawerVisitor(null, canvas, figure) {
             @Override
-            public void deleteObject(String id) {
+            public void deleteObject(Integer id) {
                 // Don't delete during the export
             }
 
             @Override
-            public void updateObject(String id, int property) {
+            public void updateObject(Integer id, int property) {
                 if (needUpdate(id, property)) {
                     axesDrawer.update(id, property);
                     if (property == GraphicObjectProperties.__GO_AXES_SIZE__) {
index 889e771..f38a724 100644 (file)
@@ -40,7 +40,7 @@ public class FileExporter {
      * @return 0 if everything worked fine, a non null integer if an exception occurred
      *         depending on the kind of error
      */
-    public static String fileExport(String figureUID, String fileName, int fileType, float jpegCompressionQuality, int fileOrientation, boolean headless) {
+    public static String fileExport(Integer figureUID, String fileName, int fileType, float jpegCompressionQuality, int fileOrientation, boolean headless) {
         int ret = Export.export(figureUID, fileType, fileName, new ExportParams(jpegCompressionQuality, fileOrientation, true), headless);
 
         switch (ret) {
@@ -69,7 +69,7 @@ public class FileExporter {
      * @return 0 if everything worked fine, a non null integer if an exception occurred
      *         depending on the kind of error
      */
-    public static String fileExport(String figureUID, String fileName, int fileType, float jpegCompressionQuality, int fileOrientation) {
+    public static String fileExport(Integer figureUID, String fileName, int fileType, float jpegCompressionQuality, int fileOrientation) {
         return fileExport(figureUID, fileName, fileType, jpegCompressionQuality, fileOrientation, false);
     }
 
@@ -83,7 +83,7 @@ public class FileExporter {
      * @return 0 if everything worked fine, a non null integer if an exception occurred
      *         depending on the kind of error
      */
-    public static String fileExport(String figureUID, String fileName, String fileType, float jpegCompressionQuality, int fileOrientation) {
+    public static String fileExport(Integer figureUID, String fileName, String fileType, float jpegCompressionQuality, int fileOrientation) {
         String ext = fileType.toLowerCase();
         return fileExport(figureUID, fileName, Export.getType(ext), jpegCompressionQuality, fileOrientation, false);
     }
@@ -98,7 +98,7 @@ public class FileExporter {
      * @return 0 if everything worked fine, a non null integer if an exception occurred
      *         depending on the kind of error
      */
-    public static String headlessFileExport(String figureUID, String fileName, String fileType, float jpegCompressionQuality, int fileOrientation) {
+    public static String headlessFileExport(Integer figureUID, String fileName, String fileType, float jpegCompressionQuality, int fileOrientation) {
         String ext = fileType.toLowerCase();
         return fileExport(figureUID, fileName, Export.getType(ext), jpegCompressionQuality, fileOrientation, true);
     }
index cd2ccee..6a53655 100644 (file)
@@ -1,6 +1,6 @@
 #include "Driver.hxx"
 /* Generated by GIWS (version 2.0.1) with command:
-giws --disable-return-size-array --output-dir D:\git\debug\similan\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file Driver.giws.xml 
+giws --disable-return-size-array --output-dir D:\git\debug\master\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file Driver.giws.xml 
 */
 /*
 
@@ -107,7 +107,7 @@ curEnv->DeleteLocalRef(localInstance);
 jbooleansetDriverjstringjava_lang_StringID=NULL;
 jstringgetDriverID=NULL;
 voidsetPathjstringjava_lang_StringID=NULL;
-jstringendjstringjava_lang_StringID=NULL;
+jstringendjintintID=NULL;
 
 
 }
@@ -133,7 +133,7 @@ throw GiwsException::JniObjectCreationException(curEnv, this->className());
         jbooleansetDriverjstringjava_lang_StringID=NULL;
 jstringgetDriverID=NULL;
 voidsetPathjstringjava_lang_StringID=NULL;
-jstringendjstringjava_lang_StringID=NULL;
+jstringendjintintID=NULL;
 
 
 }
@@ -240,25 +240,18 @@ throw GiwsException::JniCallMethodException(curEnv);
 }
 }
 
-char* Driver::end (JavaVM * jvm_, char const* uid){
+char* Driver::end (JavaVM * jvm_, int uid){
 
 JNIEnv * curEnv = NULL;
 jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 jclass cls = curEnv->FindClass( className().c_str() );
 
-jmethodID jstringendjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "end", "(Ljava/lang/String;)Ljava/lang/String;" ) ;
-if (jstringendjstringjava_lang_StringID == NULL) {
+jmethodID jstringendjintintID = curEnv->GetStaticMethodID(cls, "end", "(I)Ljava/lang/String;" ) ;
+if (jstringendjintintID == NULL) {
 throw GiwsException::JniMethodNotFoundException(curEnv, "end");
 }
 
-jstring uid_ = curEnv->NewStringUTF( uid );
-if (uid != NULL && uid_ == NULL)
-{
-throw GiwsException::JniBadAllocException(curEnv);
-}
-
-
-                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringendjstringjava_lang_StringID ,uid_));
+                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringendjintintID ,uid));
                         if (curEnv->ExceptionCheck()) {
 throw GiwsException::JniCallMethodException(curEnv);
 }if (res != NULL) { 
@@ -268,7 +261,6 @@ char * myStringBuffer = new char[strlen(tempString) + 1];
 strcpy(myStringBuffer, tempString);
 curEnv->ReleaseStringUTFChars(res, tempString);
 curEnv->DeleteLocalRef(res);
-curEnv->DeleteLocalRef(uid_);
 curEnv->DeleteLocalRef(cls);
 if (curEnv->ExceptionCheck()) {
 delete[] myStringBuffer;
index d6063a4..5574363 100644 (file)
@@ -20,7 +20,7 @@
             <parameter name="path" type="String"/>
         </method>
         <method name="end" returnType="String" modifier="static" >
-            <parameter name="uid" type="String"/>
+            <parameter name="uid" type="int"/>
         </method>
     </object>
 </package>
index 677f29d..b7bb4b9 100644 (file)
@@ -1,5 +1,5 @@
 /* Generated by GIWS (version 2.0.1) with command:
-giws --disable-return-size-array --output-dir D:\git\debug\similan\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file Driver.giws.xml 
+giws --disable-return-size-array --output-dir D:\git\debug\master\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file Driver.giws.xml 
 */
 /*
 
@@ -79,7 +79,7 @@ protected:
 jmethodID jbooleansetDriverjstringjava_lang_StringID; // cache method id
 jmethodID jstringgetDriverID; // cache method id
 jmethodID voidsetPathjstringjava_lang_StringID; // cache method id
-jmethodID jstringendjstringjava_lang_StringID; // cache method id
+jmethodID jstringendjintintID; // cache method id
 
 
 
@@ -145,7 +145,7 @@ static char* getDriver(JavaVM * jvm_);
 
 static void setPath(JavaVM * jvm_, char const* path);
 
-static char* end(JavaVM * jvm_, char const* uid);
+static char* end(JavaVM * jvm_, int uid);
 
 
                         /**
index 001d76f..ce76758 100644 (file)
@@ -1,6 +1,6 @@
 #include "FileExporter.hxx"
 /* Generated by GIWS (version 2.0.1) with command:
-giws --disable-return-size-array --output-dir D:\git\debug\similan\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file FileExporter.giws.xml 
+giws --disable-return-size-array --output-dir D:\git\debug\master\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file FileExporter.giws.xml 
 */
 /*
 
@@ -104,7 +104,7 @@ throw GiwsException::JniObjectCreationException(curEnv, this->className());
 curEnv->DeleteLocalRef(localInstance);
 
                 /* Methods ID set to NULL */
-jstringfileExportjstringjava_lang_Stringjstringjava_lang_StringjintintjfloatfloatjintintID=NULL;
+jstringfileExportjintintjstringjava_lang_StringjintintjfloatfloatjintintID=NULL;
 
 
 }
@@ -127,7 +127,7 @@ throw GiwsException::JniObjectCreationException(curEnv, this->className());
 throw GiwsException::JniObjectCreationException(curEnv, this->className());
         }
         /* Methods ID set to NULL */
-        jstringfileExportjstringjava_lang_Stringjstringjava_lang_StringjintintjfloatfloatjintintID=NULL;
+        jstringfileExportjintintjstringjava_lang_StringjintintjfloatfloatjintintID=NULL;
 
 
 }
@@ -147,24 +147,17 @@ throw GiwsException::JniMonitorException(getCurrentEnv(), "FileExporter");
 }
 // Method(s)
 
-char* FileExporter::fileExport (JavaVM * jvm_, char const* figureUID, char const* fileName, int fileType, float jpegCompressionQuality, int orientation){
+char* FileExporter::fileExport (JavaVM * jvm_, int figureUID, char const* fileName, int fileType, float jpegCompressionQuality, int orientation){
 
 JNIEnv * curEnv = NULL;
 jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 jclass cls = curEnv->FindClass( className().c_str() );
 
-jmethodID jstringfileExportjstringjava_lang_Stringjstringjava_lang_StringjintintjfloatfloatjintintID = curEnv->GetStaticMethodID(cls, "fileExport", "(Ljava/lang/String;Ljava/lang/String;IFI)Ljava/lang/String;" ) ;
-if (jstringfileExportjstringjava_lang_Stringjstringjava_lang_StringjintintjfloatfloatjintintID == NULL) {
+jmethodID jstringfileExportjintintjstringjava_lang_StringjintintjfloatfloatjintintID = curEnv->GetStaticMethodID(cls, "fileExport", "(ILjava/lang/String;IFI)Ljava/lang/String;" ) ;
+if (jstringfileExportjintintjstringjava_lang_StringjintintjfloatfloatjintintID == NULL) {
 throw GiwsException::JniMethodNotFoundException(curEnv, "fileExport");
 }
 
-jstring figureUID_ = curEnv->NewStringUTF( figureUID );
-if (figureUID != NULL && figureUID_ == NULL)
-{
-throw GiwsException::JniBadAllocException(curEnv);
-}
-
-
 jstring fileName_ = curEnv->NewStringUTF( fileName );
 if (fileName != NULL && fileName_ == NULL)
 {
@@ -172,7 +165,7 @@ throw GiwsException::JniBadAllocException(curEnv);
 }
 
 
-                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringfileExportjstringjava_lang_Stringjstringjava_lang_StringjintintjfloatfloatjintintID ,figureUID_, fileName_, fileType, jpegCompressionQuality, orientation));
+                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringfileExportjintintjstringjava_lang_StringjintintjfloatfloatjintintID ,figureUID, fileName_, fileType, jpegCompressionQuality, orientation));
                         if (curEnv->ExceptionCheck()) {
 throw GiwsException::JniCallMethodException(curEnv);
 }if (res != NULL) { 
@@ -182,7 +175,6 @@ char * myStringBuffer = new char[strlen(tempString) + 1];
 strcpy(myStringBuffer, tempString);
 curEnv->ReleaseStringUTFChars(res, tempString);
 curEnv->DeleteLocalRef(res);
-curEnv->DeleteLocalRef(figureUID_);
 curEnv->DeleteLocalRef(fileName_);
 curEnv->DeleteLocalRef(cls);
 if (curEnv->ExceptionCheck()) {
index 655fb67..24fe2ed 100644 (file)
@@ -13,7 +13,7 @@
 <package name="org.scilab.modules.graphic_export">
     <object name="FileExporter">
         <method name="fileExport" returnType="String" modifier="static">
-            <parameter name="figureUID" type="String"/>
+            <parameter name="figureUID" type="int"/>
             <parameter name="fileName" type="String"/>
             <parameter name="fileType" type="int"/>
             <parameter name="jpegCompressionQuality" type="float"/>
index 471cc4e..01d4cbb 100644 (file)
@@ -1,5 +1,5 @@
 /* Generated by GIWS (version 2.0.1) with command:
-giws --disable-return-size-array --output-dir D:\git\debug\similan\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file FileExporter.giws.xml 
+giws --disable-return-size-array --output-dir D:\git\debug\master\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file FileExporter.giws.xml 
 */
 /*
 
@@ -76,7 +76,7 @@ private:
 JavaVM * jvm;
 
 protected:
-jmethodID jstringfileExportjstringjava_lang_Stringjstringjava_lang_StringjintintjfloatfloatjintintID; // cache method id
+jmethodID jstringfileExportjintintjstringjava_lang_StringjintintjfloatfloatjintintID; // cache method id
 
 
 
@@ -136,7 +136,7 @@ void synchronize();
 void endSynchronize();
 
 // Methods
-static char* fileExport(JavaVM * jvm_, char const* figureUID, char const* fileName, int fileType, float jpegCompressionQuality, int orientation);
+static char* fileExport(JavaVM * jvm_, int figureUID, char const* fileName, int fileType, float jpegCompressionQuality, int orientation);
 
 
                         /**
index b30456c..5b5b35c 100644 (file)
@@ -1,6 +1,6 @@
 #include "JOGLConstant.hxx"
 /* Generated by GIWS (version 2.0.1) with command:
-giws --disable-return-size-array --output-dir D:\git\debug\similan\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file JOGLConstant.giws.xml 
+giws --disable-return-size-array --output-dir D:\git\debug\master\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file JOGLConstant.giws.xml 
 */
 /*
 
index dd4cb31..688f1db 100644 (file)
@@ -1,5 +1,5 @@
 /* Generated by GIWS (version 2.0.1) with command:
-giws --disable-return-size-array --output-dir D:\git\debug\similan\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file JOGLConstant.giws.xml 
+giws --disable-return-size-array --output-dir D:\git\debug\master\scilab\modules\graphic_export\src\jni\ --throws-exception-on-error --description-file JOGLConstant.giws.xml 
 */
 /*
 
index 0f1f4ac..fa4676a 100644 (file)
 #include "dynlib_graphic_objects.h"
 #include "BOOL.h"
 
-GRAPHIC_OBJECTS_IMPEXP char const* getAxesModel(void);
+GRAPHIC_OBJECTS_IMPEXP int getAxesModel(void);
 
-GRAPHIC_OBJECTS_IMPEXP void setAxesModel(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP void setAxesModel(int iUID);
 
-GRAPHIC_OBJECTS_IMPEXP BOOL isAxesModel(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP BOOL isAxesModel(int iUID);
 
 #endif /* !__AXES_MODEL_H__ */
index a5bdbfc..4e16fa0 100644 (file)
 /**
  * Returns UID of the current selected figure.
  */
-GRAPHIC_OBJECTS_IMPEXP char const* getCurrentFigure(void);
+GRAPHIC_OBJECTS_IMPEXP int getCurrentFigure(void);
 
 /**
  * Modify the current figure if needed.
  */
-GRAPHIC_OBJECTS_IMPEXP void setCurrentFigure(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP void setCurrentFigure(int iUID);
 
 /**
  * To know if a figure is the selected one.
  */
-GRAPHIC_OBJECTS_IMPEXP BOOL isCurrentFigure(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP BOOL isCurrentFigure(int iUID);
 
 #endif /* !__CURRENT_FIGURE_H__ */
index a2af666..d882fe0 100644 (file)
 #define __CURRENT_OBJECT_H__
 
 #include "dynlib_graphic_objects.h"
+#include "BOOL.h"
 /**
  * Returns UID of the current selected object.
  */
-GRAPHIC_OBJECTS_IMPEXP char const* getCurrentObject(void);
+GRAPHIC_OBJECTS_IMPEXP int getCurrentObject(void);
 
 /**
  * Modify the current object if needed.
  */
-GRAPHIC_OBJECTS_IMPEXP void setCurrentObject(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP void setCurrentObject(int iUID);
 
 /**
  * To know if an object is the selected one.
  */
-GRAPHIC_OBJECTS_IMPEXP BOOL isCurrentObject(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP BOOL isCurrentObject(int iUID);
+
+/**
+ * get parent object
+ */
+GRAPHIC_OBJECTS_IMPEXP int getParentObject(int iUID);
+GRAPHIC_OBJECTS_IMPEXP void setParentObject(int iUID, int iParent);
 
 #endif /* !__CURRENT_OBJECT_H__ */
index 5645e4f..f84d2ff 100644 (file)
@@ -15,8 +15,8 @@
 
 #include "dynlib_graphic_objects.h"
 
-GRAPHIC_OBJECTS_IMPEXP char const* getCurrentSubWin(void);
+GRAPHIC_OBJECTS_IMPEXP int getCurrentSubWin(void);
 
-GRAPHIC_OBJECTS_IMPEXP void setCurrentSubWin(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP void setCurrentSubWin(int iUID);
 
 #endif /* !__CURRENT_SUBWIN_H__ */
index 3c09ff5..9ae2e11 100644 (file)
@@ -20,24 +20,24 @@ class DataController
 {
 
 public :
-    static BOOL setGraphicObjectProperty(char const* _pstID, int _iName, void const* _dblValue, int numElements)
+    static BOOL setGraphicObjectProperty(int iUID, int _iName, void const* _dblValue, int numElements)
     {
-        return DataModel::get()->setGraphicObjectProperty(_pstID, _iName, _dblValue, numElements);
+        return DataModel::get()->setGraphicObjectProperty(iUID, _iName, _dblValue, numElements);
     }
 
-    static void getGraphicObjectProperty(char const* _pstID, int _iName, void **_pvData)
+    static void getGraphicObjectProperty(int iUID, int _iName, void **_pvData)
     {
-        return DataModel::get()->getGraphicObjectProperty(_pstID, _iName, _pvData);
+        return DataModel::get()->getGraphicObjectProperty(iUID, _iName, _pvData);
     }
 
-    static char const* createDataObject(char const* _pstID, int _iType)
+    static int createDataObject(int iUID, int _iType)
     {
-        return DataModel::get()->createDataObject(_pstID, _iType);
+        return DataModel::get()->createDataObject(iUID, _iType);
     }
 
-    static void deleteDataObject(char const* _pstID)
+    static void deleteDataObject(int iUID)
     {
-        DataModel::get()->deleteDataObject(_pstID);
+        DataModel::get()->deleteDataObject(iUID);
     }
 
 };
index c77f5f9..b039c40 100644 (file)
@@ -29,14 +29,14 @@ extern "C"
      * @param[in] the given object id.
      * @return the texture width for the given object.
      */
-    int getTextureWidth(char* id);
+    int getTextureWidth(int id);
 
     /**
      * Return the texture height for the given object.
      * @param[in] the given object id.
      * @return the texture height for the given object.
      */
-    int getTextureHeight(char* id);
+    int getTextureHeight(int id);
 
     /**
      * Fill the given buffer with texture data.
@@ -45,7 +45,7 @@ extern "C"
      * @param[in] the buffer length in number of elements.
      * @return the length of writed data.
      */
-    int fillTextureData(char *id, unsigned char* buffer, int bufferLength);
+    int fillTextureData(int id, unsigned char* buffer, int bufferLength);
 
     /**
      * Fill the given buffer with sub-texture data.
@@ -58,14 +58,14 @@ extern "C"
      * @param[in] the length of the sub-texture.
      * @return the length of writed data.
      */
-    int fillSubTextureData(char* id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height);
+    int fillSubTextureData(int id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height);
 
     /**
      * Return the number of data elements for the given object.
      * @param[in] the given object id.
      * @return the number of data elements.
      */
-    int getDataSize(char* id);
+    int getDataSize(int id);
 
     /**
      * Fill the given buffer with vertex data from the given object.
@@ -78,7 +78,7 @@ extern "C"
      * @param[in] the conversion translation factor to apply to data.
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      */
-    void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double scale[], double translation[], int logMask);
+    void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double scale[], double translation[], int logMask);
 
     /**
      * Fill the given buffer with normal data from the given object.
@@ -88,7 +88,7 @@ extern "C"
      * @param[in] the buffer length in number of elements.
      * @param[in] the number of coordinate taken by one element in the buffer.
      */
-    void fillNormals(char* id, float* position, float* buffer, int bufferLength, int elementsSize);
+    void fillNormals(int id, float* position, float* buffer, int bufferLength, int elementsSize);
 
 
     /**
@@ -98,7 +98,7 @@ extern "C"
      * @param[in] the buffer length in number of elements.
      * @param[in] the number of coordinate taken by one element in the buffer (3 for RGB, 4 for RGBA).
      */
-    void fillColors(char* id, float* buffer, int bufferLength, int elementsSize);
+    void fillColors(int id, float* buffer, int bufferLength, int elementsSize);
 
     /**
      * Fill the given buffer with texture coordinates data from the given object.
@@ -106,14 +106,14 @@ extern "C"
      * @param[in] the buffer to fill.
      * @param[in] the buffer length in number of elements.
      */
-    void fillTextureCoordinates(char* id, float* buffer, int bufferLength);
+    void fillTextureCoordinates(int id, float* buffer, int bufferLength);
 
     /**
      * Return the number of indices for the given object.
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    int getIndicesSize(char* id);
+    int getIndicesSize(int id);
 
     /**
      * Fill the given buffer with indices data of the given object.
@@ -123,14 +123,14 @@ extern "C"
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    int fillIndices(char* id, int* buffer, int bufferLength, int logMask);
+    int fillIndices(int id, int* buffer, int bufferLength, int logMask);
 
     /**
      * Return the number of indices for the wire of the given object.
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    int getWireIndicesSize(char* id);
+    int getWireIndicesSize(int id);
 
     /**
      * Fill the given buffer with wire indices data of the given object.
@@ -140,14 +140,14 @@ extern "C"
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    int fillWireIndices(char* id, int* buffer, int bufferLength, int logMask);
+    int fillWireIndices(int id, int* buffer, int bufferLength, int logMask);
 
     /**
      * Return the number of mark indices of the given object.
      * @param[in] the given object id.
      * @return the number of mark indices.
      */
-    int getMarkIndicesSize(char* id);
+    int getMarkIndicesSize(int id);
 
     /**
      * Fill the given buffer with mark indices data of the given object.
@@ -156,49 +156,49 @@ extern "C"
      * @param[in] the buffer length.
      * @return the number of indices actually written.
      */
-    int fillMarkIndices(char* id, int* buffer, int bufferLength);
+    int fillMarkIndices(int id, int* buffer, int bufferLength);
 
     /**
      * Get texture data of the given object.
      * @param[in] the id of the given object.
      * @return a JavaDirectBuffer struct which will be converted into a java.nio.ByteBuffer.
      */
-    JavaDirectBuffer getTextureData(char * id);
+    JavaDirectBuffer getTextureData(int id);
 
     /**
      * Get texture image type of the given object.
      * @param[in] id the id of the given object.
      * @return the image type.
      */
-    int getTextureImageType(char * id);
+    int getTextureImageType(int id);
 
     /**
      * Get the Scilab data type associated with the texture of the given object.
      * @param[in] id the id of the given object.
      * @return the image type (0 for RGB, 1 for RGBA, 2 for GRAY).
      */
-    int getTextureDataType(char * id);
+    int getTextureDataType(int id);
 
     /**
      * Get texture OpenGL type of the given object.
      * @param[in] id the id of the given object.
      * @return the OpenGL type.
      */
-    int getTextureGLType(char * id);
+    int getTextureGLType(int id);
 
     /**
      * Dispose texture data of the given object.
      * @param[in] id the id of the given object.
      * @param[in] buffer the address of the buffer to dipose.
      */
-    void disposeTextureData(char * id, unsigned char * buffer);
+    void disposeTextureData(int id, unsigned char * buffer);
 
     /**
      * Dispose texture data of the given object.
      * @param[in] id the id of the given object.
      * @return 1 if the texture is ROW_MAJOR_ORDER
      */
-    int isTextureRowOrder(char * id);
+    int isTextureRowOrder(int id);
 
     /**
      * Set tha availability of the ABGR extension
index 13a8757..aab17a5 100644 (file)
@@ -38,7 +38,7 @@ class DataModel
 private :
     DataModel()
     {
-        m_dataMap = new std::map<std::string, Data3D*>();
+        m_dataMap = new std::map<int, Data3D*>();
     }
 
 public :
@@ -60,23 +60,23 @@ public :
      * property return value (also FALSE); returning an int, with -1 for a failed
      * allocation would possibly solve this problem.
      */
-    BOOL setGraphicObjectProperty(char const* _pstID, int _iName, void const* _dblValue, int numElements);
+    BOOL setGraphicObjectProperty(int iUID, int _iName, void const* _dblValue, int numElements);
 
     /** Returns a graphic object vector property */
-    void getGraphicObjectProperty(char const* _pstID, int _iName, void **_pvData);
+    void getGraphicObjectProperty(int iUID, int _iName, void **_pvData);
 
     /** Creates a data object */
-    char const* createDataObject(char const* _pstID, int _iType);
+    int createDataObject(int iUID, int _iType);
 
     /**
      * Deletes a data object
      */
-    void deleteDataObject(char const* _pstID);
+    void deleteDataObject(int iUID);
 
 private :
     static DataModel *m_me;
 
-    std::map<std::string, Data3D*> *m_dataMap;
+    std::map<int, Data3D*> *m_dataMap;
 };
 
 #endif
index 9c7acf2..62a1fbc 100644 (file)
@@ -117,7 +117,7 @@ public :
      * @param[in] the given object id.
      * @return the number of data elements.
      */
-    static int getDataSize(char* id);
+    static int getDataSize(int id);
 
     /**
      * Fills the given buffer with vertex data from the given object.
@@ -130,7 +130,7 @@ public :
      * @param[in] the conversion translation factor to apply to data.
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      */
-    static void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
+    static void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
 
     /**
      * Fills the given buffer with color data from the given object.
@@ -138,14 +138,14 @@ public :
      * @param[out] the buffer to fill.
      * @param[in] the buffer length in number of elements.
      */
-    static void fillTextureCoordinates(char* id, float* buffer, int bufferLength);
+    static void fillTextureCoordinates(int id, float* buffer, int bufferLength);
 
     /**
      * Returns the number of indices for the given object.
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    static int getIndicesSize(char* id);
+    static int getIndicesSize(int id);
 
     /**
      * Fills the given buffer with indices data of the given object.
@@ -155,7 +155,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillIndices(int id, int* buffer, int bufferLength, int logMask);
 
     /**
      * Returns the number of wireframe indices for the given object.
@@ -165,7 +165,7 @@ public :
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    static int getWireIndicesSize(char* id);
+    static int getWireIndicesSize(int id);
 
     /**
      * Fills the given buffer with wireframe indices data of the given object.
@@ -177,7 +177,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillWireIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillWireIndices(int id, int* buffer, int bufferLength, int logMask);
 
 };
 
index 854638a..4ad4fbc 100644 (file)
@@ -51,6 +51,6 @@ GRAPHIC_OBJECTS_IMPEXP BOOL sciHasFigures(void);
  * returns the UID of window i
  * or NULL if this window does not exists
  */
-GRAPHIC_OBJECTS_IMPEXP char const* getFigureFromIndex(int figNum);
+GRAPHIC_OBJECTS_IMPEXP int getFigureFromIndex(int figNum);
 
 #endif /* !__FIGURE_LIST_H__ */
index 930eefe..1a3e224 100644 (file)
 #include "dynlib_graphic_objects.h"
 #include "BOOL.h"
 
-GRAPHIC_OBJECTS_IMPEXP char const* getFigureModel(void);
+GRAPHIC_OBJECTS_IMPEXP int getFigureModel(void);
 
-GRAPHIC_OBJECTS_IMPEXP void setFigureModel(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP void setFigureModel(int iUID);
 
-GRAPHIC_OBJECTS_IMPEXP BOOL isFigureModel(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP BOOL isFigureModel(int iUID);
 
 #endif /* !__FIGURE_MODEL_H__ */
index 893f59f..9be38f8 100644 (file)
@@ -35,7 +35,7 @@
  * @param any uid
  * @return a handle mapped to the uid
  */
-GRAPHIC_OBJECTS_IMPEXP long getHandle(char const* UID);
+GRAPHIC_OBJECTS_IMPEXP long getHandle(int iUID);
 
 /**
  * @brief Get the uid of an handle.
@@ -43,6 +43,6 @@ GRAPHIC_OBJECTS_IMPEXP long getHandle(char const* UID);
  * @param a valid handle
  * @return a reference to an existing uid or null if invalid.
  */
-GRAPHIC_OBJECTS_IMPEXP char const* getObjectFromHandle(long handle);
+GRAPHIC_OBJECTS_IMPEXP int getObjectFromHandle(long handle);
 
 #endif /* !__HANDLE_MANAGEMENT_H__ */
index 2d21615..61b043e 100644 (file)
 class MatPlotDecomposer
 {
 public:
-    static int getTextureWidth(char* id);
-    static int getTextureHeight(char* id);
-    static int fillTextureData(char* id, unsigned char* buffer, int bufferLength);
-    static int fillTextureData(char* id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height);
-    static int getTextureData(char* id, void ** address, unsigned int * size);
-    static void disposeTextureData(char * id, unsigned char * buffer);
-    static int getTextureImageType(char * id);
-    static int getTextureDataType(char * id);
-    static int getTextureGLType(char * id);
-    static int isTextureRowOrder(char * id);
+    static int getTextureWidth(int id);
+    static int getTextureHeight(int id);
+    static int fillTextureData(int id, unsigned char* buffer, int bufferLength);
+    static int fillTextureData(int id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height);
+    static int getTextureData(int id, void ** address, unsigned int * size);
+    static void disposeTextureData(int id, unsigned char * buffer);
+    static int getTextureImageType(int id);
+    static int getTextureDataType(int id);
+    static int getTextureGLType(int id);
+    static int isTextureRowOrder(int id);
 };
 
 #endif
index 68b6e32..ae7971c 100644 (file)
@@ -287,7 +287,7 @@ public :
      * @param[in] the given object id.
      * @return the number of data elements.
      */
-    static int getDataSize(char* id);
+    static int getDataSize(int id);
 
     /**
      * Fills the given buffer with vertex data from the given object.
@@ -300,14 +300,14 @@ public :
      * @param[in] the conversion translation factor to apply to data.
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      */
-    static void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
+    static void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
 
     /**
      * Returns the number of indices for the given object.
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    static int getIndicesSize(char* id);
+    static int getIndicesSize(int id);
 
     /**
      * Fills the given buffer with indices data of the given object.
@@ -317,7 +317,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillIndices(int id, int* buffer, int bufferLength, int logMask);
 };
 
 /**
index 34ab549..b35a8c1 100644 (file)
@@ -98,7 +98,7 @@ public :
      * @param[in] the buffer length in number of elements.
      * @param[in] the number of components taken by one element in the buffer (3 or 4).
      */
-    static void fillColors(char* id, float* buffer, int bufferLength, int elementsSize);
+    static void fillColors(int id, float* buffer, int bufferLength, int elementsSize);
 
     /**
      * Fills the given buffer with indices data of the given object.
@@ -108,7 +108,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillIndices(int id, int* buffer, int bufferLength, int logMask);
 };
 
 #endif
index 46a76a8..302219e 100644 (file)
@@ -121,7 +121,7 @@ public :
      * @param[in] the conversion translation factor to apply to data.
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      */
-    static void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
+    static void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
 
     /**
      * Fills the given buffer with color data from the given object.
@@ -130,7 +130,7 @@ public :
      * @param[in] the buffer length in number of elements.
      * @param[in] the number of components taken by one element in the buffer (3 or 4).
      */
-    static void fillColors(char* id, float* buffer, int bufferLength, int elementsSize);
+    static void fillColors(int id, float* buffer, int bufferLength, int elementsSize);
 
     /**
      * Fills the given buffer with indices data of the given object.
@@ -140,7 +140,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillIndices(int id, int* buffer, int bufferLength, int logMask);
 
     template <typename T>
     inline static void fillColorsByIndex(T * indices, float * buffer, int elementsSize, const int nbRow, const int nbCol, double * colormap, const int colormapSize)
index 6ec9983..99383f0 100644 (file)
@@ -99,7 +99,7 @@ public :
      * @param[in] the conversion translation factor to apply to data.
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      */
-    static void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
+    static void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
 
     /**
      * Fills the given buffer with color data from the given object.
@@ -108,7 +108,7 @@ public :
      * @param[in] the buffer length in number of elements.
      * @param[in] the number of components taken by one element in the buffer (3 or 4).
      */
-    static void fillColors(char* id, float* buffer, int bufferLength, int elementsSize);
+    static void fillColors(int id, float* buffer, int bufferLength, int elementsSize);
 
     /**
      * Fills the given buffer with index data from the given object.
@@ -118,7 +118,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillIndices(int id, int* buffer, int bufferLength, int logMask);
 
     /**
      * Returns the number of wireframe indices for the given object.
@@ -128,7 +128,7 @@ public :
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    static int getWireIndicesSize(char* id);
+    static int getWireIndicesSize(int id);
 
     /**
      * Fills the given buffer with wireframe indices data of the given object.
@@ -140,7 +140,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillWireIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillWireIndices(int id, int* buffer, int bufferLength, int logMask);
 };
 
 #endif
index bbbc108..8e9e469 100644 (file)
@@ -55,7 +55,7 @@ private :
      * @param[in] the polyline y-shift array.
      * @param[in] the polyline z-shift array.
      */
-    static void fillSegmentsDecompositionVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
+    static void fillSegmentsDecompositionVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift);
 
     /**
@@ -94,7 +94,7 @@ private :
      * @param[in] the polyline y-shift array.
      * @param[in] the polyline z-shift array.
      */
-    static void fillStairDecompositionVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
+    static void fillStairDecompositionVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift);
 
     /**
@@ -113,7 +113,7 @@ private :
      * @param[in] the polyline y-shift array.
      * @param[in] the polyline z-shift array.
      */
-    static void fillVerticalLinesDecompositionVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
+    static void fillVerticalLinesDecompositionVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift);
 
     /**
@@ -146,7 +146,7 @@ private :
      * @param[in] the polyline y-shift array.
      * @param[in] the polyline z-shift array.
      */
-    static void fillVerticalBarsDecompositionVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
+    static void fillVerticalBarsDecompositionVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift);
 
     /**
@@ -167,7 +167,7 @@ private :
      * @param[in] the polyline y-shift array.
      * @param[in] the polyline z-shift array.
      */
-    static void fillHorizontalBarsDecompositionVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
+    static void fillHorizontalBarsDecompositionVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift);
 
     /**
@@ -202,7 +202,7 @@ private :
      * @param[in] the polyline style.
      * @return the number of indices actually written.
      */
-    static int fillTriangleIndices(char* id, int* buffer, int bufferLength,
+    static int fillTriangleIndices(int id, int* buffer, int bufferLength,
                                    int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift, int fillMode, int polylineStyle);
 
     /**
@@ -219,7 +219,7 @@ private :
      * @param[in] the polyline z-shift array.
      * @return the number of indices actually written.
      */
-    static int fillArrowTriangleIndices(char* id, int* buffer, int bufferLength,
+    static int fillArrowTriangleIndices(int id, int* buffer, int bufferLength,
                                         int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift);
 
     /**
@@ -235,7 +235,7 @@ private :
      * @param[in] the polyline z-shift array.
      * @return the number of indices actually written.
      */
-    static int fillBarsDecompositionTriangleIndices(char* id, int* buffer, int bufferLength,
+    static int fillBarsDecompositionTriangleIndices(int id, int* buffer, int bufferLength,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift);
 
     /**
@@ -287,7 +287,7 @@ private :
      * @param[in] a flag indicating whether the polyline is closed or not.
      * @return the number of indices actually written.
      */
-    static int fillSegmentsDecompositionSegmentIndices(char* id, int* buffer, int bufferLength,
+    static int fillSegmentsDecompositionSegmentIndices(int id, int* buffer, int bufferLength,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift, int lineMode, int closed);
 
     /**
@@ -305,7 +305,7 @@ private :
      * @param[in] a flag indicating whether the polyline is closed or not.
      * @return the number of indices actually written.
      */
-    static int fillStairDecompositionSegmentIndices(char* id, int* buffer, int bufferLength,
+    static int fillStairDecompositionSegmentIndices(int id, int* buffer, int bufferLength,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift, int lineMode, int closed);
 
     /**
@@ -322,7 +322,7 @@ private :
      * @param[in] the line mode flag.
      * @return the number of indices actually written.
      */
-    static int fillVerticalLinesDecompositionSegmentIndices(char* id, int* buffer, int bufferLength,
+    static int fillVerticalLinesDecompositionSegmentIndices(int id, int* buffer, int bufferLength,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift, int lineMode);
 
     /**
@@ -339,7 +339,7 @@ private :
      * @param[in] the line mode flag.
      * @return the number of indices actually written.
      */
-    static int fillBarsDecompositionSegmentIndices(char* id, int* buffer, int bufferLength,
+    static int fillBarsDecompositionSegmentIndices(int id, int* buffer, int bufferLength,
             int logMask, double* coordinates, int nPoints, double* xshift, double* yshift, double* zshift, int lineMode);
 
     /**
@@ -365,7 +365,7 @@ public :
      * @param[in] the given object id.
      * @return the number of data elements.
      */
-    static int getDataSize(char* id);
+    static int getDataSize(int id);
 
     /**
      * Fills the given buffer with vertex data from the given object.
@@ -378,7 +378,7 @@ public :
      * @param[in] the conversion translation factor to apply to data.
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      */
-    static void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
+    static void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
 
     /**
      * Fills the given buffer with color data from the given object.
@@ -387,7 +387,7 @@ public :
      * @param[in] the buffer length in number of elements.
      * @param[in] the number of components taken by one element in the buffer (3 or 4).
      */
-    static void fillColors(char* id, float* buffer, int bufferLength, int elementsSize);
+    static void fillColors(int id, float* buffer, int bufferLength, int elementsSize);
 
     /**
      * Fills the given buffer with texture coordinate data from the given object.
@@ -395,14 +395,14 @@ public :
      * @param[out] the buffer to fill.
      * @param[in] the buffer length in number of elements.
      */
-    static void fillTextureCoordinates(char* id, float* buffer, int bufferLength);
+    static void fillTextureCoordinates(int id, float* buffer, int bufferLength);
 
     /**
      * Returns the number of indices for the given object.
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    static int getIndicesSize(char* id);
+    static int getIndicesSize(int id);
 
     /**
      * Fills the given buffer with indices data of the given object.
@@ -412,7 +412,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillIndices(int id, int* buffer, int bufferLength, int logMask);
 
     /**
      * Returns the number of wireframe indices for the given object.
@@ -422,7 +422,7 @@ public :
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    static int getWireIndicesSize(char* id);
+    static int getWireIndicesSize(int id);
 
     /**
      * Fills the given buffer with wireframe indices data of the given object.
@@ -434,7 +434,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillWireIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillWireIndices(int id, int* buffer, int bufferLength, int logMask);
 };
 
 #endif
index 32af333..c74950e 100644 (file)
 
 extern "C"
 {
-    void ScilabNativeView__createObject(char const* pstId);
-    void ScilabNativeView__deleteObject(char const* pstId);
-    void ScilabNativeView__updateObject(char const* pstId, int iProperty);
-    void ScilabNativeView__setCurrentFigure(char const* pstId);
-    void ScilabNativeView__setCurrentSubWin(char const* pstId);
-    void ScilabNativeView__setCurrentObject(char const* pstId);
+    void ScilabNativeView__createObject(int id);
+    void ScilabNativeView__deleteObject(int id);
+    void ScilabNativeView__updateObject(int id, int iProperty);
+    void ScilabNativeView__setCurrentFigure(int id);
+    void ScilabNativeView__setCurrentSubWin(int id);
+    void ScilabNativeView__setCurrentObject(int id);
     int ScilabNativeView__getValidDefaultFigureId();
 }
 
@@ -36,54 +36,54 @@ private :
     ~ScilabView() {}
 
     // Define type for easy manipulation.
-    typedef std::map<std::string, long>  __handleList;
+    typedef std::map<int, long>  __handleList;
     typedef __handleList::iterator          __handleList_iterator;
-    typedef std::map<long, std::string>  __uidList;
+    typedef std::map<long, int>  __uidList;
     typedef __uidList::iterator          __uidList_iterator;
-    typedef std::map<std::string, int>    __figureList;
+    typedef std::map<int, int>    __figureList;
     typedef __figureList::iterator          __figureList_iterator;
 
-    static __figureList                     m_figureList;
-    static __handleList                     m_handleList;
-    static __uidList                        m_uidList;
-    static long                             m_topHandleValue;
-    static std::string                      m_currentFigure;
-    static std::string                      m_currentObject;
-    static std::string                      m_currentSubWin;
-    static std::string                      m_figureModel;
-    static std::string                      m_axesModel;
+    static __figureList m_figureList;
+    static __handleList m_handleList;
+    static __uidList    m_uidList;
+    static long         m_topHandleValue;
+    static int          m_currentFigure;
+    static int          m_currentObject;
+    static int          m_currentSubWin;
+    static int          m_figureModel;
+    static int          m_axesModel;
 
 public :
-    static void   createObject(char const* pstId);
-    static void   deleteObject(char const* pstId);
-    static void   updateObject(char const* pstId, int iProperty);
+    static void createObject(int iUID);
+    static void deleteObject(int iUID);
+    static void updateObject(int iUID, int iProperty);
 
-    static int    getNbFigure(void);
-    static void   getFiguresId(int ids[]);
-    static void   registerToController(void);
-    static void   unregisterToController(void);
-    static bool   existsFigureId(int id);
-    static char const*  getFigureFromIndex(int figureNumber);
-    static bool   isEmptyFigureList(void);
-    static int getValidDefaultFigureId();
+    static int  getNbFigure(void);
+    static void getFiguresId(int ids[]);
+    static void registerToController(void);
+    static void unregisterToController(void);
+    static bool existsFigureId(int id);
+    static int  getFigureFromIndex(int figureNumber);
+    static bool isEmptyFigureList(void);
+    static int  getValidDefaultFigureId();
 
-    static char const*  getCurrentFigure(void);
-    static void   setCurrentFigure(char const* UID);
+    static int  getCurrentFigure(void);
+    static void setCurrentFigure(int iUID);
 
-    static char const*  getCurrentObject(void);
-    static void   setCurrentObject(char const* UID);
+    static int  getCurrentObject(void);
+    static void setCurrentObject(int iUID);
 
-    static char const*  getCurrentSubWin(void);
-    static void   setCurrentSubWin(char const* UID);
+    static int  getCurrentSubWin(void);
+    static void setCurrentSubWin(int iUID);
 
-    static long   getObjectHandle(char const* UID);
-    static char const*  getObjectFromHandle(long handle);
+    static long getObjectHandle(int iUID);
+    static int  getObjectFromHandle(long handle);
 
-    static char const*  getFigureModel(void);
-    static void   setFigureModel(char const* UID);
+    static int  getFigureModel(void);
+    static void setFigureModel(int iUID);
 
-    static char const* getAxesModel(void);
-    static void setAxesModel(char const* UID);
+    static int  getAxesModel(void);
+    static void setAxesModel(int iUID);
 
 };
 
index 3a9ce80..aec7865 100644 (file)
@@ -81,7 +81,7 @@ public :
      * @param[in] the given object id.
      * @return the number of data elements.
      */
-    static int getDataSize(char* id);
+    static int getDataSize(int id);
 
     /**
      * Fills the given buffer with vertex data from the given object.
@@ -94,7 +94,7 @@ public :
      * @param[in] the conversion translation factor to apply to data.
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      */
-    static void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
+    static void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask);
 
     /**
      * Fills the given buffer with color data from the given object.
@@ -103,7 +103,7 @@ public :
      * @param[in] the buffer length in number of elements.
      * @param[in] the number of components taken by one element in the buffer (3 or 4).
      */
-    static void fillColors(char* id, float* buffer, int bufferLength, int elementsSize);
+    static void fillColors(int id, float* buffer, int bufferLength, int elementsSize);
 
     /**
      * Fills the given buffer with texture coordinates data from the given object.
@@ -111,14 +111,14 @@ public :
      * @param[in] the buffer to fill.
      * @param[in] the buffer length in number of elements.
      */
-    static void fillTextureCoordinates(char* id, float* buffer, int bufferLength);
+    static void fillTextureCoordinates(int id, float* buffer, int bufferLength);
 
     /**
      * Returns the number of indices for the given object.
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    static int getIndicesSize(char* id);
+    static int getIndicesSize(int id);
 
     /**
      * Fills the given buffer with indices data of the given object.
@@ -128,7 +128,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillIndices(int id, int* buffer, int bufferLength, int logMask);
 
     /**
      * Returns the number of wireframe indices for the given object.
@@ -138,7 +138,7 @@ public :
      * @param[in] the given object id.
      * @return the object's number of indices.
      */
-    static int getWireIndicesSize(char* id);
+    static int getWireIndicesSize(int id);
 
     /**
      * Fills the given buffer with wireframe indices data of the given object.
@@ -150,7 +150,7 @@ public :
      * @param[in] the bit mask specifying whether logarithmic coordinates are used.
      * @return the number of indices actually written.
      */
-    static int fillWireIndices(char* id, int* buffer, int bufferLength, int logMask);
+    static int fillWireIndices(int id, int* buffer, int bufferLength, int logMask);
 };
 
 #endif
index 8848ac9..bf827ed 100644 (file)
 ** Ask Controller to create a graphic object
 ** of the given _sType.
 */
-GRAPHIC_OBJECTS_IMPEXP char *createGraphicObject(int _iType);
+GRAPHIC_OBJECTS_IMPEXP int createGraphicObject(int _iType);
 
 /*
 ** Ask Controller to clone a graphic object
 ** referenced the given _sId.
 */
-GRAPHIC_OBJECTS_IMPEXP char *cloneGraphicObject(char const* _sId);
+GRAPHIC_OBJECTS_IMPEXP int cloneGraphicObject(int iId);
 
 /*
 ** Ask Controller to create a data object
 ** referenced by the given _sId and of the given _sType
 */
-GRAPHIC_OBJECTS_IMPEXP char const* createDataObject(char const* _sId, int _iType);
+GRAPHIC_OBJECTS_IMPEXP int createDataObject(int iId, int _iType);
 
 /*
 ** Ask Controller to create a figure menubar
 ** referenced by the given _sFigureId and of the given _sType
 */
-GRAPHIC_OBJECTS_IMPEXP void buildFigureMenuBar(char const* _sFigureId);
+GRAPHIC_OBJECTS_IMPEXP void buildFigureMenuBar(int iFigureId);
 
-GRAPHIC_OBJECTS_IMPEXP char * constructRectangles(char * pparentsubwinUID, double x, double y, double height, double width, int foreground, int background, int isfilled, int isline);
+GRAPHIC_OBJECTS_IMPEXP int constructRectangles(int iParentsubwinUID, double x, double y, double height, double width, int foreground, int background, int isfilled, int isline);
 
 #endif /* !__CREATEGRAPHICOBJECT_H__ */
index f21ae4f..3d6ffcb 100644 (file)
 ** Ask Controller to delete a graphic object
 ** referenced by the given _sId.
 */
-GRAPHIC_OBJECTS_IMPEXP void deleteGraphicObject(char *_sId);
+GRAPHIC_OBJECTS_IMPEXP void deleteGraphicObject(int iUID);
 
 /*
 ** Ask Controller to delete a data object
 ** referenced by the given _sId.
 */
-GRAPHIC_OBJECTS_IMPEXP void deleteDataObject(char const *_sId);
+GRAPHIC_OBJECTS_IMPEXP void deleteDataObject(int iUID);
 
 #endif /* !__DELETEGRAPHICOBJECT_H__ */
index 57f76db..6434855 100644 (file)
@@ -18,6 +18,6 @@
 /*
 ** Retrieve Scilab Console identifier.
 */
-GRAPHIC_OBJECTS_IMPEXP char *getConsoleIdentifier(void);
+GRAPHIC_OBJECTS_IMPEXP int getConsoleIdentifier(void);
 
 #endif /* !__GETCONSOLEIDENTIFIER_H__ */
index 798c4bf..0321e44 100644 (file)
 
 #include "returnType.h"
 #include "dynlib_graphic_objects.h"
+#include "CurrentObject.h"
 
 /*
 ** Retrieve Graphic object property from Model.
 ** Specify type expected as parameter for JNI.
 */
-GRAPHIC_OBJECTS_IMPEXP void getGraphicObjectProperty(char const* _pstID, const int _iName, enum _ReturnType_ _returnType, void **_pvData);
+GRAPHIC_OBJECTS_IMPEXP void getGraphicObjectProperty(int iID, const int _iName, enum _ReturnType_ _returnType, void **_pvData);
 
 /**
  * @brief release a Graphic object property from the Model.
index a85d591..aa9addf 100644 (file)
@@ -19,8 +19,9 @@
 
 #include "returnType.h"
 #include "dynlib_graphic_objects.h"
+#include "CurrentObject.h"
 
-GRAPHIC_OBJECTS_IMPEXP void setGraphicObjectRelationship(char const* _parentId, char const* _childId);
-GRAPHIC_OBJECTS_IMPEXP BOOL setGraphicObjectProperty(char const* _psUID, const int _iPropertyName, void const* _pvValue, enum _ReturnType_ _valueTtype, int numElements);
+GRAPHIC_OBJECTS_IMPEXP void setGraphicObjectRelationship(int iParentId, int iChildId);
+GRAPHIC_OBJECTS_IMPEXP BOOL setGraphicObjectProperty(int iUID, const int _iPropertyName, void const* _pvValue, enum _ReturnType_ _valueTtype, int numElements);
 
 #endif /* !__SETGRAPHICOBJECTPROPERTY_H__ */
index 53f3912..d5430b0 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">
     <ClInclude Include="..\..\includes\Texture.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\DataLoader.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="core_import.def">
       <Filter>Swig Files</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 44b1194..80222e8 100644 (file)
@@ -18,18 +18,18 @@ extern "C"
 #include "AxesModel.h"
 }
 
-char const* getAxesModel(void)
+int getAxesModel(void)
 {
     return ScilabView::getAxesModel();
 }
-void setAxesModel(char const* UID)
+void setAxesModel(int UID)
 {
     ScilabView::setAxesModel(UID);
 }
 
-BOOL isAxesModel(char const* UID)
+BOOL isAxesModel(int UID)
 {
-    if (strcmp(UID, getAxesModel()) == 0)
+    if (UID == getAxesModel())
     {
         return TRUE;
     }
index 0cf63cd..b74f682 100644 (file)
@@ -20,19 +20,19 @@ extern "C"
 #include "CurrentFigure.h"
 }
 
-char const* getCurrentFigure(void)
+int getCurrentFigure(void)
 {
     return ScilabView::getCurrentFigure();
 }
 
-void setCurrentFigure(char const* UID)
+void setCurrentFigure(int UID)
 {
     ScilabView::setCurrentFigure(UID);
 }
 
-BOOL isCurrentFigure(char const* UID)
+BOOL isCurrentFigure(int UID)
 {
-    if (strcmp(UID, ScilabView::getCurrentFigure()) == 0)
+    if (UID == ScilabView::getCurrentFigure())
     {
         return TRUE;
     }
index 19aaf21..99b38db 100644 (file)
 extern "C"
 {
 #include <string.h>
+#include "getGraphicObjectProperty.h"
+#include "setGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
 
 #include "BOOL.h"
 #include "CurrentObject.h"
 }
 
 
-char const* getCurrentObject(void)
+int getCurrentObject(void)
 {
     return ScilabView::getCurrentObject();
 }
 
-void setCurrentObject(char const* UID)
+void setCurrentObject(int UID)
 {
     ScilabView::setCurrentObject(UID);
 }
 
-BOOL isCurrentObject(char const* UID)
+BOOL isCurrentObject(int UID)
 {
-    if (strcmp(UID, ScilabView::getCurrentObject()) == 0)
+    if (UID == ScilabView::getCurrentObject())
     {
         return TRUE;
     }
     return FALSE;
 }
+
+int getParentObject(int iUID)
+{
+    int iParent = 0;
+    int* piParent = &iParent;
+    if (iUID == 0)
+    {
+        return 0;
+    }
+
+    getGraphicObjectProperty(iUID, __GO_PARENT__, jni_int, (void**)&piParent);
+    return iParent;
+}
+
+void setParentObject(int iUID, int iParent)
+{
+    setGraphicObjectProperty(iUID, __GO_PARENT__, &iParent, jni_int, 1);
+    return;
+}
index a74aa04..cfae887 100644 (file)
@@ -17,12 +17,12 @@ extern "C"
 #include "CurrentSubwin.h"
 }
 
-char const* getCurrentSubWin(void)
+int getCurrentSubWin(void)
 {
     return ScilabView::getCurrentSubWin();
 }
 
-void setCurrentSubWin(char const* UID)
+void setCurrentSubWin(int UID)
 {
     ScilabView::setCurrentSubWin(UID);
 }
index bf54d8a..f9071aa 100644 (file)
@@ -31,7 +31,7 @@ extern "C"
 #include "graphicObjectProperties.h"
 }
 
-int getTextureWidth(char* id)
+int getTextureWidth(int id)
 {
     int iType = 0;
     int *piType = &iType;
@@ -46,7 +46,7 @@ int getTextureWidth(char* id)
     }
 }
 
-int getTextureHeight(char* id)
+int getTextureHeight(int id)
 {
     int iType = 0;
     int *piType = &iType;
@@ -61,7 +61,7 @@ int getTextureHeight(char* id)
     }
 }
 
-int fillTextureData(char* id, unsigned char* buffer, int bufferLength)
+int fillTextureData(int id, unsigned char* buffer, int bufferLength)
 {
     int iType = 0;
     int *piType = &iType;
@@ -76,7 +76,7 @@ int fillTextureData(char* id, unsigned char* buffer, int bufferLength)
     }
 }
 
-int fillSubTextureData(char* id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height)
+int fillSubTextureData(int id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height)
 {
     int iType = 0;
     int *piType = &iType;
@@ -91,7 +91,7 @@ int fillSubTextureData(char* id, unsigned char* buffer, int bufferLength, int x,
     }
 }
 
-int getDataSize(char* id)
+int getDataSize(int id)
 {
     int iType = 0;
     int *piType = &iType;
@@ -118,7 +118,7 @@ int getDataSize(char* id)
 
 }
 
-void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
+void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
 {
     int iType = 0;
     int *piType = &iType;
@@ -149,7 +149,7 @@ void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, i
 }
 
 
-void fillNormals(char* id, float* position, float* buffer, int bufferLength, int elementsSize)
+void fillNormals(int id, float* position, float* buffer, int bufferLength, int elementsSize)
 {
 
     int iType = 0;
@@ -160,13 +160,13 @@ void fillNormals(char* id, float* position, float* buffer, int bufferLength, int
     switch (iType)
     {
         case __GO_FAC3D__ :
-            {
-                int numVerticesPerGon = 0;
-                int* piNumVerticesPerGon = &numVerticesPerGon;
-                getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES_PER_GON__, jni_int, (void**) &piNumVerticesPerGon);
-                CalculatePolygonNormalFlat(position, buffer, bufferLength, elementsSize, numVerticesPerGon);
-            }
-            break;
+        {
+            int numVerticesPerGon = 0;
+            int* piNumVerticesPerGon = &numVerticesPerGon;
+            getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES_PER_GON__, jni_int, (void**) &piNumVerticesPerGon);
+            CalculatePolygonNormalFlat(position, buffer, bufferLength, elementsSize, numVerticesPerGon);
+        }
+        break;
         case __GO_FEC__ :
             break;
         case __GO_GRAYPLOT__ :
@@ -185,13 +185,13 @@ void fillNormals(char* id, float* position, float* buffer, int bufferLength, int
             getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_Y__, jni_int, (void**) &piNumY);
             CalculateGridNormalSmooth(position, buffer, bufferLength, elementsSize, numX, numY);
         }
-            break;
+        break;
         case __GO_POLYLINE__ :
             break;
     }
 }
 
-void fillTextureCoordinates(char* id, float* BUFF, int bufferLength)
+void fillTextureCoordinates(int id, float* BUFF, int bufferLength)
 {
     int iType = 0;
     int *piType = &iType;
@@ -212,7 +212,7 @@ void fillTextureCoordinates(char* id, float* BUFF, int bufferLength)
     }
 }
 
-void fillColors(char* id, float* BUFF, int bufferLength, int elementsSize)
+void fillColors(int id, float* BUFF, int bufferLength, int elementsSize)
 {
     int iType = 0;
     int *piType = &iType;
@@ -240,7 +240,7 @@ void fillColors(char* id, float* BUFF, int bufferLength, int elementsSize)
 }
 
 
-int getIndicesSize(char* id)
+int getIndicesSize(int id)
 {
     int iType = 0;
     int *piType = &iType;
@@ -267,7 +267,7 @@ int getIndicesSize(char* id)
 }
 
 
-int fillIndices(char* id, int* buffer, int bufferLength, int logMask)
+int fillIndices(int id, int* buffer, int bufferLength, int logMask)
 {
     int iType = 0;
     int *piType = &iType;
@@ -293,7 +293,7 @@ int fillIndices(char* id, int* buffer, int bufferLength, int logMask)
     }
 }
 
-int getWireIndicesSize(char* id)
+int getWireIndicesSize(int id)
 {
     int iType = 0;
     int *piType = &iType;
@@ -315,7 +315,7 @@ int getWireIndicesSize(char* id)
     }
 }
 
-int fillWireIndices(char* id, int* buffer, int bufferLength, int logMask)
+int fillWireIndices(int id, int* buffer, int bufferLength, int logMask)
 {
     int iType = 0;
     int *piType = &iType;
@@ -337,18 +337,18 @@ int fillWireIndices(char* id, int* buffer, int bufferLength, int logMask)
     }
 }
 
-int getMarkIndicesSize(char* id)
+int getMarkIndicesSize(int id)
 {
     return 0;
 }
 
-int fillMarkIndices(char* id, int* BUFF, int bufferLength)
+int fillMarkIndices(int id, int* BUFF, int bufferLength)
 {
     // TODO.
     return 0;
 }
 
-JavaDirectBuffer getTextureData(char * id)
+JavaDirectBuffer getTextureData(int id)
 {
     JavaDirectBuffer info;
     int iType = 0;
@@ -375,7 +375,7 @@ JavaDirectBuffer getTextureData(char * id)
     return info;
 }
 
-int getTextureImageType(char * id)
+int getTextureImageType(int id)
 {
     int iType = 0;
     int *piType = &iType;
@@ -390,7 +390,7 @@ int getTextureImageType(char * id)
     return -1;
 }
 
-int getTextureDataType(char * id)
+int getTextureDataType(int id)
 {
     int iType = 0;
     int *piType = &iType;
@@ -405,7 +405,7 @@ int getTextureDataType(char * id)
     return -1;
 }
 
-int getTextureGLType(char * id)
+int getTextureGLType(int id)
 {
     int iType = 0;
     int *piType = &iType;
@@ -420,7 +420,7 @@ int getTextureGLType(char * id)
     return -1;
 }
 
-void disposeTextureData(char * id, unsigned char * buffer)
+void disposeTextureData(int id, unsigned char * buffer)
 {
     int iType = 0;
     int *piType = &iType;
@@ -433,7 +433,7 @@ void disposeTextureData(char * id, unsigned char * buffer)
     }
 }
 
-int isTextureRowOrder(char * id)
+int isTextureRowOrder(int id)
 {
     int iType = 0;
     int *piType = &iType;
index 6b168b8..bfdafb3 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 #include "graphicObjectProperties.h"
 }
 
-int Fac3DDecomposer::getDataSize(char* id)
+int Fac3DDecomposer::getDataSize(int id)
 {
     int numVerticesPerGon = 0;
     int* piNumVerticesPerGon = &numVerticesPerGon;
@@ -37,7 +37,7 @@ int Fac3DDecomposer::getDataSize(char* id)
     return numVerticesPerGon * numGons;
 }
 
-void Fac3DDecomposer::fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
+void Fac3DDecomposer::fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
@@ -102,10 +102,12 @@ void Fac3DDecomposer::fillVertices(char* id, float* buffer, int bufferLength, in
 
 }
 
-void Fac3DDecomposer::fillTextureCoordinates(char* id, float* buffer, int bufferLength)
+void Fac3DDecomposer::fillTextureCoordinates(int id, float* buffer, int bufferLength)
 {
-    char* parentFigure = NULL;
-    char* parent = NULL;
+    int parentFigure = 0;
+    int* pparentFigure = &parentFigure;
+    int parent = 0;
+    int* pparent = &parent;
 
     double* colors = NULL;
     double* colormap = NULL;
@@ -138,17 +140,18 @@ void Fac3DDecomposer::fillTextureCoordinates(char* id, float* buffer, int buffer
     getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_COLORS__, jni_int, (void**) &piNumColors);
     getGraphicObjectProperty(id, __GO_DATA_MODEL_COLORS__, jni_double_vector, (void**) &colors);
 
-    getGraphicObjectProperty(id, __GO_PARENT__, jni_string, (void**) &parent);
+
+    parent = getParentObject(id);
 
     /* Temporary: to avoid getting a null parent_figure property when the object is built */
-    if (strcmp(parent, "") == 0)
+    if (parent == 0)
     {
         return;
     }
 
-    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_string, (void**) &parentFigure);
+    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_int, (void**) &pparentFigure);
 
-    if (parentFigure == NULL)
+    if (parentFigure == 0)
     {
         return;
     }
@@ -399,7 +402,7 @@ void Fac3DDecomposer::computeMinMaxValues(double* values, int numValues, int num
     *valueMax = tmpValueMax;
 }
 
-int Fac3DDecomposer::getIndicesSize(char* id)
+int Fac3DDecomposer::getIndicesSize(int id)
 {
     int numVerticesPerGon = 0;
     int* piNumVerticesPerGon = &numVerticesPerGon;
@@ -421,7 +424,7 @@ int Fac3DDecomposer::getIndicesSize(char* id)
  * To do: use a polygon triangulation algorithm, as the fan decomposition used may produce
  * overlapping triangles for non-convex polygons.
  */
-int Fac3DDecomposer::fillIndices(char* id, int* buffer, int bufferLength, int logMask)
+int Fac3DDecomposer::fillIndices(int id, int* buffer, int bufferLength, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
@@ -513,7 +516,7 @@ int Fac3DDecomposer::fillIndices(char* id, int* buffer, int bufferLength, int lo
     return bufferOffset;
 }
 
-int Fac3DDecomposer::getWireIndicesSize(char* id)
+int Fac3DDecomposer::getWireIndicesSize(int id)
 {
     int numVerticesPerGon = 0;
     int* piNumVerticesPerGon = &numVerticesPerGon;
@@ -526,7 +529,7 @@ int Fac3DDecomposer::getWireIndicesSize(char* id)
     return 2 * numVerticesPerGon * numGons;
 }
 
-int Fac3DDecomposer::fillWireIndices(char* id, int* buffer, int bufferLength, int logMask)
+int Fac3DDecomposer::fillWireIndices(int id, int* buffer, int bufferLength, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
index 32a3319..ddf2ef5 100644 (file)
@@ -37,7 +37,7 @@ BOOL sciHasFigures()
     return (ScilabView::isEmptyFigureList() == true ? FALSE : TRUE);
 }
 
-char const* getFigureFromIndex(int figNum)
+int getFigureFromIndex(int figNum)
 {
     return ScilabView::getFigureFromIndex(figNum);
 }
index 834ee4d..3709937 100644 (file)
@@ -18,19 +18,19 @@ extern "C"
 #include "FigureModel.h"
 }
 
-char const* getFigureModel(void)
+int getFigureModel(void)
 {
     return ScilabView::getFigureModel();
 }
 
-void setFigureModel(char const* UID)
+void setFigureModel(int UID)
 {
     ScilabView::setFigureModel(UID);
 }
 
-BOOL isFigureModel(char const* UID)
+BOOL isFigureModel(int UID)
 {
-    if (strcmp(UID, getFigureModel()) == 0)
+    if (UID == getFigureModel())
     {
         return TRUE;
     }
index db98cbc..60996ad 100644 (file)
@@ -17,12 +17,12 @@ extern "C"
 #include "HandleManagement.h"
 }
 
-long getHandle(char const* UID)
+long getHandle(int UID)
 {
     return ScilabView::getObjectHandle(UID);
 }
 
-char const* getObjectFromHandle(long handle)
+int getObjectFromHandle(long handle)
 {
     return ScilabView::getObjectFromHandle(handle);
 }
index bb4fc26..ed5d4a2 100644 (file)
@@ -25,7 +25,7 @@ extern "C" {
 #include "Matplot.h"
 }
 
-int MatPlotDecomposer::getTextureWidth(char* id)
+int MatPlotDecomposer::getTextureWidth(int id)
 {
     int width = 0;
     int* piWidth = &width;
@@ -35,7 +35,7 @@ int MatPlotDecomposer::getTextureWidth(char* id)
 }
 
 
-int MatPlotDecomposer::getTextureHeight(char* id)
+int MatPlotDecomposer::getTextureHeight(int id)
 {
     int height = 0;
     int* piHeight = &height;
@@ -45,11 +45,11 @@ int MatPlotDecomposer::getTextureHeight(char* id)
 }
 
 
-int MatPlotDecomposer::fillTextureData(char* id, unsigned char* buffer, int bufferLength)
+int MatPlotDecomposer::fillTextureData(int id, unsigned char* buffer, int bufferLength)
 {
     // Indexed colors
     void * data = NULL;
-    char * parentFigure = NULL;
+    int parentFigure = 0;
     double * colormap = NULL;
     int colormapSize = 0;
     int * piColormapSize = &colormapSize;
@@ -146,13 +146,13 @@ int MatPlotDecomposer::fillTextureData(char* id, unsigned char* buffer, int buff
 }
 
 
-int MatPlotDecomposer::fillTextureData(char* id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height)
+int MatPlotDecomposer::fillTextureData(int id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height)
 {
     double* value = NULL;
     getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &value);
     if (width * height * 4 == bufferLength)
     {
-        char* parentFigure = NULL;
+        int parentFigure = 0;
         double* colormap = NULL;
         int colormapSize = 0;
         int* piColormapSize = &colormapSize;
@@ -181,7 +181,7 @@ int MatPlotDecomposer::fillTextureData(char* id, unsigned char* buffer, int buff
     }
 }
 
-int MatPlotDecomposer::getTextureImageType(char * id)
+int MatPlotDecomposer::getTextureImageType(int id)
 {
     int type = -1;
     int * piType = &type;
@@ -190,7 +190,7 @@ int MatPlotDecomposer::getTextureImageType(char * id)
     return type;
 }
 
-int MatPlotDecomposer::getTextureDataType(char * id)
+int MatPlotDecomposer::getTextureDataType(int id)
 {
     int type = -1;
     int * piType = &type;
@@ -199,7 +199,7 @@ int MatPlotDecomposer::getTextureDataType(char * id)
     return type;
 }
 
-int MatPlotDecomposer::getTextureGLType(char * id)
+int MatPlotDecomposer::getTextureGLType(int id)
 {
     int type = -1;
     int * piType = &type;
@@ -208,7 +208,7 @@ int MatPlotDecomposer::getTextureGLType(char * id)
     return type;
 }
 
-int MatPlotDecomposer::getTextureData(char * id, void ** address, unsigned int * size)
+int MatPlotDecomposer::getTextureData(int id, void ** address, unsigned int * size)
 {
     int type = getTextureImageType(id);
     if (type == MATPLOT_INDEX)
@@ -232,7 +232,7 @@ int MatPlotDecomposer::getTextureData(char * id, void ** address, unsigned int *
     return 1;
 }
 
-void MatPlotDecomposer::disposeTextureData(char * id, unsigned char * buffer)
+void MatPlotDecomposer::disposeTextureData(int id, unsigned char * buffer)
 {
     if (buffer)
     {
@@ -240,7 +240,7 @@ void MatPlotDecomposer::disposeTextureData(char * id, unsigned char * buffer)
     }
 }
 
-int MatPlotDecomposer::isTextureRowOrder(char * id)
+int MatPlotDecomposer::isTextureRowOrder(int id)
 {
     int rowOrder;
     int * piRowOrder = &rowOrder;
index a62a7b2..4f32ff4 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 
 NgonGridDataDecomposer* NgonGridDataDecomposer::decomposer = NULL;
 
-int NgonGridDataDecomposer::getDataSize(char* id)
+int NgonGridDataDecomposer::getDataSize(int id)
 {
     int numX = 0;
     int* piNumX = &numX;
@@ -41,7 +41,7 @@ int NgonGridDataDecomposer::getDataSize(char* id)
 #endif
 }
 
-void NgonGridDataDecomposer::fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
+void NgonGridDataDecomposer::fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
@@ -370,7 +370,7 @@ double NgonGridDataDecomposer::getValue(double* values, int numX, int numY, int
     return values[numX * j + i];
 }
 
-int NgonGridDataDecomposer::getIndicesSize(char* id)
+int NgonGridDataDecomposer::getIndicesSize(int id)
 {
     int numX = 0;
     int* piNumX = &numX;
@@ -389,7 +389,7 @@ int NgonGridDataDecomposer::getIndicesSize(char* id)
 }
 
 
-int NgonGridDataDecomposer::fillIndices(char* id, int* buffer, int bufferLength, int logMask)
+int NgonGridDataDecomposer::fillIndices(int id, int* buffer, int bufferLength, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
index a81bb85..c071a1a 100644 (file)
@@ -28,10 +28,12 @@ NgonGridGrayplotDataDecomposer* NgonGridGrayplotDataDecomposer::decomposer = NUL
 /*
  * To do: allowing either per-vertex or per-facet colors
  */
-void NgonGridGrayplotDataDecomposer::fillColors(char* id, float* buffer, int bufferLength, int elementsSize)
+void NgonGridGrayplotDataDecomposer::fillColors(int id, float* buffer, int bufferLength, int elementsSize)
 {
-    char* parentFigure = NULL;
-    char* parent = NULL;
+    int parentFigure = 0;
+    int* pparentFigure = &parentFigure;
+    int parent = 0;
+    int* pparent = &parent;
 
     double* z = NULL;
     double* colormap = NULL;
@@ -52,17 +54,17 @@ void NgonGridGrayplotDataDecomposer::fillColors(char* id, float* buffer, int buf
 
     getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &z);
 
-    getGraphicObjectProperty(id, __GO_PARENT__, jni_string, (void**) &parent);
+    parent = getParentObject(id);
 
     /* Temporary: to avoid getting a null parent_figure property when the object is built */
-    if (strcmp(parent, "") == 0)
+    if (parent == 0)
     {
         return;
     }
 
-    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_string, (void**) &parentFigure);
+    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_int, (void**) &pparentFigure);
 
-    if (parentFigure == NULL)
+    if (parentFigure == 0)
     {
         return;
     }
@@ -84,7 +86,7 @@ void NgonGridGrayplotDataDecomposer::fillColors(char* id, float* buffer, int buf
     releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize);
 }
 
-int NgonGridGrayplotDataDecomposer::fillIndices(char* id, int* buffer, int bufferLength, int logMask)
+int NgonGridGrayplotDataDecomposer::fillIndices(int id, int* buffer, int bufferLength, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
index 88b75c2..c494285 100644 (file)
@@ -28,7 +28,7 @@ extern "C"
 
 NgonGridMatplotDataDecomposer* NgonGridMatplotDataDecomposer::decomposer = NULL;
 
-void NgonGridMatplotDataDecomposer::fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
+void NgonGridMatplotDataDecomposer::fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
 {
     double* matplotScale = NULL;
     double* matplotTranslate = NULL;
@@ -218,10 +218,12 @@ void NgonGridMatplotDataDecomposer::fillGridVertices(float* buffer, int bufferLe
  * -clean-up: replace explicitely computed z indices by getPointIndex calls
  * -remove the per-vertex color fill code
  */
-void NgonGridMatplotDataDecomposer::fillColors(char* id, float* buffer, int bufferLength, int elementsSize)
+void NgonGridMatplotDataDecomposer::fillColors(int id, float* buffer, int bufferLength, int elementsSize)
 {
-    char* parent = NULL;
-    char* parentFigure = NULL;
+    int parent = 0;
+    int* pparent = &parent;
+    int parentFigure = 0;
+    int* pparentFigure = &parentFigure;
 
     void * data = NULL;
     double* colormap = NULL;
@@ -240,15 +242,15 @@ void NgonGridMatplotDataDecomposer::fillColors(char* id, float* buffer, int buff
     int gltype = 0;
     int * piGltype = &gltype;
 
-    getGraphicObjectProperty(id, __GO_PARENT__, jni_string, (void**) &parent);
+    parent = getParentObject(id);
 
     /* Temporary: to avoid getting a null parent_figure property when the object is built */
-    if (strcmp(parent, "") == 0)
+    if (parent == 0)
     {
         return;
     }
 
-    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_string, (void**) &parentFigure);
+    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_int, (void**) &pparentFigure);
     getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_X__, jni_int, (void**) &piNumX);
     getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_Y__, jni_int, (void**) &piNumY);
     getGraphicObjectProperty(id, __GO_DATA_MODEL_MATPLOT_IMAGE_DATA__, jni_double_vector, &data);
@@ -347,7 +349,7 @@ void NgonGridMatplotDataDecomposer::fillColors(char* id, float* buffer, int buff
  * To do: merge with NgonGridDataDecomposer::fillIndices as these functions perform a lot of work in
  * a redundant way.
  */
-int NgonGridMatplotDataDecomposer::fillIndices(char* id, int* buffer, int bufferLength, int logMask)
+int NgonGridMatplotDataDecomposer::fillIndices(int id, int* buffer, int bufferLength, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
index befe934..aa4e8a8 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 
 Plot3DDecomposer* Plot3DDecomposer::decomposer = NULL;
 
-void Plot3DDecomposer::fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
+void Plot3DDecomposer::fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
@@ -86,10 +86,12 @@ void Plot3DDecomposer::getFacetTriangles(double* x, double* y, double* z, int nu
  * To do: compute and return color indices instead of directly looking
  * up colors from the colormap.
  */
-void Plot3DDecomposer::fillColors(char* id, float* buffer, int bufferLength, int elementsSize)
+void Plot3DDecomposer::fillColors(int id, float* buffer, int bufferLength, int elementsSize)
 {
-    char* parentFigure = NULL;
-    char* parent = NULL;
+    int parentFigure = 0;
+    int* pparentFigure = &parentFigure;
+    int parent = 0;
+    int* pparent = &parent;
 
     double* z = NULL;
     double* colormap = NULL;
@@ -109,17 +111,17 @@ void Plot3DDecomposer::fillColors(char* id, float* buffer, int bufferLength, int
 
     getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &z);
 
-    getGraphicObjectProperty(id, __GO_PARENT__, jni_string, (void**) &parent);
+    parent = getParentObject(id);
 
     /* Temporary: to avoid getting a null parent_figure property when the object is built */
-    if (strcmp(parent, "") == 0)
+    if (parent == 0)
     {
         return;
     }
 
-    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_string, (void**) &parentFigure);
+    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_int, (void**) &pparentFigure);
 
-    if (parentFigure == NULL)
+    if (parentFigure == 0)
     {
         return;
     }
@@ -132,7 +134,7 @@ void Plot3DDecomposer::fillColors(char* id, float* buffer, int bufferLength, int
     releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize);
 }
 
-int Plot3DDecomposer::fillIndices(char* id, int* buffer, int bufferLength, int logMask)
+int Plot3DDecomposer::fillIndices(int id, int* buffer, int bufferLength, int logMask)
 {
     double* x = NULL;
     double* y = NULL;
@@ -166,7 +168,7 @@ int Plot3DDecomposer::fillIndices(char* id, int* buffer, int bufferLength, int l
     return numberIndices;
 }
 
-int Plot3DDecomposer::getWireIndicesSize(char* id)
+int Plot3DDecomposer::getWireIndicesSize(int id)
 {
     int numX = 0;
     int* piNumX = &numX;
@@ -189,7 +191,7 @@ int Plot3DDecomposer::getWireIndicesSize(char* id)
  * -a lot of work performed redundantly with NgonGridDataDecomposer::fillIndices, ought to be merged
  *  with it.
  */
-int Plot3DDecomposer::fillWireIndices(char* id, int* buffer, int bufferLength, int logMask)
+int Plot3DDecomposer::fillWireIndices(int id, int* buffer, int bufferLength, int logM