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
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.
#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__ */
*/
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;
/** 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() {
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);
}
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);
}
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);
}
}
/**
+ * @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() {
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;
}
__GO_MARK_SIZE__
__GO_MARK_FOREGROUND__
__GO_MARK_BACKGROUND__
+__GO_MARK_OFFSET__
+__GO_MARK_STRIDE__
__GO_TICKS_DIRECTION__
__GO_X_NUMBER_TICKS__
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 \
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 \
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 \
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 \
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 \
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 \
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)
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)
@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@
@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@
@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
@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
</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
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)'
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)
"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
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
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
{"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},
{"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},
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);
--- /dev/null
+/*
+ * 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);
+}
+/*------------------------------------------------------------------------*/
--- /dev/null
+/*
+ * 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);
+}
+/*------------------------------------------------------------------------*/
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);
--- /dev/null
+/*
+ * 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]);
+}
+/*------------------------------------------------------------------------*/
--- /dev/null
+/*
+ * 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]);
+}
+/*------------------------------------------------------------------------*/
"background", ...
"mark_foreground", ...
"mark_background", ...
+ "mark_offset", ...
+ "mark_stride", ...
"x_shift", ...
"y_shift", ...
"z_shift", ...
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);
* @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.
@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
}
}
- 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()) {
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) { }
}
@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
}
}
- 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);
}