Add getters for new properties 39/4339/2
Vincent COUVERT [Mon, 27 Jun 2011 14:52:58 +0000 (16:52 +0200)]
Change-Id: I598fdca13d4ff30b31c2829ea474da7bb434bd03

38 files changed:
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/Uicontrol.java
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Gui_Import.def
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/macros/scf.sci
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/GetUiobjectColumnNames.h [new file with mode: 0644]
scilab/modules/gui/includes/GetUiobjectRowNames.h [new file with mode: 0644]
scilab/modules/gui/includes/GetUiobjectScale.h [new file with mode: 0644]
scilab/modules/gui/includes/GetUiobjectShear.h [new file with mode: 0644]
scilab/modules/gui/includes/GetUiobjectTableData.h [new file with mode: 0644]
scilab/modules/gui/includes/SetUiobjectColumnNames.h [moved from scilab/modules/gui/includes/SetUiobjectColnames.h with 100% similarity]
scilab/modules/gui/includes/SetUiobjectRowNames.h [moved from scilab/modules/gui/includes/SetUiobjectRownames.h with 100% similarity]
scilab/modules/gui/includes/SetUiobjectTableData.h [moved from scilab/modules/gui/includes/SetUiobjectTabledata.h with 100% similarity]
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/cpp/GetUiobjectColumnNames.cpp [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectColumnNames.hxx [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectRowNames.cpp [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectRowNames.hxx [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectScale.cpp [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectScale.hxx [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectShear.cpp [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectShear.hxx [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectTableData.cpp [new file with mode: 0644]
scilab/modules/gui/src/cpp/GetUiobjectTableData.hxx [new file with mode: 0644]
scilab/modules/gui/src/cpp/SetUiobjectColumnNames.cpp [moved from scilab/modules/gui/src/cpp/SetUiobjectColnames.cpp with 97% similarity]
scilab/modules/gui/src/cpp/SetUiobjectColumnNames.hxx [moved from scilab/modules/gui/src/cpp/SetUiobjectColnames.hxx with 95% similarity]
scilab/modules/gui/src/cpp/SetUiobjectRowNames.cpp [moved from scilab/modules/gui/src/cpp/SetUiobjectRownames.cpp with 97% similarity]
scilab/modules/gui/src/cpp/SetUiobjectRowNames.hxx [moved from scilab/modules/gui/src/cpp/SetUiobjectRownames.hxx with 96% similarity]
scilab/modules/gui/src/cpp/SetUiobjectTableData.cpp [moved from scilab/modules/gui/src/cpp/SetUiobjectTabledata.cpp with 97% similarity]
scilab/modules/gui/src/cpp/SetUiobjectTableData.hxx [moved from scilab/modules/gui/src/cpp/SetUiobjectTabledata.hxx with 95% similarity]

index ff58da0..2e856e3 100644 (file)
 #define __GO_UI_TEXT__                     "text"
 
 #define __GO_UI_BACKGROUNDCOLOR__          "UIBackgroundColor"
-#define __GO_UI_COLUMNNAMES__              "UIColumnnames"
+#define __GO_UI_COLUMNNAMES__              "UIColumnNames"
+#define __GO_UI_COLUMNNAMES_SIZE__         "UIColumnNamesSize"
 #define __GO_UI_ENABLE__                   "UIEnable"
 #define __GO_UI_FONTANGLE__                "UIFontAngle"
 #define __GO_UI_FONTNAME__                 "UIFontName"
 #define __GO_UI_LISTBOXTOP_SIZE__          "UIListboxTopSize"
 #define __GO_UI_MAX__                      "UIMax"
 #define __GO_UI_MIN__                      "UIMin"
-#define __GO_UI_ROWNAMES__                 "UIRownames"
+#define __GO_UI_ROWNAMES__                 "UIRowNames"
+#define __GO_UI_ROWNAMES_SIZE__            "UIRowNamesSize"
 #define __GO_UI_RELIEF__                   "UIRelief"
 #define __GO_UI_SCALE__                    "UIScale"
 #define __GO_UI_SHEAR__                    "UIShear"
 #define __GO_UI_STRING__                   "UIString"
 #define __GO_UI_STRING_SIZE__              "UIStringSize"
 #define __GO_UI_SLIDERSTEP__               "UISliderStep"
-#define __GO_UI_TABLEDATA__                "UITabledata"
+#define __GO_UI_TABLEDATA__                "UITableData"
+#define __GO_UI_TABLEDATA_SIZE__           "UITableDataSize"
 #define __GO_UI_UNITS__                    "UIUnits"
 #define __GO_UI_VALUE__                    "UIValue"
 #define __GO_UI_VALUE_SIZE__               "UIValueSize"
index 11bcfb3..b0a5d1b 100644 (file)
@@ -295,7 +295,8 @@ public static final String __GO_UI_TABLE__ =               "table";
 public static final String __GO_UI_TEXT__ =                "text";
 
 public static final String __GO_UI_BACKGROUNDCOLOR__ =     "UIBackgroundColor";
-public static final String __GO_UI_COLUMNNAMES__ =         "UIColumnnames";
+public static final String __GO_UI_COLUMNNAMES__ =         "UIColumnNames";
+public static final String __GO_UI_COLUMNNAMES_SIZE__ =    "UIColumnNamesSize";
 public static final String __GO_UI_ENABLE__ =              "UIEnable";
 public static final String __GO_UI_FONTANGLE__ =           "UIFontAngle";
 public static final String __GO_UI_FONTNAME__ =            "UIFontName";
@@ -308,14 +309,16 @@ public static final String __GO_UI_LISTBOXTOP__ =          "UIListboxTop";
 public static final String __GO_UI_LISTBOXTOP_SIZE__ =     "UIListboxTopSize";
 public static final String __GO_UI_MAX__ =                 "UIMax";
 public static final String __GO_UI_MIN__ =                 "UIMin";
-public static final String __GO_UI_ROWNAMES__ =            "UIRownames";
+public static final String __GO_UI_ROWNAMES__ =            "UIRowNames";
+public static final String __GO_UI_ROWNAMES_SIZE__ =       "UIRowNamesSize";
 public static final String __GO_UI_RELIEF__ =              "UIRelief";
 public static final String __GO_UI_SCALE__ =               "UIScale";
 public static final String __GO_UI_SHEAR__ =               "UIShear";
 public static final String __GO_UI_STRING__ =              "UIString";
 public static final String __GO_UI_STRING_SIZE__ =         "UIStringSize";
 public static final String __GO_UI_SLIDERSTEP__ =          "UISliderStep";
-public static final String __GO_UI_TABLEDATA__ =           "UITabledata";
+public static final String __GO_UI_TABLEDATA__ =           "UITableData";
+public static final String __GO_UI_TABLEDATA_SIZE__ =      "UITableDataSize";
 public static final String __GO_UI_UNITS__ =               "UIUnits";
 public static final String __GO_UI_VALUE__ =               "UIValue";
 public static final String __GO_UI_VALUE_SIZE__ =          "UIValueSize";
index ec1e32e..972f256 100644 (file)
@@ -18,6 +18,7 @@ import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProp
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UICONTROL__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_BACKGROUNDCOLOR__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_COLUMNNAMES__;
+import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_COLUMNNAMES_SIZE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_ENABLE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_FONTANGLE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_FONTNAME__;
@@ -34,6 +35,7 @@ import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProp
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_PUSHBUTTON__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_RELIEF__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_ROWNAMES__;
+import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_ROWNAMES_SIZE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_SCALE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_SHEAR__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_SLIDERSTEP__;
@@ -41,6 +43,7 @@ import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProp
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_STRING_SIZE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_TABLE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_TABLEDATA__;
+import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_TABLEDATA_SIZE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_UNITS__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_VALUE__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_UI_VALUE_SIZE__;
@@ -57,7 +60,7 @@ public class Uicontrol extends GraphicObject {
 
        private UicontrolStyle style;
        private Double[] backgroundColor = {0.0, 0.0, 0.0};
-       private String[] columnnames = {};
+       private String[] columnnames = {""};
        private boolean enable = true;
        private String fontAngle = "normal";
        private String fontName = "helvetica";
@@ -71,12 +74,12 @@ public class Uicontrol extends GraphicObject {
        private int min; 
        private Double[] position = {20.0, 40.0, 40.0, 20.0};
        private String relief = "raised";
-       private String[] rownames = {};
+       private String[] rownames = {""};
        private Double[] scale = {1.0, 1.0};
-       private Double[] shear = {1.0, 1.0};
+       private Double[] shear = {0.0, 0.0};
        private Double[] sliderStep = {0.01, 0.1};
        private String[] string = {""};
-       private String[] tabledata = {};
+       private String[] tabledata = {""};
        private String units = "pixels";
        private Integer[] value; 
        private String verticalAlignment = "middle";
@@ -88,6 +91,7 @@ public class Uicontrol extends GraphicObject {
                STYLE,
                BACKGROUNDCOLOR,
                COLUMNNAMES,
+               COLUMNNAMES_SIZE,
                ENABLE,
                FONTANGLE,
                FONTNAME,
@@ -108,7 +112,9 @@ public class Uicontrol extends GraphicObject {
                STRING_SIZE,
                RELIEF,
                ROWNAMES,
+               ROWNAMES_SIZE,
                TABLEDATA,
+               TABLEDATA_SIZE,
                UNITS,
                VALUE,
                VALUE_SIZE,
@@ -188,6 +194,8 @@ public class Uicontrol extends GraphicObject {
                        return UicontrolProperty.BACKGROUNDCOLOR;
                } else if (propertyName.equals(__GO_UI_COLUMNNAMES__)) {
                        return UicontrolProperty.COLUMNNAMES;
+               } else if (propertyName.equals(__GO_UI_COLUMNNAMES_SIZE__)) {
+                       return UicontrolProperty.COLUMNNAMES_SIZE;
                } else if (propertyName.equals(__GO_UI_ENABLE__)) {
                        return UicontrolProperty.ENABLE;
                } else if (propertyName.equals(__GO_UI_FONTANGLE__)) {
@@ -218,6 +226,8 @@ public class Uicontrol extends GraphicObject {
                        return UicontrolProperty.RELIEF;
                } else if (propertyName.equals(__GO_UI_ROWNAMES__)) {
                        return UicontrolProperty.ROWNAMES;
+               } else if (propertyName.equals(__GO_UI_ROWNAMES_SIZE__)) {
+                       return UicontrolProperty.ROWNAMES_SIZE;
                } else if (propertyName.equals(__GO_UI_SCALE__)) {
                        return UicontrolProperty.SCALE;
                } else if (propertyName.equals(__GO_UI_SHEAR__)) {
@@ -230,6 +240,8 @@ public class Uicontrol extends GraphicObject {
                        return UicontrolProperty.STRING_SIZE;
                } else if (propertyName.equals(__GO_UI_TABLEDATA__)) {
                        return UicontrolProperty.TABLEDATA;
+               } else if (propertyName.equals(__GO_UI_TABLEDATA_SIZE__)) {
+                       return UicontrolProperty.TABLEDATA_SIZE;
                } else if (propertyName.equals(__GO_UI_UNITS__)) {
                        return UicontrolProperty.UNITS;
                } else if (propertyName.equals(__GO_UI_VALUE__)) {
@@ -255,6 +267,8 @@ public class Uicontrol extends GraphicObject {
                        return getBackgroundColor();
                } else if (property == UicontrolProperty.COLUMNNAMES) {
                        return getColumnNames();
+               } else if (property == UicontrolProperty.COLUMNNAMES_SIZE) {
+                       return getColumnNames().length;
                } else if (property == UicontrolProperty.ENABLE) {
                        return getEnable();
                } else if (property == UicontrolProperty.FONTANGLE) {
@@ -285,6 +299,8 @@ public class Uicontrol extends GraphicObject {
                        return getRelief();
                } else if (property == UicontrolProperty.ROWNAMES) {
                        return getRowNames();
+               } else if (property == UicontrolProperty.ROWNAMES_SIZE) {
+                       return getRowNames().length;
                } else if (property == UicontrolProperty.SCALE) {
                        return getScale();
                } else if (property == UicontrolProperty.SHEAR) {
@@ -297,6 +313,8 @@ public class Uicontrol extends GraphicObject {
                        return getString().length;
                } else if (property == UicontrolProperty.TABLEDATA) {
                        return getTableData();
+               } else if (property == UicontrolProperty.TABLEDATA_SIZE) {
+                       return getTableData().length;
                } else if (property == UicontrolProperty.UNITS) {
                        return getUnits();
                } else if (property == UicontrolProperty.VALUE) {
index 475241f..eec7327 100644 (file)
 @DECLARE@ __GO_UI_TEXT__ @EQUAL@                "text" @END@
 
 @DECLARE@ __GO_UI_BACKGROUNDCOLOR__ @EQUAL@     "UIBackgroundColor" @END@
-@DECLARE@ __GO_UI_COLUMNNAMES__ @EQUAL@         "UIColumnnames" @END@
+@DECLARE@ __GO_UI_COLUMNNAMES__ @EQUAL@         "UIColumnNames" @END@
+@DECLARE@ __GO_UI_COLUMNNAMES_SIZE__ @EQUAL@    "UIColumnNamesSize" @END@
 @DECLARE@ __GO_UI_ENABLE__ @EQUAL@              "UIEnable" @END@
 @DECLARE@ __GO_UI_FONTANGLE__ @EQUAL@           "UIFontAngle" @END@
 @DECLARE@ __GO_UI_FONTNAME__ @EQUAL@            "UIFontName" @END@
 @DECLARE@ __GO_UI_LISTBOXTOP_SIZE__ @EQUAL@     "UIListboxTopSize" @END@
 @DECLARE@ __GO_UI_MAX__ @EQUAL@                 "UIMax" @END@
 @DECLARE@ __GO_UI_MIN__ @EQUAL@                 "UIMin" @END@
-@DECLARE@ __GO_UI_ROWNAMES__ @EQUAL@            "UIRownames" @END@
+@DECLARE@ __GO_UI_ROWNAMES__ @EQUAL@            "UIRowNames" @END@
+@DECLARE@ __GO_UI_ROWNAMES_SIZE__ @EQUAL@       "UIRowNamesSize" @END@
 @DECLARE@ __GO_UI_RELIEF__ @EQUAL@              "UIRelief" @END@
 @DECLARE@ __GO_UI_SCALE__ @EQUAL@               "UIScale" @END@
 @DECLARE@ __GO_UI_SHEAR__ @EQUAL@               "UIShear" @END@
 @DECLARE@ __GO_UI_STRING__ @EQUAL@              "UIString" @END@
 @DECLARE@ __GO_UI_STRING_SIZE__ @EQUAL@         "UIStringSize" @END@
 @DECLARE@ __GO_UI_SLIDERSTEP__ @EQUAL@          "UISliderStep" @END@
-@DECLARE@ __GO_UI_TABLEDATA__ @EQUAL@           "UITabledata" @END@
+@DECLARE@ __GO_UI_TABLEDATA__ @EQUAL@           "UITableData" @END@
+@DECLARE@ __GO_UI_TABLEDATA_SIZE__ @EQUAL@      "UITableDataSize" @END@
 @DECLARE@ __GO_UI_UNITS__ @EQUAL@               "UIUnits" @END@
 @DECLARE@ __GO_UI_VALUE__ @EQUAL@               "UIValue" @END@
 @DECLARE@ __GO_UI_VALUE_SIZE__ @EQUAL@          "UIValueSize" @END@
index 8ec26ac..53172a8 100644 (file)
@@ -83,3 +83,8 @@ setFigureEventHandlerEnabled
 deleteMenuCallBack
 destroyUiobjectTag
 createJoGLView
+GetUiobjectTableData
+GetUiobjectColumnNames
+GetUiobjectRowNames
+GetUiobjectShear
+GetUiobjectScale
\ No newline at end of file
index dec84a1..456a70e 100644 (file)
@@ -893,6 +893,12 @@ function %h_p(h)
             //"Handle_visible = "+sci2exp(h.handle_visible)
             //"Userdata = "+fmtuser_data(u)
             "Tag = "+h.tag
+            ""
+            "Scale = "+sci2exp(h.scale, 0)
+            "Shear = "+sci2exp(h.shear, 0)
+            "RowNames = "+sci2exp(h.rownames)
+            "ColumnNames = "+sci2exp(h.columnnames)
+            "TableData = "+fmtuser_data(h.columnnames)
             ]
 
         end
index 4113db6..b20cc9b 100644 (file)
@@ -18,7 +18,6 @@ function [f]=scf(h)
        h = max(num)+1
      end
   end
-  disp("[DEBUG] set(''current_figure'')");
   set("current_figure",h);
   f=get("current_figure");
 endfunction
index a630d4e..5f408a3 100644 (file)
@@ -46,7 +46,7 @@ typedef struct
  * don't forget to modify it each time the propertyTable
  * is modified.
  */
-#define NB_PROPERTIES 160
+#define NB_PROPERTIES 165
 
 /**
  * list of all property names and associated functions in scilab
@@ -213,7 +213,12 @@ static getHashTableCouple propertyTable[NB_PROPERTIES] =
 { "color_range"         , get_color_range_property          },
 { "grid_position"       , get_grid_position_property        },
 { "anti_aliasing"       , get_anti_aliasing_property        },
-{ "UID"                 , get_UID                           }
+{ "UID"                 , get_UID                           },
+{ "scale"               , GetUiobjectScale                  },
+{ "shear"               , GetUiobjectShear                  },
+{ "rownames"            , GetUiobjectRowNames               },
+{ "columnnames"         , GetUiobjectColumnNames            },
+{ "tabledata"           , GetUiobjectTableData              }
 } ;
 
 /*--------------------------------------------------------------------------*/
index 075015f..109afc3 100644 (file)
 #include "GetUicontrolHorizontalAlignment.h"
 #include "GetUicontrolVerticalAlignment.h"
 #include "GetUicontrolFontName.h"
+#include "GetUiobjectColumnNames.h"
+#include "GetUiobjectRowNames.h"
 #include "GetUicontrolSliderStep.h"
+#include "GetUiobjectScale.h"
+#include "GetUiobjectShear.h"
+#include "GetUiobjectTableData.h"
 #include "GetUimenuChecked.h"
 
 int get_figures_id_property(           char *pobjUID) ;
index 5b760d2..f33398e 100644 (file)
@@ -39,9 +39,9 @@
 #include "SetUiobjectRotate.h"
 #include "SetUiobjectShear.h"
 #include "SetUiobjectScale.h"
-#include "SetUiobjectColnames.h"
-#include "SetUiobjectRownames.h"
-#include "SetUiobjectTabledata.h"
+#include "SetUiobjectColumnNames.h"
+#include "SetUiobjectRowNames.h"
+#include "SetUiobjectTableData.h"
 #include "SetUicontrolMin.h"
 #include "SetUicontrolMax.h"
 #include "SetUicontrolUnits.h"
index 9f2965c..6242013 100644 (file)
@@ -115,10 +115,15 @@ src/cpp/SetUiobjectCallback.cpp \
 src/cpp/GetUiobjectCallback.cpp \
 src/cpp/SetUiobjectRotate.cpp \
 src/cpp/SetUiobjectShear.cpp \
+src/cpp/GetUiobjectShear.cpp \
 src/cpp/SetUiobjectScale.cpp \
-src/cpp/SetUiobjectColnames.cpp \
-src/cpp/SetUiobjectRownames.cpp \
-src/cpp/SetUiobjectTabledata.cpp \
+src/cpp/GetUiobjectScale.cpp \
+src/cpp/SetUiobjectColumnNames.cpp \
+src/cpp/GetUiobjectColumnNames.cpp \
+src/cpp/SetUiobjectRowNames.cpp \
+src/cpp/GetUiobjectRowNames.cpp \
+src/cpp/SetUiobjectTableData.cpp \
+src/cpp/GetUiobjectTableData.cpp \
 src/cpp/SetUiobjectEnable.cpp \
 src/cpp/GetUiobjectEnable.cpp \
 src/cpp/SetUimenuChecked.cpp \
index 2b29312..8012893 100644 (file)
@@ -190,10 +190,15 @@ am__objects_2 = libscigui_algo_la-callJoGLView.lo \
        libscigui_algo_la-GetUiobjectCallback.lo \
        libscigui_algo_la-SetUiobjectRotate.lo \
        libscigui_algo_la-SetUiobjectShear.lo \
+       libscigui_algo_la-GetUiobjectShear.lo \
        libscigui_algo_la-SetUiobjectScale.lo \
-       libscigui_algo_la-SetUiobjectColnames.lo \
-       libscigui_algo_la-SetUiobjectRownames.lo \
-       libscigui_algo_la-SetUiobjectTabledata.lo \
+       libscigui_algo_la-GetUiobjectScale.lo \
+       libscigui_algo_la-SetUiobjectColumnNames.lo \
+       libscigui_algo_la-GetUiobjectColumnNames.lo \
+       libscigui_algo_la-SetUiobjectRowNames.lo \
+       libscigui_algo_la-GetUiobjectRowNames.lo \
+       libscigui_algo_la-SetUiobjectTableData.lo \
+       libscigui_algo_la-GetUiobjectTableData.lo \
        libscigui_algo_la-SetUiobjectEnable.lo \
        libscigui_algo_la-GetUiobjectEnable.lo \
        libscigui_algo_la-SetUimenuChecked.lo \
@@ -720,10 +725,15 @@ src/cpp/SetUiobjectCallback.cpp \
 src/cpp/GetUiobjectCallback.cpp \
 src/cpp/SetUiobjectRotate.cpp \
 src/cpp/SetUiobjectShear.cpp \
+src/cpp/GetUiobjectShear.cpp \
 src/cpp/SetUiobjectScale.cpp \
-src/cpp/SetUiobjectColnames.cpp \
-src/cpp/SetUiobjectRownames.cpp \
-src/cpp/SetUiobjectTabledata.cpp \
+src/cpp/GetUiobjectScale.cpp \
+src/cpp/SetUiobjectColumnNames.cpp \
+src/cpp/GetUiobjectColumnNames.cpp \
+src/cpp/SetUiobjectRowNames.cpp \
+src/cpp/GetUiobjectRowNames.cpp \
+src/cpp/SetUiobjectTableData.cpp \
+src/cpp/GetUiobjectTableData.cpp \
 src/cpp/SetUiobjectEnable.cpp \
 src/cpp/GetUiobjectEnable.cpp \
 src/cpp/SetUimenuChecked.cpp \
@@ -1081,8 +1091,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUimenuChecked.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUimenuLabel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectCallback.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectColumnNames.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectEnable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectForegroundColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectRowNames.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectScale.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectShear.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectTableData.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectVisible.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GiwsException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-ImageRenderer.Plo@am__quote@
@@ -1121,14 +1136,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUimenuChecked.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUimenuLabel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectCallback.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectColnames.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectColumnNames.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectEnable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectForegroundColor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectRotate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectRownames.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectRowNames.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectScale.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectShear.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectTabledata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectTableData.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SetUiobjectVisible.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-Slider.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-TerminateGui.Plo@am__quote@
@@ -1922,6 +1937,13 @@ libscigui_algo_la-SetUiobjectShear.lo: src/cpp/SetUiobjectShear.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-SetUiobjectShear.lo `test -f 'src/cpp/SetUiobjectShear.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectShear.cpp
 
+libscigui_algo_la-GetUiobjectShear.lo: src/cpp/GetUiobjectShear.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-GetUiobjectShear.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-GetUiobjectShear.Tpo -c -o libscigui_algo_la-GetUiobjectShear.lo `test -f 'src/cpp/GetUiobjectShear.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectShear.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-GetUiobjectShear.Tpo $(DEPDIR)/libscigui_algo_la-GetUiobjectShear.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/GetUiobjectShear.cpp' object='libscigui_algo_la-GetUiobjectShear.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-GetUiobjectShear.lo `test -f 'src/cpp/GetUiobjectShear.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectShear.cpp
+
 libscigui_algo_la-SetUiobjectScale.lo: src/cpp/SetUiobjectScale.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-SetUiobjectScale.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-SetUiobjectScale.Tpo -c -o libscigui_algo_la-SetUiobjectScale.lo `test -f 'src/cpp/SetUiobjectScale.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectScale.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-SetUiobjectScale.Tpo $(DEPDIR)/libscigui_algo_la-SetUiobjectScale.Plo
@@ -1929,26 +1951,54 @@ libscigui_algo_la-SetUiobjectScale.lo: src/cpp/SetUiobjectScale.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-SetUiobjectScale.lo `test -f 'src/cpp/SetUiobjectScale.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectScale.cpp
 
-libscigui_algo_la-SetUiobjectColnames.lo: src/cpp/SetUiobjectColnames.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-SetUiobjectColnames.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-SetUiobjectColnames.Tpo -c -o libscigui_algo_la-SetUiobjectColnames.lo `test -f 'src/cpp/SetUiobjectColnames.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectColnames.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-SetUiobjectColnames.Tpo $(DEPDIR)/libscigui_algo_la-SetUiobjectColnames.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/SetUiobjectColnames.cpp' object='libscigui_algo_la-SetUiobjectColnames.lo' libtool=yes @AMDEPBACKSLASH@
+libscigui_algo_la-GetUiobjectScale.lo: src/cpp/GetUiobjectScale.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-GetUiobjectScale.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-GetUiobjectScale.Tpo -c -o libscigui_algo_la-GetUiobjectScale.lo `test -f 'src/cpp/GetUiobjectScale.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectScale.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-GetUiobjectScale.Tpo $(DEPDIR)/libscigui_algo_la-GetUiobjectScale.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/GetUiobjectScale.cpp' object='libscigui_algo_la-GetUiobjectScale.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-GetUiobjectScale.lo `test -f 'src/cpp/GetUiobjectScale.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectScale.cpp
+
+libscigui_algo_la-SetUiobjectColumnNames.lo: src/cpp/SetUiobjectColumnNames.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-SetUiobjectColumnNames.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-SetUiobjectColumnNames.Tpo -c -o libscigui_algo_la-SetUiobjectColumnNames.lo `test -f 'src/cpp/SetUiobjectColumnNames.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectColumnNames.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-SetUiobjectColumnNames.Tpo $(DEPDIR)/libscigui_algo_la-SetUiobjectColumnNames.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/SetUiobjectColumnNames.cpp' object='libscigui_algo_la-SetUiobjectColumnNames.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-SetUiobjectColumnNames.lo `test -f 'src/cpp/SetUiobjectColumnNames.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectColumnNames.cpp
+
+libscigui_algo_la-GetUiobjectColumnNames.lo: src/cpp/GetUiobjectColumnNames.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-GetUiobjectColumnNames.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-GetUiobjectColumnNames.Tpo -c -o libscigui_algo_la-GetUiobjectColumnNames.lo `test -f 'src/cpp/GetUiobjectColumnNames.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectColumnNames.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-GetUiobjectColumnNames.Tpo $(DEPDIR)/libscigui_algo_la-GetUiobjectColumnNames.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/GetUiobjectColumnNames.cpp' object='libscigui_algo_la-GetUiobjectColumnNames.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-GetUiobjectColumnNames.lo `test -f 'src/cpp/GetUiobjectColumnNames.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectColumnNames.cpp
+
+libscigui_algo_la-SetUiobjectRowNames.lo: src/cpp/SetUiobjectRowNames.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-SetUiobjectRowNames.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-SetUiobjectRowNames.Tpo -c -o libscigui_algo_la-SetUiobjectRowNames.lo `test -f 'src/cpp/SetUiobjectRowNames.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectRowNames.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-SetUiobjectRowNames.Tpo $(DEPDIR)/libscigui_algo_la-SetUiobjectRowNames.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/SetUiobjectRowNames.cpp' object='libscigui_algo_la-SetUiobjectRowNames.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-SetUiobjectRowNames.lo `test -f 'src/cpp/SetUiobjectRowNames.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectRowNames.cpp
+
+libscigui_algo_la-GetUiobjectRowNames.lo: src/cpp/GetUiobjectRowNames.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-GetUiobjectRowNames.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-GetUiobjectRowNames.Tpo -c -o libscigui_algo_la-GetUiobjectRowNames.lo `test -f 'src/cpp/GetUiobjectRowNames.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectRowNames.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-GetUiobjectRowNames.Tpo $(DEPDIR)/libscigui_algo_la-GetUiobjectRowNames.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/GetUiobjectRowNames.cpp' object='libscigui_algo_la-GetUiobjectRowNames.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-SetUiobjectColnames.lo `test -f 'src/cpp/SetUiobjectColnames.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectColnames.cpp
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-GetUiobjectRowNames.lo `test -f 'src/cpp/GetUiobjectRowNames.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectRowNames.cpp
 
-libscigui_algo_la-SetUiobjectRownames.lo: src/cpp/SetUiobjectRownames.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-SetUiobjectRownames.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-SetUiobjectRownames.Tpo -c -o libscigui_algo_la-SetUiobjectRownames.lo `test -f 'src/cpp/SetUiobjectRownames.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectRownames.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-SetUiobjectRownames.Tpo $(DEPDIR)/libscigui_algo_la-SetUiobjectRownames.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/SetUiobjectRownames.cpp' object='libscigui_algo_la-SetUiobjectRownames.lo' libtool=yes @AMDEPBACKSLASH@
+libscigui_algo_la-SetUiobjectTableData.lo: src/cpp/SetUiobjectTableData.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-SetUiobjectTableData.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-SetUiobjectTableData.Tpo -c -o libscigui_algo_la-SetUiobjectTableData.lo `test -f 'src/cpp/SetUiobjectTableData.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectTableData.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-SetUiobjectTableData.Tpo $(DEPDIR)/libscigui_algo_la-SetUiobjectTableData.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/SetUiobjectTableData.cpp' object='libscigui_algo_la-SetUiobjectTableData.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-SetUiobjectRownames.lo `test -f 'src/cpp/SetUiobjectRownames.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectRownames.cpp
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-SetUiobjectTableData.lo `test -f 'src/cpp/SetUiobjectTableData.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectTableData.cpp
 
-libscigui_algo_la-SetUiobjectTabledata.lo: src/cpp/SetUiobjectTabledata.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-SetUiobjectTabledata.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-SetUiobjectTabledata.Tpo -c -o libscigui_algo_la-SetUiobjectTabledata.lo `test -f 'src/cpp/SetUiobjectTabledata.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectTabledata.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-SetUiobjectTabledata.Tpo $(DEPDIR)/libscigui_algo_la-SetUiobjectTabledata.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/SetUiobjectTabledata.cpp' object='libscigui_algo_la-SetUiobjectTabledata.lo' libtool=yes @AMDEPBACKSLASH@
+libscigui_algo_la-GetUiobjectTableData.lo: src/cpp/GetUiobjectTableData.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-GetUiobjectTableData.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-GetUiobjectTableData.Tpo -c -o libscigui_algo_la-GetUiobjectTableData.lo `test -f 'src/cpp/GetUiobjectTableData.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectTableData.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigui_algo_la-GetUiobjectTableData.Tpo $(DEPDIR)/libscigui_algo_la-GetUiobjectTableData.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/GetUiobjectTableData.cpp' object='libscigui_algo_la-GetUiobjectTableData.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-SetUiobjectTabledata.lo `test -f 'src/cpp/SetUiobjectTabledata.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectTabledata.cpp
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-GetUiobjectTableData.lo `test -f 'src/cpp/GetUiobjectTableData.cpp' || echo '$(srcdir)/'`src/cpp/GetUiobjectTableData.cpp
 
 libscigui_algo_la-SetUiobjectEnable.lo: src/cpp/SetUiobjectEnable.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_algo_la-SetUiobjectEnable.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-SetUiobjectEnable.Tpo -c -o libscigui_algo_la-SetUiobjectEnable.lo `test -f 'src/cpp/SetUiobjectEnable.cpp' || echo '$(srcdir)/'`src/cpp/SetUiobjectEnable.cpp
diff --git a/scilab/modules/gui/includes/GetUiobjectColumnNames.h b/scilab/modules/gui/includes/GetUiobjectColumnNames.h
new file mode 100644 (file)
index 0000000..599b3d9
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_COLUMNNAMES_H__
+#define __GET_UIOBJECT_COLUMNNAMES_H__
+#include "dynlib_gui.h"
+#include "ObjectStructure.h"
+#include "returnProperty.h"
+
+/**
+ * Get the column names property of a uicontrol (table)
+ *
+ * @param pobjUID Scilab object corresponding to the uicontrol
+ * @return true if the column names property has been correcty got
+ */
+GUI_IMPEXP int GetUiobjectColumnNames(char *pobjUID);
+
+#endif /* __GET_UIOBJECT_COLUMNNAMES_H__ */
diff --git a/scilab/modules/gui/includes/GetUiobjectRowNames.h b/scilab/modules/gui/includes/GetUiobjectRowNames.h
new file mode 100644 (file)
index 0000000..372530d
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_ROWNAMES_H__
+#define __GET_UIOBJECT_ROWNAMES_H__
+#include "dynlib_gui.h"
+#include "ObjectStructure.h"
+#include "returnProperty.h"
+
+/**
+ * Get the row names property of a uicontrol (table)
+ *
+ * @param pobjUID Scilab object corresponding to the uicontrol
+ * @return true if the row names property has been correcty got
+ */
+GUI_IMPEXP int GetUiobjectRowNames(char *pobjUID);
+
+#endif /* __GET_UIOBJECT_ROWNAMES_H__ */
diff --git a/scilab/modules/gui/includes/GetUiobjectScale.h b/scilab/modules/gui/includes/GetUiobjectScale.h
new file mode 100644 (file)
index 0000000..b4c7654
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_SCALE_H__
+#define __GET_UIOBJECT_SCALE_H__
+#include "dynlib_gui.h"
+#include "ObjectStructure.h"
+#include "returnProperty.h"
+
+/**
+ * Get the scale property of a uicontrol (image)
+ *
+ * @param pobjUID Scilab object corresponding to the uicontrol
+ * @return true if the scale property has been correcty got
+ */
+GUI_IMPEXP int GetUiobjectScale(char *pobjUID);
+
+#endif /* __GET_UIOBJECT_SCALE_H__ */
diff --git a/scilab/modules/gui/includes/GetUiobjectShear.h b/scilab/modules/gui/includes/GetUiobjectShear.h
new file mode 100644 (file)
index 0000000..ace44e9
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_SHEAR_H__
+#define __GET_UIOBJECT_SHEAR_H__
+#include "dynlib_gui.h"
+#include "ObjectStructure.h"
+#include "returnProperty.h"
+
+/**
+ * Get the shear property of a uicontrol (image)
+ *
+ * @param pobjUID Scilab object corresponding to the uicontrol
+ * @return true if the shear property has been correcty got
+ */
+GUI_IMPEXP int GetUiobjectShear(char *pobjUID);
+
+#endif /* __GET_UIOBJECT_SHEAR_H__ */
diff --git a/scilab/modules/gui/includes/GetUiobjectTableData.h b/scilab/modules/gui/includes/GetUiobjectTableData.h
new file mode 100644 (file)
index 0000000..d372264
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_TABLEDATA_H__
+#define __GET_UIOBJECT_TABLEDATA_H__
+#include "dynlib_gui.h"
+#include "ObjectStructure.h"
+#include "returnProperty.h"
+
+/**
+ * Get the table data property of a uicontrol (table)
+ *
+ * @param pobjUID Scilab object corresponding to the uicontrol
+ * @return true if the table data property has been correcty got
+ */
+GUI_IMPEXP int GetUiobjectTableData(char *pobjUID);
+
+#endif /* __GET_UIOBJECT_TABLEDATA_H__ */
index d6939bc..8d0172f 100644 (file)
   <ItemGroup>
     <ClCompile Include="..\cpp\callJoGLView.cpp" />
     <ClCompile Include="..\cpp\displayUiTree.cpp" />
+    <ClCompile Include="..\cpp\GetUiobjectColumnNames.cpp" />
+    <ClCompile Include="..\cpp\GetUiobjectRowNames.cpp" />
+    <ClCompile Include="..\cpp\GetUiobjectScale.cpp" />
+    <ClCompile Include="..\cpp\GetUiobjectShear.cpp" />
+    <ClCompile Include="..\cpp\GetUiobjectTableData.cpp" />
     <ClCompile Include="..\cpp\ImageRenderer.cpp" />
-    <ClCompile Include="..\cpp\SetUiobjectColnames.cpp" />
+    <ClCompile Include="..\cpp\SetUiobjectColumnNames.cpp" />
     <ClCompile Include="..\cpp\SetUiobjectRotate.cpp" />
     <ClCompile Include="..\cpp\SetUiobjectRownames.cpp" />
     <ClCompile Include="..\cpp\SetUiobjectScale.cpp" />
     <ClCompile Include="..\cpp\Widget.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\includes\CallClipboard.h" />
+    <ClInclude Include="..\..\includes\callJoGLView.h" />
+    <ClInclude Include="..\..\includes\CallJuigetfile.h" />
+    <ClInclude Include="..\..\includes\CallJuigetfile.hxx" />
+    <ClInclude Include="..\..\includes\DestroyUicontrol.h" />
+    <ClInclude Include="..\..\includes\GetUiobjectColumnNames.h" />
+    <ClInclude Include="..\..\includes\GetUiobjectEnable.h" />
+    <ClInclude Include="..\..\includes\GetUiobjectRowNames.h" />
+    <ClInclude Include="..\..\includes\GetUiobjectScale.h" />
+    <ClInclude Include="..\..\includes\GetUiobjectShear.h" />
+    <ClInclude Include="..\..\includes\GetUiobjectTableData.h" />
+    <ClInclude Include="..\..\includes\ImageRenderer.h" />
+    <ClInclude Include="..\..\includes\SetUiobjectColumnNames.h" />
+    <ClInclude Include="..\..\includes\SetUiobjectEnable.h" />
+    <ClInclude Include="..\..\includes\SetUiobjectRotate.h" />
+    <ClInclude Include="..\..\includes\SetUiobjectRowNames.h" />
+    <ClInclude Include="..\..\includes\SetUiobjectScale.h" />
+    <ClInclude Include="..\..\includes\SetUiobjectShear.h" />
+    <ClInclude Include="..\..\includes\SetUiobjectTableData.h" />
+    <ClInclude Include="..\..\includes\UiDisplayTree.h" />
+    <ClInclude Include="..\..\includes\UiTable.h" />
     <ClInclude Include="buildMainWindowTitle.h" />
     <ClInclude Include="..\cpp\CallClipboard.hxx" />
     <ClInclude Include="..\..\includes\CallColorChooser.h" />
index 52acc21..5340258 100644 (file)
     <ClCompile Include="..\jni\CallGraphicJoGLView.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\cpp\SetUiobjectColnames.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\cpp\SetUiobjectRotate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\cpp\SetUiobjectTabledata.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\cpp\SetUiobjectColumnNames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cpp\GetUiobjectScale.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cpp\GetUiobjectShear.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cpp\GetUiobjectTableData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cpp\GetUiobjectColumnNames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cpp\GetUiobjectRowNames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="buildMainWindowTitle.h">
     <ClInclude Include="..\cpp\Widget.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\CallClipboard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\callJoGLView.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\CallJuigetfile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\CallJuigetfile.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\DestroyUicontrol.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\GetUiobjectColumnNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\GetUiobjectEnable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\GetUiobjectRowNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\GetUiobjectScale.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\GetUiobjectShear.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\GetUiobjectTableData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\ImageRenderer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\SetUiobjectColumnNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\SetUiobjectEnable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\SetUiobjectRotate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\SetUiobjectRowNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\SetUiobjectScale.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\SetUiobjectShear.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\SetUiobjectTableData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\UiDisplayTree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\UiTable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="LibScilab_Import.def">
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectColumnNames.cpp b/scilab/modules/gui/src/cpp/GetUiobjectColumnNames.cpp
new file mode 100644 (file)
index 0000000..dd3260b
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ * Get the column names of an uicontrol
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "GetUiobjectColumnNames.hxx"
+
+extern "C"
+{
+#include "graphicObjectProperties.h"
+#include "getGraphicObjectProperty.h"
+}
+
+int GetUiobjectColumnNames(char *sciObjUID)
+{
+    int iNbColumnNames = 0;
+    int *piNbColumnNames = &iNbColumnNames;
+    char **pstColumnNames;
+
+    getGraphicObjectProperty(sciObjUID, const_cast<char*>(__GO_UI_COLUMNNAMES_SIZE__), jni_int, (void **) &piNbColumnNames);
+    getGraphicObjectProperty(sciObjUID, const_cast<char*>(__GO_UI_COLUMNNAMES__), jni_string_vector, (void **) &pstColumnNames);
+
+    if (pstColumnNames != NULL)
+    {
+        return sciReturnStringMatrix(pstColumnNames, 1, iNbColumnNames);
+    }
+    else
+    {
+        Scierror(999,const_cast<char*>(_("No '%s' property for this object.\n")), "ColumnNames");
+        return FALSE;
+    }
+}
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectColumnNames.hxx b/scilab/modules/gui/src/cpp/GetUiobjectColumnNames.hxx
new file mode 100644 (file)
index 0000000..8d8eaab
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_COLUMNNAMES_HXX__
+#define __GET_UIOBJECT_COLUMNNAMES_HXX__
+
+extern "C"{
+#include "localization.h"
+#include "GetUiobjectColumnNames.h"
+#include "Scierror.h"
+#include "graphicObjectProperties.h"
+#include "getGraphicObjectProperty.h"
+}
+
+#endif /* __GET_UIOBJECT_COLUMNNAMES_HXX__ */
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectRowNames.cpp b/scilab/modules/gui/src/cpp/GetUiobjectRowNames.cpp
new file mode 100644 (file)
index 0000000..72bc2e1
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ * Get the row names of an uicontrol
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "GetUiobjectRowNames.hxx"
+
+extern "C"
+{
+#include "graphicObjectProperties.h"
+#include "getGraphicObjectProperty.h"
+}
+
+int GetUiobjectRowNames(char *sciObjUID)
+{
+    int iNbRowNames = 0;
+    int *piNbRowNames = &iNbRowNames;
+    char **pstRowNames;
+
+    getGraphicObjectProperty(sciObjUID, const_cast<char*>(__GO_UI_ROWNAMES_SIZE__), jni_int, (void **) &piNbRowNames);
+    getGraphicObjectProperty(sciObjUID, const_cast<char*>(__GO_UI_ROWNAMES__), jni_string_vector, (void **) &pstRowNames);
+
+    if (pstRowNames != NULL)
+    {
+        return sciReturnStringMatrix(pstRowNames, 1, iNbRowNames);
+    }
+    else
+    {
+        Scierror(999,const_cast<char*>(_("No '%s' property for this object.\n")), "RowNames");
+        return FALSE;
+    }
+}
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectRowNames.hxx b/scilab/modules/gui/src/cpp/GetUiobjectRowNames.hxx
new file mode 100644 (file)
index 0000000..80427ca
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_ROWNAMES_HXX__
+#define __GET_UIOBJECT_ROWNAMES_HXX__
+
+extern "C"{
+#include "localization.h"
+#include "GetUiobjectRowNames.h"
+#include "Scierror.h"
+#include "graphicObjectProperties.h"
+#include "getGraphicObjectProperty.h"
+}
+
+#endif /* __GET_UIOBJECT_ROWNAMES_HXX__ */
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectScale.cpp b/scilab/modules/gui/src/cpp/GetUiobjectScale.cpp
new file mode 100644 (file)
index 0000000..058547d
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ * Get the Scale property of an uicontrol
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "GetUiobjectScale.hxx"
+
+int GetUiobjectScale(char *sciObjUID)
+{
+  double *scale;
+  int status = FALSE;
+
+  getGraphicObjectProperty(sciObjUID, const_cast<char*>(__GO_UI_SCALE__), jni_double_vector, (void**) &scale);
+
+  if (scale != NULL)
+  {
+      status = sciReturnRowVector(scale, 2);
+      delete[] scale;
+      return status;
+  }
+
+  Scierror(999, const_cast<char*>(_("'%s' property does not exist for this handle.\n")), "Scale");
+  return FALSE;
+
+}
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectScale.hxx b/scilab/modules/gui/src/cpp/GetUiobjectScale.hxx
new file mode 100644 (file)
index 0000000..099d44f
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_SCALE_HXX__
+#define __GET_UIOBJECT_SCALE_HXX__
+
+extern "C"{
+#include "localization.h"
+#include "GetUiobjectScale.h"
+#include "Scierror.h"
+#include "graphicObjectProperties.h"
+#include "getGraphicObjectProperty.h"
+}
+
+#endif /* __GET_UIOBJECT_SCALE_HXX__ */
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectShear.cpp b/scilab/modules/gui/src/cpp/GetUiobjectShear.cpp
new file mode 100644 (file)
index 0000000..6dc6dfb
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ * Get the Shear property of an uicontrol
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "GetUiobjectShear.hxx"
+
+int GetUiobjectShear(char *sciObjUID)
+{
+  double *shear;
+  int status = FALSE;
+
+  getGraphicObjectProperty(sciObjUID, const_cast<char*>(__GO_UI_SHEAR__), jni_double_vector, (void**) &shear);
+
+  if (shear != NULL)
+  {
+      status = sciReturnRowVector(shear, 2);
+      delete[] shear;
+      return status;
+  }
+
+  Scierror(999, const_cast<char*>(_("'%s' property does not exist for this handle.\n")), "Shear");
+  return FALSE;
+
+}
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectShear.hxx b/scilab/modules/gui/src/cpp/GetUiobjectShear.hxx
new file mode 100644 (file)
index 0000000..85cb0d3
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_SHEAR_HXX__
+#define __GET_UIOBJECT_SHEAR_HXX__
+
+extern "C"{
+#include "localization.h"
+#include "GetUiobjectShear.h"
+#include "Scierror.h"
+#include "graphicObjectProperties.h"
+#include "getGraphicObjectProperty.h"
+}
+
+#endif /* __GET_UIOBJECT_SHEAR_HXX__ */
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectTableData.cpp b/scilab/modules/gui/src/cpp/GetUiobjectTableData.cpp
new file mode 100644 (file)
index 0000000..201cd1e
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ * Get the table data of an uicontrol
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "GetUiobjectTableData.hxx"
+
+extern "C"
+{
+#include "graphicObjectProperties.h"
+#include "getGraphicObjectProperty.h"
+}
+
+int GetUiobjectTableData(char *sciObjUID)
+{
+    int iNbTableData = 0;
+    int *piNbTableData = &iNbTableData;
+    char **pstTableData;
+
+    getGraphicObjectProperty(sciObjUID, const_cast<char*>(__GO_UI_TABLEDATA_SIZE__), jni_int, (void **) &piNbTableData);
+    getGraphicObjectProperty(sciObjUID, const_cast<char*>(__GO_UI_TABLEDATA__), jni_string_vector, (void **) &pstTableData);
+
+    if (pstTableData != NULL)
+    {
+        return sciReturnStringMatrix(pstTableData, 1, iNbTableData);
+    }
+    else
+    {
+        Scierror(999,const_cast<char*>(_("No '%s' property for this object.\n")), "TableData");
+        return FALSE;
+    }
+}
diff --git a/scilab/modules/gui/src/cpp/GetUiobjectTableData.hxx b/scilab/modules/gui/src/cpp/GetUiobjectTableData.hxx
new file mode 100644 (file)
index 0000000..c8df147
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __GET_UIOBJECT_TABLEDATA_HXX__
+#define __GET_UIOBJECT_TABLEDATA_HXX__
+
+extern "C"{
+#include "localization.h"
+#include "GetUiobjectTableData.h"
+#include "Scierror.h"
+#include "graphicObjectProperties.h"
+#include "getGraphicObjectProperty.h"
+}
+
+#endif /* __GET_UIOBJECT_TABLEDATA_HXX__ */
@@ -12,7 +12,7 @@
  *
  */
 
-#include "SetUiobjectColnames.hxx"
+#include "SetUiobjectColumnNames.hxx"
 
 int SetUiobjectColnames(char *sciObjUID, size_t stackPointer, int valueType, int nbRow, int nbCol)
 {
@@ -17,7 +17,7 @@
 extern "C"
 {
 #include "sci_types.h"
-#include "SetUiobjectColnames.h"
+#include "SetUiobjectColumnNames.h"
 #include "getPropertyAssignedValue.h"
 #include "localization.h"
 #include "SetPropertyStatus.h"
@@ -12,7 +12,7 @@
  *
  */
 
-#include "SetUiobjectRownames.hxx"
+#include "SetUiobjectRowNames.hxx"
 
 int SetUiobjectRownames(char *sciObjUID, size_t stackPointer, int valueType, int nbRow, int nbCol)
 {
@@ -17,7 +17,7 @@
 extern "C"
 {
 #include "sci_types.h"
-#include "SetUiobjectRownames.h"
+#include "SetUiobjectRowNames.h"
 #include "getPropertyAssignedValue.h"
 #include "localization.h"
 #include "SetPropertyStatus.h"
@@ -12,7 +12,7 @@
  *
  */
 
-#include "SetUiobjectTabledata.hxx"
+#include "SetUiobjectTableData.hxx"
 
 int SetUiobjectTabledata(char *sciObjUID, size_t stackPointer, int valueType, int nbRow, int nbCol)
 {
@@ -17,7 +17,7 @@
 extern "C"
 {
 #include "sci_types.h"
-#include "SetUiobjectTabledata.h"
+#include "SetUiobjectTableData.h"
 #include "getPropertyAssignedValue.h"
 #include "localization.h"
 #include "SetPropertyStatus.h"