Bug 1253 fixed: There was no possibility to draw only few marks on a polyline which...

Change-Id: I33ef900699ef1d57cc41d62a56fd595e033c2991

diff --git a/SEP/INDEX b/SEP/INDEX
index 6a9a15c..60422e5 100644 (file)
--- a/SEP/INDEX
+++ b/SEP/INDEX
@@ -117,3 +117,4 @@ SEP #118: New function ifftshift
 SEP #119: Management of encoding in xmlRead
 SEP #120: New function tbx_build_pal_loader
 SEP #121: New rect property for matplot handle
+SEP #122: Customized mark draw

diff --git a/SEP/SEP_122_mark_draw.odt b/SEP/SEP_122_mark_draw.odt
new file mode 100644 (file)
index 0000000..ced8082
Binary files /dev/null and b/SEP/SEP_122_mark_draw.odt differ

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 4740ef4..694ba33 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -39,6 +39,9 @@ Obsolete & Removed Functions
 Scilab Bug Fixes
 ================
 
+* Bug #1253 fixed - There was no possibility to draw only few marks on a polyline which
+                    contains a lot of points.
+
 * Bug #1751 fixed - Margins were not computed according to contents.
 
 * Bug #2067 fixed - Scilab crashed when plot was called with a large numerical value.

diff --git a/scilab/modules/graphic_objects/includes/graphicObjectProperties.h b/scilab/modules/graphic_objects/includes/graphicObjectProperties.h
index 6c9a01e..6a7ac71 100755 (executable)
--- a/scilab/modules/graphic_objects/includes/graphicObjectProperties.h
+++ b/scilab/modules/graphic_objects/includes/graphicObjectProperties.h
@@ -204,157 +204,159 @@
 #define __GO_MARK_SIZE__ 182
 #define __GO_MARK_FOREGROUND__ 183
 #define __GO_MARK_BACKGROUND__ 184
-#define __GO_TICKS_DIRECTION__ 185
-#define __GO_X_NUMBER_TICKS__ 186
-#define __GO_Y_NUMBER_TICKS__ 187
-#define __GO_X_TICKS_COORDS__ 188
-#define __GO_Y_TICKS_COORDS__ 189
-#define __GO_TICKS_COLOR__ 190
-#define __GO_TICKS_SEGMENT__ 191
-#define __GO_TICKS_STYLE__ 192
-#define __GO_SUBTICKS__ 193
-#define __GO_NUMBER_TICKS_LABELS__ 194
-#define __GO_TICKS_LABELS__ 195
-#define __GO_FORMATN__ 196
-#define __GO_FONT__ 197
-#define __GO_FONT_STYLE__ 198
-#define __GO_FONT_SIZE__ 199
-#define __GO_FONT_COLOR__ 200
-#define __GO_FONT_FRACTIONAL__ 201
-#define __GO_Z_BOUNDS__ 202
-#define __GO_OUTSIDE_COLOR__ 203
-#define __GO_COLOR_RANGE__ 204
-#define __GO_DATA_MAPPING__ 205
-#define __GO_FONT_ANGLE__ 206
-#define __GO_AUTO_POSITION__ 207
-#define __GO_CORNERS__ 208
-#define __GO_AUTO_ROTATION__ 209
-#define __GO_LINKS__ 210
-#define __GO_LINKS_COUNT__ 211
-#define __GO_LEGEND_LOCATION__ 212
-#define __GO_CLOSED__ 213
-#define __GO_ARROW_SIZE_FACTOR__ 214
-#define __GO_POLYLINE_STYLE__ 215
-#define __GO_INTERP_COLOR_VECTOR__ 216
-#define __GO_INTERP_COLOR_VECTOR_SET__ 217
-#define __GO_INTERP_COLOR_MODE__ 218
-#define __GO_X_SHIFT__ 219
-#define __GO_Y_SHIFT__ 220
-#define __GO_Z_SHIFT__ 221
-#define __GO_BAR_WIDTH__ 222
-#define __GO_SURFACE_MODE__ 223
-#define __GO_COLOR_MODE__ 224
-#define __GO_COLOR_FLAG__ 225
-#define __GO_ALIGNMENT__ 226
-#define __GO_BOX__ 227
-#define __GO_TEXT_BOX__ 228
-#define __GO_TEXT_BOX_MODE__ 229
-#define __GO_AUTO_DIMENSIONING__ 230
-#define __GO_FORMATTED_TEXT__ 231
-#define __GO_TEXT_ARRAY_DIMENSIONS__ 232
-#define __GO_TEXT_STRINGS__ 233
-#define __GO_BASE__ 234
-#define __GO_BASE_X__ 235
-#define __GO_BASE_Y__ 236
-#define __GO_BASE_Z__ 237
-#define __GO_DIRECTION__ 238
-#define __GO_DIRECTION_X__ 239
-#define __GO_DIRECTION_Y__ 240
-#define __GO_DIRECTION_Z__ 241
-#define __GO_ARROW_SIZE__ 242
-#define __GO_SEGS_COLORS__ 243
-#define __GO_COLORED__ 244
-#define __GO_ARROWS__ 245
-#define __GO_NUMBER_ARROWS__ 246
-#define __GO_CHAMP_DIMENSIONS__ 247
-#define __GO_BOUNDING_BOX__ 248
-#define __GO_MAX_LENGTH__ 249
-#define __GO_MAX_USABLE_LENGTH__ 250
-#define __GO_HIDDEN_COLOR__ 251
-#define __GO_STYLE__ 252
-#define __GO_UI_CHECKBOX__ 253
-#define __GO_UI_EDIT__ 254
-#define __GO_UI_FRAME__ 255
-#define __GO_UI_IMAGE__ 256
-#define __GO_UI_LISTBOX__ 257
-#define __GO_UI_POPUPMENU__ 258
-#define __GO_UI_PUSHBUTTON__ 259
-#define __GO_UI_RADIOBUTTON__ 260
-#define __GO_UI_SLIDER__ 261
-#define __GO_UI_TABLE__ 262
-#define __GO_UI_TEXT__ 263
-#define __GO_UI_BACKGROUNDCOLOR__ 264
-#define __GO_UI_ENABLE__ 265
-#define __GO_UI_FONTANGLE__ 266
-#define __GO_UI_FONTNAME__ 267
-#define __GO_UI_FONTSIZE__ 268
-#define __GO_UI_FONTUNITS__ 269
-#define __GO_UI_FONTWEIGHT__ 270
-#define __GO_UI_FOREGROUNDCOLOR__ 271
-#define __GO_UI_HORIZONTALALIGNMENT__ 272
-#define __GO_UI_LISTBOXTOP__ 273
-#define __GO_UI_LISTBOXTOP_SIZE__ 274
-#define __GO_UI_MAX__ 275
-#define __GO_UI_MIN__ 276
-#define __GO_UI_RELIEF__ 277
-#define __GO_UI_STRING__ 278
-#define __GO_UI_STRING_SIZE__ 279
-#define __GO_UI_STRING_COLNB__ 280
-#define __GO_UI_TOOLTIPSTRING__ 281
-#define __GO_UI_TOOLTIPSTRING_SIZE__ 282
-#define __GO_UI_SLIDERSTEP__ 283
-#define __GO_UI_UNITS__ 284
-#define __GO_UI_VALUE__ 285
-#define __GO_UI_VALUE_SIZE__ 286
-#define __GO_UI_VERTICALALIGNMENT__ 287
-#define __GO_UIPARENTMENU__ 288
-#define __GO_UICHILDMENU__ 289
-#define __GO_UICHECKEDMENU__ 290
-#define __GO_UI_CHECKED__ 291
-#define __GO_UI_LABEL__ 292
-#define __GO_UI_MNEMONIC__ 293
-#define __GO_UI_ACCELERATOR__ 294
-#define __GO_UI_SEPARATOR__ 295
-#define __GO_UI_ICON__ 296
-#define __GO_CONSOLE__ 297
-#define __GO_SHOWHIDDENHANDLES__ 298
-#define __GO_WAITBAR__ 299
-#define __GO_PROGRESSIONBAR__ 300
-#define __GO_UI_MESSAGE__ 301
-#define __GO_UI_MESSAGE_SIZE__ 302
-#define __GO_DATATIP__ 303
-#define __GO_DATATIP_DATA__ 304
-#define __GO_DATATIP_ORIENTATION__ 305
-#define __GO_DATATIP_3COMPONENT__ 306
-#define __GO_DATATIP_AUTOORIENTATION__ 307
-#define __GO_DATATIP_INTERP_MODE__ 308
-#define __GO_DATATIP_DISPLAY_FNC__ 309
-#define __GO_DATATIP_BOX_MODE__ 310
-#define __GO_DATATIP_LABEL_MODE__ 311
-#define __GO_AMBIENTCOLOR__ 312
-#define __GO_DIFFUSECOLOR__ 313
-#define __GO_SPECULARCOLOR__ 314
-#define __GO_COLOR_MATERIAL__ 315
-#define __GO_MATERIAL_SHININESS__ 316
-#define __GO_LIGHT__ 317
-#define __GO_LIGHT_TYPE__ 318
-#define __GO_DATATIPS__ 319
-#define __GO_DATATIPS_COUNT__ 320
-#define __GO_DATATIP_INDEXES__ 321
-#define __GO_DATA_MODEL_DISPLAY_FUNCTION__ 322
-#define __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ 323
-#define __GO_RESIZE__ 324
-#define __GO_TOOLBAR__ 325
-#define __GO_TOOLBAR_VISIBLE__ 326
-#define __GO_MENUBAR__ 327
-#define __GO_MENUBAR_VISIBLE__ 328
-#define __GO_INFOBAR_VISIBLE__ 329
-#define __GO_DOCKABLE__ 330
-#define __GO_LAYOUT__ 331
-#define __GO_LAYOUT_SET__ 332
-#define __GO_UI_BORDER_CONSTRAINTS__ 333
-#define __GO_UI_GRID_CONSTRAINTS__ 334
-#define __GO_UI_TABGROUP__ 335
-#define __GO_UI_TAB__ 336
+#define __GO_MARK_OFFSET__ 185
+#define __GO_MARK_STRIDE__ 186
+#define __GO_TICKS_DIRECTION__ 187
+#define __GO_X_NUMBER_TICKS__ 188
+#define __GO_Y_NUMBER_TICKS__ 189
+#define __GO_X_TICKS_COORDS__ 190
+#define __GO_Y_TICKS_COORDS__ 191
+#define __GO_TICKS_COLOR__ 192
+#define __GO_TICKS_SEGMENT__ 193
+#define __GO_TICKS_STYLE__ 194
+#define __GO_SUBTICKS__ 195
+#define __GO_NUMBER_TICKS_LABELS__ 196
+#define __GO_TICKS_LABELS__ 197
+#define __GO_FORMATN__ 198
+#define __GO_FONT__ 199
+#define __GO_FONT_STYLE__ 200
+#define __GO_FONT_SIZE__ 201
+#define __GO_FONT_COLOR__ 202
+#define __GO_FONT_FRACTIONAL__ 203
+#define __GO_Z_BOUNDS__ 204
+#define __GO_OUTSIDE_COLOR__ 205
+#define __GO_COLOR_RANGE__ 206
+#define __GO_DATA_MAPPING__ 207
+#define __GO_FONT_ANGLE__ 208
+#define __GO_AUTO_POSITION__ 209
+#define __GO_CORNERS__ 210
+#define __GO_AUTO_ROTATION__ 211
+#define __GO_LINKS__ 212
+#define __GO_LINKS_COUNT__ 213
+#define __GO_LEGEND_LOCATION__ 214
+#define __GO_CLOSED__ 215
+#define __GO_ARROW_SIZE_FACTOR__ 216
+#define __GO_POLYLINE_STYLE__ 217
+#define __GO_INTERP_COLOR_VECTOR__ 218
+#define __GO_INTERP_COLOR_VECTOR_SET__ 219
+#define __GO_INTERP_COLOR_MODE__ 220
+#define __GO_X_SHIFT__ 221
+#define __GO_Y_SHIFT__ 222
+#define __GO_Z_SHIFT__ 223
+#define __GO_BAR_WIDTH__ 224
+#define __GO_SURFACE_MODE__ 225
+#define __GO_COLOR_MODE__ 226
+#define __GO_COLOR_FLAG__ 227
+#define __GO_ALIGNMENT__ 228
+#define __GO_BOX__ 229
+#define __GO_TEXT_BOX__ 230
+#define __GO_TEXT_BOX_MODE__ 231
+#define __GO_AUTO_DIMENSIONING__ 232
+#define __GO_FORMATTED_TEXT__ 233
+#define __GO_TEXT_ARRAY_DIMENSIONS__ 234
+#define __GO_TEXT_STRINGS__ 235
+#define __GO_BASE__ 236
+#define __GO_BASE_X__ 237
+#define __GO_BASE_Y__ 238
+#define __GO_BASE_Z__ 239
+#define __GO_DIRECTION__ 240
+#define __GO_DIRECTION_X__ 241
+#define __GO_DIRECTION_Y__ 242
+#define __GO_DIRECTION_Z__ 243
+#define __GO_ARROW_SIZE__ 244
+#define __GO_SEGS_COLORS__ 245
+#define __GO_COLORED__ 246
+#define __GO_ARROWS__ 247
+#define __GO_NUMBER_ARROWS__ 248
+#define __GO_CHAMP_DIMENSIONS__ 249
+#define __GO_BOUNDING_BOX__ 250
+#define __GO_MAX_LENGTH__ 251
+#define __GO_MAX_USABLE_LENGTH__ 252
+#define __GO_HIDDEN_COLOR__ 253
+#define __GO_STYLE__ 254
+#define __GO_UI_CHECKBOX__ 255
+#define __GO_UI_EDIT__ 256
+#define __GO_UI_FRAME__ 257
+#define __GO_UI_IMAGE__ 258
+#define __GO_UI_LISTBOX__ 259
+#define __GO_UI_POPUPMENU__ 260
+#define __GO_UI_PUSHBUTTON__ 261
+#define __GO_UI_RADIOBUTTON__ 262
+#define __GO_UI_SLIDER__ 263
+#define __GO_UI_TABLE__ 264
+#define __GO_UI_TEXT__ 265
+#define __GO_UI_BACKGROUNDCOLOR__ 266
+#define __GO_UI_ENABLE__ 267
+#define __GO_UI_FONTANGLE__ 268
+#define __GO_UI_FONTNAME__ 269
+#define __GO_UI_FONTSIZE__ 270
+#define __GO_UI_FONTUNITS__ 271
+#define __GO_UI_FONTWEIGHT__ 272
+#define __GO_UI_FOREGROUNDCOLOR__ 273
+#define __GO_UI_HORIZONTALALIGNMENT__ 274
+#define __GO_UI_LISTBOXTOP__ 275
+#define __GO_UI_LISTBOXTOP_SIZE__ 276
+#define __GO_UI_MAX__ 277
+#define __GO_UI_MIN__ 278
+#define __GO_UI_RELIEF__ 279
+#define __GO_UI_STRING__ 280
+#define __GO_UI_STRING_SIZE__ 281
+#define __GO_UI_STRING_COLNB__ 282
+#define __GO_UI_TOOLTIPSTRING__ 283
+#define __GO_UI_TOOLTIPSTRING_SIZE__ 284
+#define __GO_UI_SLIDERSTEP__ 285
+#define __GO_UI_UNITS__ 286
+#define __GO_UI_VALUE__ 287
+#define __GO_UI_VALUE_SIZE__ 288
+#define __GO_UI_VERTICALALIGNMENT__ 289
+#define __GO_UIPARENTMENU__ 290
+#define __GO_UICHILDMENU__ 291
+#define __GO_UICHECKEDMENU__ 292
+#define __GO_UI_CHECKED__ 293
+#define __GO_UI_LABEL__ 294
+#define __GO_UI_MNEMONIC__ 295
+#define __GO_UI_ACCELERATOR__ 296
+#define __GO_UI_SEPARATOR__ 297
+#define __GO_UI_ICON__ 298
+#define __GO_CONSOLE__ 299
+#define __GO_SHOWHIDDENHANDLES__ 300
+#define __GO_WAITBAR__ 301
+#define __GO_PROGRESSIONBAR__ 302
+#define __GO_UI_MESSAGE__ 303
+#define __GO_UI_MESSAGE_SIZE__ 304
+#define __GO_DATATIP__ 305
+#define __GO_DATATIP_DATA__ 306
+#define __GO_DATATIP_ORIENTATION__ 307
+#define __GO_DATATIP_3COMPONENT__ 308
+#define __GO_DATATIP_AUTOORIENTATION__ 309
+#define __GO_DATATIP_INTERP_MODE__ 310
+#define __GO_DATATIP_DISPLAY_FNC__ 311
+#define __GO_DATATIP_BOX_MODE__ 312
+#define __GO_DATATIP_LABEL_MODE__ 313
+#define __GO_AMBIENTCOLOR__ 314
+#define __GO_DIFFUSECOLOR__ 315
+#define __GO_SPECULARCOLOR__ 316
+#define __GO_COLOR_MATERIAL__ 317
+#define __GO_MATERIAL_SHININESS__ 318
+#define __GO_LIGHT__ 319
+#define __GO_LIGHT_TYPE__ 320
+#define __GO_DATATIPS__ 321
+#define __GO_DATATIPS_COUNT__ 322
+#define __GO_DATATIP_INDEXES__ 323
+#define __GO_DATA_MODEL_DISPLAY_FUNCTION__ 324
+#define __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ 325
+#define __GO_RESIZE__ 326
+#define __GO_TOOLBAR__ 327
+#define __GO_TOOLBAR_VISIBLE__ 328
+#define __GO_MENUBAR__ 329
+#define __GO_MENUBAR_VISIBLE__ 330
+#define __GO_INFOBAR_VISIBLE__ 331
+#define __GO_DOCKABLE__ 332
+#define __GO_LAYOUT__ 333
+#define __GO_LAYOUT_SET__ 334
+#define __GO_UI_BORDER_CONSTRAINTS__ 335
+#define __GO_UI_GRID_CONSTRAINTS__ 336
+#define __GO_UI_TABGROUP__ 337
+#define __GO_UI_TAB__ 338
 
 #endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */

diff --git a/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/ContouredObject.java b/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/ContouredObject.java
index c3c0553..0c7a532 100644 (file)
--- a/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/ContouredObject.java
+++ b/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/ContouredObject.java
@@ -27,7 +27,7 @@ import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProp
  */
 public abstract class ContouredObject extends GraphicObject {
     /** ContouredObject properties */
-    public enum ContouredObjectPropertyType { LINE, FILLMODE, BACKGROUND, MARK };
+    public enum ContouredObjectPropertyType { LINE, FILLMODE, BACKGROUND, MARK, MARK_OFFSET, MARK_STRIDE };
 
     /** Line property */
     private Line line;
@@ -41,12 +41,17 @@ public abstract class ContouredObject extends GraphicObject {
     /** Mark property */
     private Mark mark;
 
+    private int offset;
+    private int stride;
+
     /** Default constructor */
     public ContouredObject() {
         line = new Line();
         fillMode = false;
         background = 0;
         mark = new Mark();
+        offset = 0;
+        stride = 1;
     }
 
     public ContouredObject clone() {
@@ -93,6 +98,10 @@ public abstract class ContouredObject extends GraphicObject {
                 return MarkPropertyType.FOREGROUND;
             case __GO_MARK_BACKGROUND__ :
                 return MarkPropertyType.BACKGROUND;
+            case __GO_MARK_OFFSET__ :
+                return ContouredObjectPropertyType.MARK_OFFSET;
+            case __GO_MARK_STRIDE__ :
+                return ContouredObjectPropertyType.MARK_STRIDE;
             default :
                 return super.getPropertyFromName(propertyName);
         }
@@ -132,6 +141,10 @@ public abstract class ContouredObject extends GraphicObject {
             return getMarkForeground();
         } else if (property == MarkPropertyType.BACKGROUND) {
             return getMarkBackground();
+        } else if (property == ContouredObjectPropertyType.MARK_OFFSET) {
+            return getMarkOffset();
+        } else if (property == ContouredObjectPropertyType.MARK_STRIDE) {
+            return getMarkStride();
         } else {
             return super.getProperty(property);
         }
@@ -172,6 +185,10 @@ public abstract class ContouredObject extends GraphicObject {
             this.setMarkForeground((Integer) value);
         } else if (property == MarkPropertyType.BACKGROUND) {
             this.setMarkBackground((Integer) value);
+        } else if (property == ContouredObjectPropertyType.MARK_OFFSET) {
+            this.setMarkOffset((Integer) value);
+        } else if (property == ContouredObjectPropertyType.MARK_STRIDE) {
+            this.setMarkStride((Integer) value);
         } else {
             return super.setProperty(property, value);
         }
@@ -180,6 +197,44 @@ public abstract class ContouredObject extends GraphicObject {
     }
 
     /**
+     * @return the offset
+     */
+    public Integer getMarkOffset() {
+        return offset;
+    }
+
+    /**
+     * @param offset the offset to set
+     */
+    public UpdateStatus setMarkOffset(Integer offset) {
+        if (this.offset != offset) {
+            this.offset = offset < 0 ? 0 : offset;
+            return UpdateStatus.Success;
+        }
+
+        return UpdateStatus.NoChange;
+    }
+
+    /**
+     * @return the stride
+     */
+    public Integer getMarkStride() {
+        return stride;
+    }
+
+    /**
+     * @param stride the stride to set
+     */
+    public UpdateStatus setMarkStride(Integer stride) {
+        if (this.stride != stride) {
+            this.stride = stride < 1 ? 1 : stride;
+            return UpdateStatus.Success;
+        }
+
+        return UpdateStatus.NoChange;
+    }
+
+    /**
      * @return the background
      */
     public Integer getBackground() {

diff --git a/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java b/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
index 23b2414..d389c7a 100755 (executable)
--- a/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
+++ b/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
@@ -205,157 +205,159 @@ public class GraphicObjectProperties {
     public static final int __GO_MARK_SIZE__ = 182;
     public static final int __GO_MARK_FOREGROUND__ = 183;
     public static final int __GO_MARK_BACKGROUND__ = 184;
-    public static final int __GO_TICKS_DIRECTION__ = 185;
-    public static final int __GO_X_NUMBER_TICKS__ = 186;
-    public static final int __GO_Y_NUMBER_TICKS__ = 187;
-    public static final int __GO_X_TICKS_COORDS__ = 188;
-    public static final int __GO_Y_TICKS_COORDS__ = 189;
-    public static final int __GO_TICKS_COLOR__ = 190;
-    public static final int __GO_TICKS_SEGMENT__ = 191;
-    public static final int __GO_TICKS_STYLE__ = 192;
-    public static final int __GO_SUBTICKS__ = 193;
-    public static final int __GO_NUMBER_TICKS_LABELS__ = 194;
-    public static final int __GO_TICKS_LABELS__ = 195;
-    public static final int __GO_FORMATN__ = 196;
-    public static final int __GO_FONT__ = 197;
-    public static final int __GO_FONT_STYLE__ = 198;
-    public static final int __GO_FONT_SIZE__ = 199;
-    public static final int __GO_FONT_COLOR__ = 200;
-    public static final int __GO_FONT_FRACTIONAL__ = 201;
-    public static final int __GO_Z_BOUNDS__ = 202;
-    public static final int __GO_OUTSIDE_COLOR__ = 203;
-    public static final int __GO_COLOR_RANGE__ = 204;
-    public static final int __GO_DATA_MAPPING__ = 205;
-    public static final int __GO_FONT_ANGLE__ = 206;
-    public static final int __GO_AUTO_POSITION__ = 207;
-    public static final int __GO_CORNERS__ = 208;
-    public static final int __GO_AUTO_ROTATION__ = 209;
-    public static final int __GO_LINKS__ = 210;
-    public static final int __GO_LINKS_COUNT__ = 211;
-    public static final int __GO_LEGEND_LOCATION__ = 212;
-    public static final int __GO_CLOSED__ = 213;
-    public static final int __GO_ARROW_SIZE_FACTOR__ = 214;
-    public static final int __GO_POLYLINE_STYLE__ = 215;
-    public static final int __GO_INTERP_COLOR_VECTOR__ = 216;
-    public static final int __GO_INTERP_COLOR_VECTOR_SET__ = 217;
-    public static final int __GO_INTERP_COLOR_MODE__ = 218;
-    public static final int __GO_X_SHIFT__ = 219;
-    public static final int __GO_Y_SHIFT__ = 220;
-    public static final int __GO_Z_SHIFT__ = 221;
-    public static final int __GO_BAR_WIDTH__ = 222;
-    public static final int __GO_SURFACE_MODE__ = 223;
-    public static final int __GO_COLOR_MODE__ = 224;
-    public static final int __GO_COLOR_FLAG__ = 225;
-    public static final int __GO_ALIGNMENT__ = 226;
-    public static final int __GO_BOX__ = 227;
-    public static final int __GO_TEXT_BOX__ = 228;
-    public static final int __GO_TEXT_BOX_MODE__ = 229;
-    public static final int __GO_AUTO_DIMENSIONING__ = 230;
-    public static final int __GO_FORMATTED_TEXT__ = 231;
-    public static final int __GO_TEXT_ARRAY_DIMENSIONS__ = 232;
-    public static final int __GO_TEXT_STRINGS__ = 233;
-    public static final int __GO_BASE__ = 234;
-    public static final int __GO_BASE_X__ = 235;
-    public static final int __GO_BASE_Y__ = 236;
-    public static final int __GO_BASE_Z__ = 237;
-    public static final int __GO_DIRECTION__ = 238;
-    public static final int __GO_DIRECTION_X__ = 239;
-    public static final int __GO_DIRECTION_Y__ = 240;
-    public static final int __GO_DIRECTION_Z__ = 241;
-    public static final int __GO_ARROW_SIZE__ = 242;
-    public static final int __GO_SEGS_COLORS__ = 243;
-    public static final int __GO_COLORED__ = 244;
-    public static final int __GO_ARROWS__ = 245;
-    public static final int __GO_NUMBER_ARROWS__ = 246;
-    public static final int __GO_CHAMP_DIMENSIONS__ = 247;
-    public static final int __GO_BOUNDING_BOX__ = 248;
-    public static final int __GO_MAX_LENGTH__ = 249;
-    public static final int __GO_MAX_USABLE_LENGTH__ = 250;
-    public static final int __GO_HIDDEN_COLOR__ = 251;
-    public static final int __GO_STYLE__ = 252;
-    public static final int __GO_UI_CHECKBOX__ = 253;
-    public static final int __GO_UI_EDIT__ = 254;
-    public static final int __GO_UI_FRAME__ = 255;
-    public static final int __GO_UI_IMAGE__ = 256;
-    public static final int __GO_UI_LISTBOX__ = 257;
-    public static final int __GO_UI_POPUPMENU__ = 258;
-    public static final int __GO_UI_PUSHBUTTON__ = 259;
-    public static final int __GO_UI_RADIOBUTTON__ = 260;
-    public static final int __GO_UI_SLIDER__ = 261;
-    public static final int __GO_UI_TABLE__ = 262;
-    public static final int __GO_UI_TEXT__ = 263;
-    public static final int __GO_UI_BACKGROUNDCOLOR__ = 264;
-    public static final int __GO_UI_ENABLE__ = 265;
-    public static final int __GO_UI_FONTANGLE__ = 266;
-    public static final int __GO_UI_FONTNAME__ = 267;
-    public static final int __GO_UI_FONTSIZE__ = 268;
-    public static final int __GO_UI_FONTUNITS__ = 269;
-    public static final int __GO_UI_FONTWEIGHT__ = 270;
-    public static final int __GO_UI_FOREGROUNDCOLOR__ = 271;
-    public static final int __GO_UI_HORIZONTALALIGNMENT__ = 272;
-    public static final int __GO_UI_LISTBOXTOP__ = 273;
-    public static final int __GO_UI_LISTBOXTOP_SIZE__ = 274;
-    public static final int __GO_UI_MAX__ = 275;
-    public static final int __GO_UI_MIN__ = 276;
-    public static final int __GO_UI_RELIEF__ = 277;
-    public static final int __GO_UI_STRING__ = 278;
-    public static final int __GO_UI_STRING_SIZE__ = 279;
-    public static final int __GO_UI_STRING_COLNB__ = 280;
-    public static final int __GO_UI_TOOLTIPSTRING__ = 281;
-    public static final int __GO_UI_TOOLTIPSTRING_SIZE__ = 282;
-    public static final int __GO_UI_SLIDERSTEP__ = 283;
-    public static final int __GO_UI_UNITS__ = 284;
-    public static final int __GO_UI_VALUE__ = 285;
-    public static final int __GO_UI_VALUE_SIZE__ = 286;
-    public static final int __GO_UI_VERTICALALIGNMENT__ = 287;
-    public static final int __GO_UIPARENTMENU__ = 288;
-    public static final int __GO_UICHILDMENU__ = 289;
-    public static final int __GO_UICHECKEDMENU__ = 290;
-    public static final int __GO_UI_CHECKED__ = 291;
-    public static final int __GO_UI_LABEL__ = 292;
-    public static final int __GO_UI_MNEMONIC__ = 293;
-    public static final int __GO_UI_ACCELERATOR__ = 294;
-    public static final int __GO_UI_SEPARATOR__ = 295;
-    public static final int __GO_UI_ICON__ = 296;
-    public static final int __GO_CONSOLE__ = 297;
-    public static final int __GO_SHOWHIDDENHANDLES__ = 298;
-    public static final int __GO_WAITBAR__ = 299;
-    public static final int __GO_PROGRESSIONBAR__ = 300;
-    public static final int __GO_UI_MESSAGE__ = 301;
-    public static final int __GO_UI_MESSAGE_SIZE__ = 302;
-    public static final int __GO_DATATIP__ = 303;
-    public static final int __GO_DATATIP_DATA__ = 304;
-    public static final int __GO_DATATIP_ORIENTATION__ = 305;
-    public static final int __GO_DATATIP_3COMPONENT__ = 306;
-    public static final int __GO_DATATIP_AUTOORIENTATION__ = 307;
-    public static final int __GO_DATATIP_INTERP_MODE__ = 308;
-    public static final int __GO_DATATIP_DISPLAY_FNC__ = 309;
-    public static final int __GO_DATATIP_BOX_MODE__ = 310;
-    public static final int __GO_DATATIP_LABEL_MODE__ = 311;
-    public static final int __GO_AMBIENTCOLOR__ = 312;
-    public static final int __GO_DIFFUSECOLOR__ = 313;
-    public static final int __GO_SPECULARCOLOR__ = 314;
-    public static final int __GO_COLOR_MATERIAL__ = 315;
-    public static final int __GO_MATERIAL_SHININESS__ = 316;
-    public static final int __GO_LIGHT__ = 317;
-    public static final int __GO_LIGHT_TYPE__ = 318;
-    public static final int __GO_DATATIPS__ = 319;
-    public static final int __GO_DATATIPS_COUNT__ = 320;
-    public static final int __GO_DATATIP_INDEXES__ = 321;
-    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION__ = 322;
-    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ = 323;
-    public static final int __GO_RESIZE__ = 324;
-    public static final int __GO_TOOLBAR__ = 325;
-    public static final int __GO_TOOLBAR_VISIBLE__ = 326;
-    public static final int __GO_MENUBAR__ = 327;
-    public static final int __GO_MENUBAR_VISIBLE__ = 328;
-    public static final int __GO_INFOBAR_VISIBLE__ = 329;
-    public static final int __GO_DOCKABLE__ = 330;
-    public static final int __GO_LAYOUT__ = 331;
-    public static final int __GO_LAYOUT_SET__ = 332;
-    public static final int __GO_UI_BORDER_CONSTRAINTS__ = 333;
-    public static final int __GO_UI_GRID_CONSTRAINTS__ = 334;
-    public static final int __GO_UI_TABGROUP__ = 335;
-    public static final int __GO_UI_TAB__ = 336;
+    public static final int __GO_MARK_OFFSET__ = 185;
+    public static final int __GO_MARK_STRIDE__ = 186;
+    public static final int __GO_TICKS_DIRECTION__ = 187;
+    public static final int __GO_X_NUMBER_TICKS__ = 188;
+    public static final int __GO_Y_NUMBER_TICKS__ = 189;
+    public static final int __GO_X_TICKS_COORDS__ = 190;
+    public static final int __GO_Y_TICKS_COORDS__ = 191;
+    public static final int __GO_TICKS_COLOR__ = 192;
+    public static final int __GO_TICKS_SEGMENT__ = 193;
+    public static final int __GO_TICKS_STYLE__ = 194;
+    public static final int __GO_SUBTICKS__ = 195;
+    public static final int __GO_NUMBER_TICKS_LABELS__ = 196;
+    public static final int __GO_TICKS_LABELS__ = 197;
+    public static final int __GO_FORMATN__ = 198;
+    public static final int __GO_FONT__ = 199;
+    public static final int __GO_FONT_STYLE__ = 200;
+    public static final int __GO_FONT_SIZE__ = 201;
+    public static final int __GO_FONT_COLOR__ = 202;
+    public static final int __GO_FONT_FRACTIONAL__ = 203;
+    public static final int __GO_Z_BOUNDS__ = 204;
+    public static final int __GO_OUTSIDE_COLOR__ = 205;
+    public static final int __GO_COLOR_RANGE__ = 206;
+    public static final int __GO_DATA_MAPPING__ = 207;
+    public static final int __GO_FONT_ANGLE__ = 208;
+    public static final int __GO_AUTO_POSITION__ = 209;
+    public static final int __GO_CORNERS__ = 210;
+    public static final int __GO_AUTO_ROTATION__ = 211;
+    public static final int __GO_LINKS__ = 212;
+    public static final int __GO_LINKS_COUNT__ = 213;
+    public static final int __GO_LEGEND_LOCATION__ = 214;
+    public static final int __GO_CLOSED__ = 215;
+    public static final int __GO_ARROW_SIZE_FACTOR__ = 216;
+    public static final int __GO_POLYLINE_STYLE__ = 217;
+    public static final int __GO_INTERP_COLOR_VECTOR__ = 218;
+    public static final int __GO_INTERP_COLOR_VECTOR_SET__ = 219;
+    public static final int __GO_INTERP_COLOR_MODE__ = 220;
+    public static final int __GO_X_SHIFT__ = 221;
+    public static final int __GO_Y_SHIFT__ = 222;
+    public static final int __GO_Z_SHIFT__ = 223;
+    public static final int __GO_BAR_WIDTH__ = 224;
+    public static final int __GO_SURFACE_MODE__ = 225;
+    public static final int __GO_COLOR_MODE__ = 226;
+    public static final int __GO_COLOR_FLAG__ = 227;
+    public static final int __GO_ALIGNMENT__ = 228;
+    public static final int __GO_BOX__ = 229;
+    public static final int __GO_TEXT_BOX__ = 230;
+    public static final int __GO_TEXT_BOX_MODE__ = 231;
+    public static final int __GO_AUTO_DIMENSIONING__ = 232;
+    public static final int __GO_FORMATTED_TEXT__ = 233;
+    public static final int __GO_TEXT_ARRAY_DIMENSIONS__ = 234;
+    public static final int __GO_TEXT_STRINGS__ = 235;
+    public static final int __GO_BASE__ = 236;
+    public static final int __GO_BASE_X__ = 237;
+    public static final int __GO_BASE_Y__ = 238;
+    public static final int __GO_BASE_Z__ = 239;
+    public static final int __GO_DIRECTION__ = 240;
+    public static final int __GO_DIRECTION_X__ = 241;
+    public static final int __GO_DIRECTION_Y__ = 242;
+    public static final int __GO_DIRECTION_Z__ = 243;
+    public static final int __GO_ARROW_SIZE__ = 244;
+    public static final int __GO_SEGS_COLORS__ = 245;
+    public static final int __GO_COLORED__ = 246;
+    public static final int __GO_ARROWS__ = 247;
+    public static final int __GO_NUMBER_ARROWS__ = 248;
+    public static final int __GO_CHAMP_DIMENSIONS__ = 249;
+    public static final int __GO_BOUNDING_BOX__ = 250;
+    public static final int __GO_MAX_LENGTH__ = 251;
+    public static final int __GO_MAX_USABLE_LENGTH__ = 252;
+    public static final int __GO_HIDDEN_COLOR__ = 253;
+    public static final int __GO_STYLE__ = 254;
+    public static final int __GO_UI_CHECKBOX__ = 255;
+    public static final int __GO_UI_EDIT__ = 256;
+    public static final int __GO_UI_FRAME__ = 257;
+    public static final int __GO_UI_IMAGE__ = 258;
+    public static final int __GO_UI_LISTBOX__ = 259;
+    public static final int __GO_UI_POPUPMENU__ = 260;
+    public static final int __GO_UI_PUSHBUTTON__ = 261;
+    public static final int __GO_UI_RADIOBUTTON__ = 262;
+    public static final int __GO_UI_SLIDER__ = 263;
+    public static final int __GO_UI_TABLE__ = 264;
+    public static final int __GO_UI_TEXT__ = 265;
+    public static final int __GO_UI_BACKGROUNDCOLOR__ = 266;
+    public static final int __GO_UI_ENABLE__ = 267;
+    public static final int __GO_UI_FONTANGLE__ = 268;
+    public static final int __GO_UI_FONTNAME__ = 269;
+    public static final int __GO_UI_FONTSIZE__ = 270;
+    public static final int __GO_UI_FONTUNITS__ = 271;
+    public static final int __GO_UI_FONTWEIGHT__ = 272;
+    public static final int __GO_UI_FOREGROUNDCOLOR__ = 273;
+    public static final int __GO_UI_HORIZONTALALIGNMENT__ = 274;
+    public static final int __GO_UI_LISTBOXTOP__ = 275;
+    public static final int __GO_UI_LISTBOXTOP_SIZE__ = 276;
+    public static final int __GO_UI_MAX__ = 277;
+    public static final int __GO_UI_MIN__ = 278;
+    public static final int __GO_UI_RELIEF__ = 279;
+    public static final int __GO_UI_STRING__ = 280;
+    public static final int __GO_UI_STRING_SIZE__ = 281;
+    public static final int __GO_UI_STRING_COLNB__ = 282;
+    public static final int __GO_UI_TOOLTIPSTRING__ = 283;
+    public static final int __GO_UI_TOOLTIPSTRING_SIZE__ = 284;
+    public static final int __GO_UI_SLIDERSTEP__ = 285;
+    public static final int __GO_UI_UNITS__ = 286;
+    public static final int __GO_UI_VALUE__ = 287;
+    public static final int __GO_UI_VALUE_SIZE__ = 288;
+    public static final int __GO_UI_VERTICALALIGNMENT__ = 289;
+    public static final int __GO_UIPARENTMENU__ = 290;
+    public static final int __GO_UICHILDMENU__ = 291;
+    public static final int __GO_UICHECKEDMENU__ = 292;
+    public static final int __GO_UI_CHECKED__ = 293;
+    public static final int __GO_UI_LABEL__ = 294;
+    public static final int __GO_UI_MNEMONIC__ = 295;
+    public static final int __GO_UI_ACCELERATOR__ = 296;
+    public static final int __GO_UI_SEPARATOR__ = 297;
+    public static final int __GO_UI_ICON__ = 298;
+    public static final int __GO_CONSOLE__ = 299;
+    public static final int __GO_SHOWHIDDENHANDLES__ = 300;
+    public static final int __GO_WAITBAR__ = 301;
+    public static final int __GO_PROGRESSIONBAR__ = 302;
+    public static final int __GO_UI_MESSAGE__ = 303;
+    public static final int __GO_UI_MESSAGE_SIZE__ = 304;
+    public static final int __GO_DATATIP__ = 305;
+    public static final int __GO_DATATIP_DATA__ = 306;
+    public static final int __GO_DATATIP_ORIENTATION__ = 307;
+    public static final int __GO_DATATIP_3COMPONENT__ = 308;
+    public static final int __GO_DATATIP_AUTOORIENTATION__ = 309;
+    public static final int __GO_DATATIP_INTERP_MODE__ = 310;
+    public static final int __GO_DATATIP_DISPLAY_FNC__ = 311;
+    public static final int __GO_DATATIP_BOX_MODE__ = 312;
+    public static final int __GO_DATATIP_LABEL_MODE__ = 313;
+    public static final int __GO_AMBIENTCOLOR__ = 314;
+    public static final int __GO_DIFFUSECOLOR__ = 315;
+    public static final int __GO_SPECULARCOLOR__ = 316;
+    public static final int __GO_COLOR_MATERIAL__ = 317;
+    public static final int __GO_MATERIAL_SHININESS__ = 318;
+    public static final int __GO_LIGHT__ = 319;
+    public static final int __GO_LIGHT_TYPE__ = 320;
+    public static final int __GO_DATATIPS__ = 321;
+    public static final int __GO_DATATIPS_COUNT__ = 322;
+    public static final int __GO_DATATIP_INDEXES__ = 323;
+    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION__ = 324;
+    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ = 325;
+    public static final int __GO_RESIZE__ = 326;
+    public static final int __GO_TOOLBAR__ = 327;
+    public static final int __GO_TOOLBAR_VISIBLE__ = 328;
+    public static final int __GO_MENUBAR__ = 329;
+    public static final int __GO_MENUBAR_VISIBLE__ = 330;
+    public static final int __GO_INFOBAR_VISIBLE__ = 331;
+    public static final int __GO_DOCKABLE__ = 332;
+    public static final int __GO_LAYOUT__ = 333;
+    public static final int __GO_LAYOUT_SET__ = 334;
+    public static final int __GO_UI_BORDER_CONSTRAINTS__ = 335;
+    public static final int __GO_UI_GRID_CONSTRAINTS__ = 336;
+    public static final int __GO_UI_TABGROUP__ = 337;
+    public static final int __GO_UI_TAB__ = 338;
 
 }

diff --git a/scilab/modules/graphic_objects/src/scripts/propertiesMap.properties b/scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
index 77bd187..facb449 100755 (executable)
--- a/scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
+++ b/scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
@@ -204,6 +204,8 @@ __GO_MARK_SIZE_UNIT__
 __GO_MARK_SIZE__
 __GO_MARK_FOREGROUND__
 __GO_MARK_BACKGROUND__
+__GO_MARK_OFFSET__
+__GO_MARK_STRIDE__
 
 __GO_TICKS_DIRECTION__
 __GO_X_NUMBER_TICKS__

diff --git a/scilab/modules/graphics/Makefile.am b/scilab/modules/graphics/Makefile.am
index aa134df..b240a16 100644 (file)
--- a/scilab/modules/graphics/Makefile.am
+++ b/scilab/modules/graphics/Makefile.am
@@ -74,6 +74,8 @@ src/c/getHandleProperty/get_figure_name_property.c \
 src/c/getHandleProperty/get_arrow_size_factor_property.c \
 src/c/getHandleProperty/get_mark_size_unit_property.c \
 src/c/getHandleProperty/get_mark_size_property.c \
+src/c/getHandleProperty/get_mark_offset_property.c \
+src/c/getHandleProperty/get_mark_stride_property.c \
 src/c/getHandleProperty/get_mark_background_property.c \
 src/c/getHandleProperty/get_auto_resize_property.c \
 src/c/getHandleProperty/get_fill_mode_property.c \
@@ -192,6 +194,8 @@ src/c/getHandleProperty/set_figure_id_property.c \
 src/c/getHandleProperty/set_pixmap_property.c \
 src/c/getHandleProperty/set_figure_style_property.c \
 src/c/getHandleProperty/set_mark_size_property.c \
+src/c/getHandleProperty/set_mark_offset_property.c \
+src/c/getHandleProperty/set_mark_stride_property.c \
 src/c/getHandleProperty/set_y_shift_property.c \
 src/c/getHandleProperty/set_auto_scale_property.c \
 src/c/getHandleProperty/set_auto_dimensionning_property.c \

diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 1ada6ac..bd8afc0 100644 (file)
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -221,6 +221,8 @@ am__objects_1 = src/c/libscigraphics_algo_la-GetCommandArg.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_arrow_size_factor_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_mark_size_unit_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_mark_size_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-get_mark_offset_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-get_mark_stride_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_mark_background_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_auto_resize_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_fill_mode_property.lo \
@@ -339,6 +341,8 @@ am__objects_1 = src/c/libscigraphics_algo_la-GetCommandArg.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_pixmap_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_figure_style_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_mark_size_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-set_mark_offset_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-set_mark_stride_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_y_shift_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_auto_scale_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_auto_dimensionning_property.lo \
@@ -993,6 +997,8 @@ src/c/getHandleProperty/get_figure_name_property.c \
 src/c/getHandleProperty/get_arrow_size_factor_property.c \
 src/c/getHandleProperty/get_mark_size_unit_property.c \
 src/c/getHandleProperty/get_mark_size_property.c \
+src/c/getHandleProperty/get_mark_offset_property.c \
+src/c/getHandleProperty/get_mark_stride_property.c \
 src/c/getHandleProperty/get_mark_background_property.c \
 src/c/getHandleProperty/get_auto_resize_property.c \
 src/c/getHandleProperty/get_fill_mode_property.c \
@@ -1111,6 +1117,8 @@ src/c/getHandleProperty/set_figure_id_property.c \
 src/c/getHandleProperty/set_pixmap_property.c \
 src/c/getHandleProperty/set_figure_style_property.c \
 src/c/getHandleProperty/set_mark_size_property.c \
+src/c/getHandleProperty/set_mark_offset_property.c \
+src/c/getHandleProperty/set_mark_stride_property.c \
 src/c/getHandleProperty/set_y_shift_property.c \
 src/c/getHandleProperty/set_auto_scale_property.c \
 src/c/getHandleProperty/set_auto_dimensionning_property.c \
@@ -1749,6 +1757,12 @@ src/c/getHandleProperty/libscigraphics_algo_la-get_mark_size_unit_property.lo:
 src/c/getHandleProperty/libscigraphics_algo_la-get_mark_size_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-get_mark_offset_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-get_mark_stride_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
 src/c/getHandleProperty/libscigraphics_algo_la-get_mark_background_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
@@ -2102,6 +2116,12 @@ src/c/getHandleProperty/libscigraphics_algo_la-set_figure_style_property.lo:  \
 src/c/getHandleProperty/libscigraphics_algo_la-set_mark_size_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-set_mark_offset_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-set_mark_stride_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
 src/c/getHandleProperty/libscigraphics_algo_la-set_y_shift_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
@@ -3014,8 +3034,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_background_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_foreground_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_mode_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_offset_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_size_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_size_unit_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_stride_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_style_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_material_shininess_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_menubar_property.Plo@am__quote@
@@ -3166,8 +3188,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_background_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_foreground_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_mode_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_offset_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_size_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_size_unit_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_stride_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_style_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_material_shininess_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_menubar_property.Plo@am__quote@
@@ -3592,6 +3616,20 @@ src/c/getHandleProperty/libscigraphics_algo_la-get_mark_size_property.lo: src/c/
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_mark_size_property.lo `test -f 'src/c/getHandleProperty/get_mark_size_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_mark_size_property.c
 
+src/c/getHandleProperty/libscigraphics_algo_la-get_mark_offset_property.lo: src/c/getHandleProperty/get_mark_offset_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-get_mark_offset_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_offset_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_mark_offset_property.lo `test -f 'src/c/getHandleProperty/get_mark_offset_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_mark_offset_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_offset_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_offset_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_mark_offset_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_mark_offset_property.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_mark_offset_property.lo `test -f 'src/c/getHandleProperty/get_mark_offset_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_mark_offset_property.c
+
+src/c/getHandleProperty/libscigraphics_algo_la-get_mark_stride_property.lo: src/c/getHandleProperty/get_mark_stride_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-get_mark_stride_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_stride_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_mark_stride_property.lo `test -f 'src/c/getHandleProperty/get_mark_stride_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_mark_stride_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_stride_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_stride_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_mark_stride_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_mark_stride_property.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_mark_stride_property.lo `test -f 'src/c/getHandleProperty/get_mark_stride_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_mark_stride_property.c
+
 src/c/getHandleProperty/libscigraphics_algo_la-get_mark_background_property.lo: src/c/getHandleProperty/get_mark_background_property.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-get_mark_background_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_background_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_mark_background_property.lo `test -f 'src/c/getHandleProperty/get_mark_background_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_mark_background_property.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_background_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_mark_background_property.Plo
@@ -4418,6 +4456,20 @@ src/c/getHandleProperty/libscigraphics_algo_la-set_mark_size_property.lo: src/c/
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_mark_size_property.lo `test -f 'src/c/getHandleProperty/set_mark_size_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_mark_size_property.c
 
+src/c/getHandleProperty/libscigraphics_algo_la-set_mark_offset_property.lo: src/c/getHandleProperty/set_mark_offset_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-set_mark_offset_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_offset_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_mark_offset_property.lo `test -f 'src/c/getHandleProperty/set_mark_offset_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_mark_offset_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_offset_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_offset_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_mark_offset_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_mark_offset_property.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_mark_offset_property.lo `test -f 'src/c/getHandleProperty/set_mark_offset_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_mark_offset_property.c
+
+src/c/getHandleProperty/libscigraphics_algo_la-set_mark_stride_property.lo: src/c/getHandleProperty/set_mark_stride_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-set_mark_stride_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_stride_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_mark_stride_property.lo `test -f 'src/c/getHandleProperty/set_mark_stride_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_mark_stride_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_stride_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_mark_stride_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_mark_stride_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_mark_stride_property.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_mark_stride_property.lo `test -f 'src/c/getHandleProperty/set_mark_stride_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_mark_stride_property.c
+
 src/c/getHandleProperty/libscigraphics_algo_la-set_y_shift_property.lo: src/c/getHandleProperty/set_y_shift_property.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-set_y_shift_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_y_shift_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_y_shift_property.lo `test -f 'src/c/getHandleProperty/set_y_shift_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_y_shift_property.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_y_shift_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_y_shift_property.Plo

diff --git a/scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml b/scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
index 4e15932..240b8bc 100644 (file)
--- a/scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
+++ b/scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
@@ -289,6 +289,26 @@
                 </listitem>
             </varlistentry>
             <varlistentry>
+                <term>mark_offset: </term>
+                <listitem>
+                    <para>
+                        This field contains the <literal>mark_offset</literal> property
+                        value which is the offset to use to draw the first mark. Its value should be an integer
+                        greater or equal to 0 (default value is 0).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>mark_stride: </term>
+                <listitem>
+                    <para>
+                        This field contains the <literal>mark_stride</literal> property
+                        value which is the stride to use to draw the marks (i.e. stride-1 points are skipped
+                        between two consecutive marks). Its value should be integer greater or equal to 1 (default value is 1).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>x_shift: </term>
                 <listitem>
                     <para>This field contains the offset computed by a call to the

diff --git a/scilab/modules/graphics/macros/%h_load.sci b/scilab/modules/graphics/macros/%h_load.sci
index 5f98c89..553f1d5 100644 (file)
--- a/scilab/modules/graphics/macros/%h_load.sci
+++ b/scilab/modules/graphics/macros/%h_load.sci
@@ -566,6 +566,11 @@ function [h,immediate_drawing] = load_graphichandle(fd)
             mark_background=mget(1,"il",fd) // mark_background
         end
 
+        if is_higher_than([5 5 0 1]) then
+            mark_offset=mget(1,"il",fd) // mark_offset
+            mark_stride=mget(1,"il",fd) // mark_stride
+        end
+
         if is_higher_than([3 1 0 0]) then
             sz_x_shift=mget(1,"sl",fd) // x_shift
             x_shift=mget(sz_x_shift,"dl",fd)'
@@ -608,6 +613,10 @@ function [h,immediate_drawing] = load_graphichandle(fd)
             set(h,"mark_foreground",mark_foreground),
             set(h,"mark_background",mark_background)
         end
+        if is_higher_than([5 5 0 1]) then
+            set(h,"mark_offset",mark_offset)
+            set(h,"mark_stride",mark_stride)
+        end
         if is_higher_than([3 1 0 0]) then
             set(h,"background",background)
             set(h,"fill_mode",fill_mode)

diff --git a/scilab/modules/graphics/macros/%h_p.sci b/scilab/modules/graphics/macros/%h_p.sci
index 4c5b997..45654de 100755 (executable)
--- a/scilab/modules/graphics/macros/%h_p.sci
+++ b/scilab/modules/graphics/macros/%h_p.sci
@@ -85,6 +85,8 @@ function %h_p(h)
             "mark_size = "+string(h.mark_size)
             "mark_foreground = "+string(h.mark_foreground)
             "mark_background = "+string(h.mark_background)
+            "mark_offset = "+string(h.mark_offset)
+            "mark_stride = "+string(h.mark_stride)
             "x_shift = "+bxs
             "y_shift = "+bys
             "z_shift = "+bzs

diff --git a/scilab/modules/graphics/macros/%h_save.sci b/scilab/modules/graphics/macros/%h_save.sci
index 20a6205..4cc2d26 100644 (file)
--- a/scilab/modules/graphics/macros/%h_save.sci
+++ b/scilab/modules/graphics/macros/%h_save.sci
@@ -284,6 +284,8 @@ function save_graphichandle(h,fd)
         mput(h.background,"il",fd) // background
         mput(h.mark_foreground,"il",fd) // mark_foreground
         mput(h.mark_background,"il",fd) // mark_background
+        mput(h.mark_offset,"il",fd) // mark_offset
+        mput(h.mark_stride,"il",fd) // mark_stride
 
         mput(size(h.x_shift,"*"),"sl",fd); mput(h.x_shift,"dl",fd); // x_shift
         mput(size(h.y_shift,"*"),"sl",fd); mput(h.y_shift,"dl",fd); // y_shift

diff --git a/scilab/modules/graphics/src/c/SetProperty.c b/scilab/modules/graphics/src/c/SetProperty.c
index a49d2d5..20d3096 100644 (file)
--- a/scilab/modules/graphics/src/c/SetProperty.c
+++ b/scilab/modules/graphics/src/c/SetProperty.c
@@ -135,6 +135,48 @@ int sciSetMarkSize(int iObjUID, int marksize)
     return -1;
 }
 
+int sciSetMarkOffset(int iObjUID, int offset)
+{
+    if (offset < 0)
+    {
+        Scierror(999, _("The mark offset must be greater or equal than %d.\n"), 0);
+        return -1;
+    }
+    else
+    {
+        BOOL status = setGraphicObjectProperty(iObjUID, __GO_MARK_OFFSET__, &offset, jni_int, 1);
+
+        if (status == TRUE)
+        {
+            return 0;
+        }
+    }
+
+    printSetGetErrorMessage("mark_offset");
+    return -1;
+}
+
+int sciSetMarkStride(int iObjUID, int stride)
+{
+    if (stride < 1)
+    {
+        Scierror(999, _("The mark stride must be greater or equal than %d.\n"), 1);
+        return -1;
+    }
+    else
+    {
+        BOOL status = setGraphicObjectProperty(iObjUID, __GO_MARK_STRIDE__, &stride, jni_int, 1);
+
+        if (status == TRUE)
+        {
+            return 0;
+        }
+    }
+
+    printSetGetErrorMessage("mark_stride");
+    return -1;
+}
+
 /**sciSetText
  * Sets the Text in TEXT, TITLE or LEGEND
  * @param char * pobjUID: the pointer to the entity

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c b/scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
index eaf28e9..2eae196 100755 (executable)
--- a/scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
+++ b/scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
@@ -89,6 +89,8 @@ static getHashTableCouple propertyGetTable[] =
     {"mark_size", get_mark_size_property},
     {"mark_foreground", get_mark_foreground_property},
     {"mark_background", get_mark_background_property},
+    {"mark_offset", get_mark_offset_property},
+    {"mark_stride", get_mark_stride_property},
     {"bar_layout", get_bar_layout_property},
     {"bar_width", get_bar_width_property},
     {"x_shift", get_x_shift_property},

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c b/scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
index 2118c95..22e5dff 100755 (executable)
--- a/scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
+++ b/scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
@@ -92,6 +92,8 @@ static setHashTableCouple propertySetTable[] =
     {"mark_size", set_mark_size_property},
     {"mark_foreground", set_mark_foreground_property},
     {"mark_background", set_mark_background_property},
+    {"mark_offset", set_mark_offset_property},
+    {"mark_stride", set_mark_stride_property},
     {"bar_layout", set_bar_layout_property},
     {"bar_width", set_bar_width_property},
     {"x_shift", set_x_shift_property},

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h b/scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
index 0bc041c..b6a4c42 100755 (executable)
--- a/scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
+++ b/scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
@@ -84,6 +84,8 @@ int get_mark_style_property(void* _pvCtx, int iObjUID);
 int get_mark_mode_property(void* _pvCtx, int iObjUID);
 int get_mark_size_unit_property(void* _pvCtx, int iObjUID);
 int get_mark_size_property(void* _pvCtx, int iObjUID);
+int get_mark_offset_property(void* _pvCtx, int iObjUID);
+int get_mark_stride_property(void* _pvCtx, int iObjUID);
 int get_mark_foreground_property(void* _pvCtx, int iObjUID);
 int get_mark_background_property(void* _pvCtx, int iObjUID);
 int get_bar_layout_property(void* _pvCtx, int iObjUID);

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_mark_offset_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_mark_offset_property.c
new file mode 100644 (file)
index 0000000..90f95a6
--- /dev/null
+++ b/scilab/modules/graphics/src/c/getHandleProperty/get_mark_offset_property.c
@@ -0,0 +1,44 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+ *
+ * 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.1-en.txt
+ *
+ */
+
+/*------------------------------------------------------------------------*/
+/* file: get_mark_offset_property.c                                       */
+/* desc : function to retrieve in Scilab the mark_offset field of a       */
+/*        handle                                                          */
+/*------------------------------------------------------------------------*/
+
+#include "getHandleProperty.h"
+#include "GetProperty.h"
+#include "returnProperty.h"
+#include "Scierror.h"
+#include "localization.h"
+
+#include "getGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int get_mark_offset_property(void* _pvCtx, int iObjUID)
+{
+    int iMarkOffset = 0;
+    int* piMarkOffset = &iMarkOffset;
+
+    getGraphicObjectProperty(iObjUID, __GO_MARK_OFFSET__, jni_int, (void**)&piMarkOffset);
+
+    if (piMarkOffset == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "mark_offset");
+        return -1;
+    }
+
+    return sciReturnDouble(_pvCtx, iMarkOffset);
+}
+/*------------------------------------------------------------------------*/

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_mark_stride_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_mark_stride_property.c
new file mode 100644 (file)
index 0000000..1f5edf1
--- /dev/null
+++ b/scilab/modules/graphics/src/c/getHandleProperty/get_mark_stride_property.c
@@ -0,0 +1,44 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+ *
+ * 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.1-en.txt
+ *
+ */
+
+/*------------------------------------------------------------------------*/
+/* file: get_mark_stride_property.c                                       */
+/* desc : function to retrieve in Scilab the mark_stride field of a       */
+/*        handle                                                          */
+/*------------------------------------------------------------------------*/
+
+#include "getHandleProperty.h"
+#include "GetProperty.h"
+#include "returnProperty.h"
+#include "Scierror.h"
+#include "localization.h"
+
+#include "getGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int get_mark_stride_property(void* _pvCtx, int iObjUID)
+{
+    int iMarkStride = 0;
+    int* piMarkStride = &iMarkStride;
+
+    getGraphicObjectProperty(iObjUID, __GO_MARK_STRIDE__, jni_int, (void**)&piMarkStride);
+
+    if (piMarkStride == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "mark_stride");
+        return -1;
+    }
+
+    return sciReturnDouble(_pvCtx, iMarkStride);
+}
+/*------------------------------------------------------------------------*/

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h b/scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
index e772f44..e9c1c77 100755 (executable)
--- a/scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
+++ b/scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
@@ -84,6 +84,8 @@ int set_mark_style_property(void* _pvCtx, int iObj, void* _pvData, int valueType
 int set_mark_mode_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_mark_size_unit_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_mark_size_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
+int set_mark_offset_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
+int set_mark_stride_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_mark_foreground_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_mark_background_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_bar_width_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_mark_offset_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_mark_offset_property.c
new file mode 100644 (file)
index 0000000..0fcb52a
--- /dev/null
+++ b/scilab/modules/graphics/src/c/getHandleProperty/set_mark_offset_property.c
@@ -0,0 +1,37 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+ *
+ * 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.1-en.txt
+ *
+ */
+
+/*------------------------------------------------------------------------*/
+/* file: set_mark_offset_property.c                                       */
+/* desc : function to modify in Scilab the mark_offset field of           */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "setHandleProperty.h"
+#include "SetProperty.h"
+#include "getPropertyAssignedValue.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "SetPropertyStatus.h"
+
+/*------------------------------------------------------------------------*/
+int set_mark_offset_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+{
+    if (valueType != sci_matrix)
+    {
+        Scierror(999, _("Wrong type for '%s' property: Real expected.\n"), "mark_offset");
+        return SET_PROPERTY_ERROR;
+    }
+
+    return sciSetMarkOffset(iObjUID, (int) ((double*)_pvData)[0]);
+}
+/*------------------------------------------------------------------------*/

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_mark_stride_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_mark_stride_property.c
new file mode 100644 (file)
index 0000000..ec3b979
--- /dev/null
+++ b/scilab/modules/graphics/src/c/getHandleProperty/set_mark_stride_property.c
@@ -0,0 +1,37 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+ *
+ * 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.1-en.txt
+ *
+ */
+
+/*------------------------------------------------------------------------*/
+/* file: set_mark_stride_property.c                                       */
+/* desc : function to modify in Scilab the mark_stride field of           */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "setHandleProperty.h"
+#include "SetProperty.h"
+#include "getPropertyAssignedValue.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "SetPropertyStatus.h"
+
+/*------------------------------------------------------------------------*/
+int set_mark_stride_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+{
+    if (valueType != sci_matrix)
+    {
+        Scierror(999, _("Wrong type for '%s' property: Real expected.\n"), "mark_stride");
+        return SET_PROPERTY_ERROR;
+    }
+
+    return sciSetMarkStride(iObjUID, (int) ((double*)_pvData)[0]);
+}
+/*------------------------------------------------------------------------*/

diff --git a/scilab/modules/io/macros/%_save.sci b/scilab/modules/io/macros/%_save.sci
index 5f6830a..d61776f 100644 (file)
--- a/scilab/modules/io/macros/%_save.sci
+++ b/scilab/modules/io/macros/%_save.sci
@@ -357,6 +357,8 @@ function [] = %_save(%__filename__, varargin)
         "background", ...
         "mark_foreground", ...
         "mark_background", ...
+        "mark_offset", ...
+        "mark_stride", ...
         "x_shift", ...
         "y_shift", ...
         "z_shift", ...

diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
index 3d560d8..bed64fb 100755 (executable)
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
@@ -563,7 +563,9 @@ public class DrawerVisitor implements Visitor, Drawer, GraphicView {
                     if (polyline.getMarkMode()) {
                         Texture sprite = markManager.getMarkSprite(polyline, colorMap, appearance);
                         ElementsBuffer positions = dataManager.getVertexBuffer(polyline.getIdentifier());
-                        drawingTools.draw(sprite, AnchorPosition.CENTER, positions);
+                        int offset = polyline.getMarkOffset();
+                        int stride = polyline.getMarkStride();
+                        drawingTools.draw(sprite, AnchorPosition.CENTER, positions, offset, stride, 0);
                     }
                 } catch (ObjectRemovedException e) {
                     invalidate(polyline, e);

diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/DrawingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/DrawingTools.java
index e2c51e2..0223ea7 100644 (file)
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/DrawingTools.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/DrawingTools.java
@@ -115,7 +115,7 @@ public interface DrawingTools {
      * @param rotationAngle the rotation angle.
      * @throws SciRendererException if the texture is not drawable.
      */
-    void draw(Texture texture, AnchorPosition anchor, ElementsBuffer positions, double rotationAngle) throws SciRendererException;
+    void draw(Texture texture, AnchorPosition anchor, ElementsBuffer positions, int offset, int stride, double rotationAngle) throws SciRendererException;
 
     /**
      * Draw the given texture at given position.

diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java
index 4d3f285..c859415 100644 (file)
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java
@@ -127,12 +127,12 @@ public class G2DDrawingTools implements DrawingTools {
 
     @Override
     public void draw(Texture texture, AnchorPosition anchor, ElementsBuffer positions) {
-        g2dCanvas.getMotor3D().draw(this, texture, anchor, positions, 0);
+        g2dCanvas.getMotor3D().draw(this, texture, anchor, positions, 0, 1, 0);
     }
 
     @Override
-    public void draw(Texture texture, AnchorPosition anchor, ElementsBuffer positions, double rotationAngle) {
-        g2dCanvas.getMotor3D().draw(this, texture, anchor, positions, rotationAngle);
+    public void draw(Texture texture, AnchorPosition anchor, ElementsBuffer positions, int offset, int stride, double rotationAngle) {
+        g2dCanvas.getMotor3D().draw(this, texture, anchor, positions, offset, stride, rotationAngle);
     }
 
     @Override

diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java
index 31f530d..46127f6 100644 (file)
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java
@@ -208,9 +208,11 @@ public class Motor3D {
         }
     }
 
-    public void draw(DrawingTools drawingTools, Texture texture, AnchorPosition anchor, ElementsBuffer positions, double rotationAngle) {
+    public void draw(DrawingTools drawingTools, Texture texture, AnchorPosition anchor, ElementsBuffer positions, int offset, int stride, double rotationAngle) {
         FloatBuffer positionsBuffer = positions.getData();
         float[] buffer;
+        offset = offset < 0 ? 0 : offset;
+        stride = stride < 1 ? 1 : stride;
 
         positionsBuffer.rewind();
         if (positionsBuffer.hasArray()) {
@@ -219,11 +221,11 @@ public class Motor3D {
             buffer = new float[positionsBuffer.limit()];
             positionsBuffer.get(buffer);
         }
-        Vector3d[] verticesArray = getMultiVectors(buffer, transf, false);
 
-        for (Vector3d v : verticesArray) {
+        Vector3d[] verticesArray = getMultiVectors(buffer, transf, false);
+        for (int i = offset; i < verticesArray.length; i += stride) {
             try {
-                SpritedRectangle o = new SpritedRectangle(v, texture, anchor, textureDrawingTools, rotationAngle);
+                SpritedRectangle o = new SpritedRectangle(verticesArray[i], texture, anchor, textureDrawingTools, rotationAngle);
                 add(o);
             } catch (InvalidPolygonException e) { }
         }

diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
index 26262bd..d7b34d3 100644 (file)
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
@@ -159,12 +159,12 @@ public class JoGLDrawingTools implements DrawingTools {
 
     @Override
     public void draw(Texture texture, AnchorPosition anchor, ElementsBuffer positions) throws SciRendererException {
-        canvas.getTextureManager().draw(this, texture, anchor, positions, 0);
+        canvas.getTextureManager().draw(this, texture, anchor, positions, 0, 1, 0);
     }
 
     @Override
-    public void draw(Texture texture, AnchorPosition anchor, ElementsBuffer positions, double rotationAngle) throws SciRendererException {
-        canvas.getTextureManager().draw(this, texture, anchor, positions, rotationAngle);
+    public void draw(Texture texture, AnchorPosition anchor, ElementsBuffer positions, int offset, int stride, double rotationAngle) throws SciRendererException {
+        canvas.getTextureManager().draw(this, texture, anchor, positions, offset, stride, rotationAngle);
     }
 
     @Override

diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
index 2f66dc2..0784992 100644 (file)
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
@@ -81,18 +81,37 @@ public class JoGLTextureManager implements TextureManager {
         }
     }
 
-    public void draw(JoGLDrawingTools drawingTools, Texture texture, AnchorPosition anchor, ElementsBuffer positions, double rotationAngle) throws SciRendererException {
+    public void draw(JoGLDrawingTools drawingTools, Texture texture, AnchorPosition anchor, ElementsBuffer positions, int offset, int stride, double rotationAngle) throws SciRendererException {
         if ((texture instanceof JoGLTexture) && (allTextures.contains((JoGLTexture) texture))) {
             if (positions != null) {
                 FloatBuffer data = positions.getData();
                 if (data != null) {
-                    data.rewind();
                     float[] position = {0, 0, 0, 1};
                     final JoGLTexture jt = (JoGLTexture) texture;
                     if (jt.preDraw(drawingTools)) {
-                        while (data.remaining() >= 4) {
-                            data.get(position);
-                            jt.draw(drawingTools, anchor, new Vector3d(position), rotationAngle);
+                        stride = stride < 1 ? 1 : stride;
+                        offset = offset < 0 ? 0 : offset;
+                        if (stride == 1) {
+                            data.position(4 * offset);
+                            while (data.remaining() >= 4) {
+                                data.get(position);
+                                jt.draw(drawingTools, anchor, new Vector3d(position), rotationAngle);
+                            }
+                        } else {
+                            int mark = 4 * offset;
+                            if (mark < data.capacity()) {
+                                data.position(mark);
+                                while (data.remaining() >= 4) {
+                                    data.get(position);
+                                    mark += stride * 4;
+                                    if (mark < data.capacity()) {
+                                        data.position(mark);
+                                    } else {
+                                        break;
+                                    }
+                                    jt.draw(drawingTools, anchor, new Vector3d(position), rotationAngle);
+                                }
+                            }
                         }
                         jt.postDraw(drawingTools);
                     }