Definitly fix bug 11067: add ticks_format and ticks_st properties to improve ticks... 56/13856/2
Calixte DENIZET [Thu, 27 Feb 2014 14:15:51 +0000 (15:15 +0100)]
Change-Id: If2f3f33838dbb62987d3f32dcc4df397e4aa5e8a

31 files changed:
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/axes/Axes.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/axes/AxisProperty.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/axes/TicksProperty.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_ticks_format_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/get_ticks_st_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_ticks_format_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/set_ticks_st_property.c [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/ticks_format.dia.ref [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/ticks_format.tst [new file with mode: 0644]
scilab/modules/io/macros/%_save.sci
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/ruler/AxesRulerDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/ruler/RulerDrawerManager.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/ruler/DefaultRulerModel.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/ruler/RulerDrawer.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/ruler/RulerModel.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/ruler/graduations/AbstractGraduations.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/ruler/graduations/UserDefinedFormat.java [new file with mode: 0644]

index 438f2cc..a3a79c5 100755 (executable)
 #define __GO_X_AXIS_LOCATION__ 116
 #define __GO_X_AXIS_LOG_FLAG__ 117
 #define __GO_X_AXIS_TICKS__ 118
-#define __GO_X_AXIS_AUTO_TICKS__ 119
-#define __GO_X_AXIS_NUMBER_TICKS__ 120
-#define __GO_X_AXIS_TICKS_LOCATIONS__ 121
-#define __GO_X_AXIS_TICKS_LABELS__ 122
-#define __GO_X_AXIS_SUBTICKS__ 123
-#define __GO_Y_AXIS_VISIBLE__ 124
-#define __GO_Y_AXIS_REVERSE__ 125
-#define __GO_Y_AXIS_GRID_COLOR__ 126
-#define __GO_Y_AXIS_GRID_THICKNESS__ 127
-#define __GO_Y_AXIS_GRID_STYLE__ 128
-#define __GO_Y_AXIS_LABEL__ 129
-#define __GO_Y_AXIS_LOCATION__ 130
-#define __GO_Y_AXIS_LOG_FLAG__ 131
-#define __GO_Y_AXIS_TICKS__ 132
-#define __GO_Y_AXIS_AUTO_TICKS__ 133
-#define __GO_Y_AXIS_NUMBER_TICKS__ 134
-#define __GO_Y_AXIS_TICKS_LOCATIONS__ 135
-#define __GO_Y_AXIS_TICKS_LABELS__ 136
-#define __GO_Y_AXIS_SUBTICKS__ 137
-#define __GO_Z_AXIS_VISIBLE__ 138
-#define __GO_Z_AXIS_REVERSE__ 139
-#define __GO_Z_AXIS_GRID_COLOR__ 140
-#define __GO_Z_AXIS_GRID_THICKNESS__ 141
-#define __GO_Z_AXIS_GRID_STYLE__ 142
-#define __GO_Z_AXIS_LABEL__ 143
-#define __GO_Z_AXIS_LOCATION__ 144
-#define __GO_Z_AXIS_LOG_FLAG__ 145
-#define __GO_Z_AXIS_TICKS__ 146
-#define __GO_Z_AXIS_AUTO_TICKS__ 147
-#define __GO_Z_AXIS_NUMBER_TICKS__ 148
-#define __GO_Z_AXIS_TICKS_LOCATIONS__ 149
-#define __GO_Z_AXIS_TICKS_LABELS__ 150
-#define __GO_Z_AXIS_SUBTICKS__ 151
-#define __GO_AUTO_SUBTICKS__ 152
-#define __GO_GRID_POSITION__ 153
-#define __GO_TITLE__ 154
-#define __GO_AUTO_CLEAR__ 155
-#define __GO_FILLED__ 156
-#define __GO_CAMERA__ 157
-#define __GO_VIEW__ 158
-#define __GO_ISOVIEW__ 159
-#define __GO_CUBE_SCALING__ 160
-#define __GO_ROTATION_ANGLES__ 161
-#define __GO_ROTATION_ANGLES_3D__ 162
-#define __GO_BOX_TYPE__ 163
-#define __GO_HIDDEN_AXIS_COLOR__ 164
-#define __GO_TIGHT_LIMITS__ 165
-#define __GO_DATA_BOUNDS__ 166
-#define __GO_REAL_DATA_BOUNDS__ 167
-#define __GO_ZOOM_ENABLED__ 168
-#define __GO_ZOOM_BOX__ 169
-#define __GO_AUTO_SCALE__ 170
-#define __GO_FIRST_PLOT__ 171
-#define __GO_MARGINS__ 172
-#define __GO_AUTO_MARGINS__ 173
-#define __GO_AXES_BOUNDS__ 174
-#define __GO_CLIP_PROPERTY__ 175
-#define __GO_CLIP_STATE__ 176
-#define __GO_CLIP_BOX__ 177
-#define __GO_CLIP_BOX_SET__ 178
-#define __GO_LINE__ 179
-#define __GO_LINE_MODE__ 180
-#define __GO_LINE_STYLE__ 181
-#define __GO_LINE_THICKNESS__ 182
-#define __GO_LINE_COLOR__ 183
-#define __GO_FILL_MODE__ 184
-#define __GO_MARK__ 185
-#define __GO_MARK_MODE__ 186
-#define __GO_MARK_STYLE__ 187
-#define __GO_MARK_SIZE_UNIT__ 188
-#define __GO_MARK_SIZE__ 189
-#define __GO_MARK_FOREGROUND__ 190
-#define __GO_MARK_BACKGROUND__ 191
-#define __GO_MARK_OFFSET__ 192
-#define __GO_MARK_STRIDE__ 193
-#define __GO_TICKS_DIRECTION__ 194
-#define __GO_X_NUMBER_TICKS__ 195
-#define __GO_Y_NUMBER_TICKS__ 196
-#define __GO_X_TICKS_COORDS__ 197
-#define __GO_Y_TICKS_COORDS__ 198
-#define __GO_TICKS_COLOR__ 199
-#define __GO_TICKS_SEGMENT__ 200
-#define __GO_TICKS_STYLE__ 201
-#define __GO_SUBTICKS__ 202
-#define __GO_NUMBER_TICKS_LABELS__ 203
-#define __GO_TICKS_LABELS__ 204
-#define __GO_FORMATN__ 205
-#define __GO_FONT__ 206
-#define __GO_FONT_STYLE__ 207
-#define __GO_FONT_SIZE__ 208
-#define __GO_FONT_COLOR__ 209
-#define __GO_FONT_FRACTIONAL__ 210
-#define __GO_Z_BOUNDS__ 211
-#define __GO_OUTSIDE_COLOR__ 212
-#define __GO_COLOR_RANGE__ 213
-#define __GO_DATA_MAPPING__ 214
-#define __GO_FONT_ANGLE__ 215
-#define __GO_AUTO_POSITION__ 216
-#define __GO_CORNERS__ 217
-#define __GO_AUTO_ROTATION__ 218
-#define __GO_LINKS__ 219
-#define __GO_LINKS_COUNT__ 220
-#define __GO_LEGEND_LOCATION__ 221
-#define __GO_MARKS_COUNT__ 222
-#define __GO_LINE_WIDTH__ 223
-#define __GO_CLOSED__ 224
-#define __GO_ARROW_SIZE_FACTOR__ 225
-#define __GO_POLYLINE_STYLE__ 226
-#define __GO_INTERP_COLOR_VECTOR__ 227
-#define __GO_INTERP_COLOR_VECTOR_SET__ 228
-#define __GO_INTERP_COLOR_MODE__ 229
-#define __GO_X_SHIFT__ 230
-#define __GO_Y_SHIFT__ 231
-#define __GO_Z_SHIFT__ 232
-#define __GO_BAR_WIDTH__ 233
-#define __GO_SURFACE_MODE__ 234
-#define __GO_COLOR_MODE__ 235
-#define __GO_COLOR_FLAG__ 236
-#define __GO_ALIGNMENT__ 237
-#define __GO_BOX__ 238
-#define __GO_TEXT_BOX__ 239
-#define __GO_TEXT_BOX_MODE__ 240
-#define __GO_AUTO_DIMENSIONING__ 241
-#define __GO_FORMATTED_TEXT__ 242
-#define __GO_TEXT_ARRAY_DIMENSIONS__ 243
-#define __GO_TEXT_STRINGS__ 244
-#define __GO_BASE__ 245
-#define __GO_BASE_X__ 246
-#define __GO_BASE_Y__ 247
-#define __GO_BASE_Z__ 248
-#define __GO_DIRECTION__ 249
-#define __GO_DIRECTION_X__ 250
-#define __GO_DIRECTION_Y__ 251
-#define __GO_DIRECTION_Z__ 252
-#define __GO_ARROW_SIZE__ 253
-#define __GO_SEGS_COLORS__ 254
-#define __GO_COLORED__ 255
-#define __GO_ARROWS__ 256
-#define __GO_NUMBER_ARROWS__ 257
-#define __GO_CHAMP_DIMENSIONS__ 258
-#define __GO_BOUNDING_BOX__ 259
-#define __GO_MAX_LENGTH__ 260
-#define __GO_MAX_USABLE_LENGTH__ 261
-#define __GO_HIDDEN_COLOR__ 262
-#define __GO_STYLE__ 263
-#define __GO_UI_CHECKBOX__ 264
-#define __GO_UI_EDIT__ 265
-#define __GO_UI_FRAME__ 266
-#define __GO_UI_FRAME_SCROLLABLE__ 267
-#define __GO_UI_IMAGE__ 268
-#define __GO_UI_LISTBOX__ 269
-#define __GO_UI_POPUPMENU__ 270
-#define __GO_UI_PUSHBUTTON__ 271
-#define __GO_UI_RADIOBUTTON__ 272
-#define __GO_UI_SLIDER__ 273
-#define __GO_UI_TABLE__ 274
-#define __GO_UI_TEXT__ 275
-#define __GO_UI_LAYER__ 276
-#define __GO_UI_BACKGROUNDCOLOR__ 277
-#define __GO_UI_ENABLE__ 278
-#define __GO_UI_FONTANGLE__ 279
-#define __GO_UI_FONTNAME__ 280
-#define __GO_UI_FONTSIZE__ 281
-#define __GO_UI_FONTUNITS__ 282
-#define __GO_UI_FONTWEIGHT__ 283
-#define __GO_UI_FOREGROUNDCOLOR__ 284
-#define __GO_UI_HORIZONTALALIGNMENT__ 285
-#define __GO_UI_LISTBOXTOP__ 286
-#define __GO_UI_LISTBOXTOP_SIZE__ 287
-#define __GO_UI_MAX__ 288
-#define __GO_UI_MIN__ 289
-#define __GO_UI_RELIEF__ 290
-#define __GO_UI_STRING__ 291
-#define __GO_UI_TAB_STRING__ 292
-#define __GO_UI_STRING_SIZE__ 293
-#define __GO_UI_STRING_COLNB__ 294
-#define __GO_UI_TOOLTIPSTRING__ 295
-#define __GO_UI_TOOLTIPSTRING_SIZE__ 296
-#define __GO_UI_SLIDERSTEP__ 297
-#define __GO_UI_UNITS__ 298
-#define __GO_UI_VALUE__ 299
-#define __GO_UI_TAB_VALUE__ 300
-#define __GO_UI_VALUE_SIZE__ 301
-#define __GO_UI_VERTICALALIGNMENT__ 302
-#define __GO_UIPARENTMENU__ 303
-#define __GO_UICHILDMENU__ 304
-#define __GO_UICHECKEDMENU__ 305
-#define __GO_UI_CHECKED__ 306
-#define __GO_UI_LABEL__ 307
-#define __GO_UI_MNEMONIC__ 308
-#define __GO_UI_ACCELERATOR__ 309
-#define __GO_UI_SEPARATOR__ 310
-#define __GO_UI_ICON__ 311
-#define __GO_CONSOLE__ 312
-#define __GO_SHOWHIDDENHANDLES__ 313
-#define __GO_USEDEPRECATEDLF__ 314
-#define __GO_WAITBAR__ 315
-#define __GO_PROGRESSIONBAR__ 316
-#define __GO_UI_MESSAGE__ 317
-#define __GO_UI_MESSAGE_SIZE__ 318
-#define __GO_DATATIP__ 319
-#define __GO_DATATIP_DATA__ 320
-#define __GO_DATATIP_ORIENTATION__ 321
-#define __GO_DATATIP_3COMPONENT__ 322
-#define __GO_DATATIP_AUTOORIENTATION__ 323
-#define __GO_DATATIP_INTERP_MODE__ 324
-#define __GO_DATATIP_DISPLAY_FNC__ 325
-#define __GO_DATATIP_BOX_MODE__ 326
-#define __GO_DATATIP_LABEL_MODE__ 327
-#define __GO_DATATIP_MARK__ 328
-#define __GO_AMBIENTCOLOR__ 329
-#define __GO_DIFFUSECOLOR__ 330
-#define __GO_SPECULARCOLOR__ 331
-#define __GO_COLOR_MATERIAL__ 332
-#define __GO_MATERIAL_SHININESS__ 333
-#define __GO_LIGHT__ 334
-#define __GO_LIGHT_TYPE__ 335
-#define __GO_DATATIPS__ 336
-#define __GO_DATATIPS_COUNT__ 337
-#define __GO_DATATIP_INDEXES__ 338
-#define __GO_DATA_MODEL_DISPLAY_FUNCTION__ 339
-#define __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ 340
-#define __GO_RESIZE__ 341
-#define __GO_TOOLBAR__ 342
-#define __GO_TOOLBAR_VISIBLE__ 343
-#define __GO_MENUBAR__ 344
-#define __GO_MENUBAR_VISIBLE__ 345
-#define __GO_INFOBAR_VISIBLE__ 346
-#define __GO_DOCKABLE__ 347
-#define __GO_LAYOUT__ 348
-#define __GO_LAYOUT_SET__ 349
-#define __GO_UI_TAB__ 350
-#define __GO_UI_GRIDBAG_GRID__ 351
-#define __GO_UI_GRIDBAG_WEIGHT__ 352
-#define __GO_UI_GRIDBAG_FILL__ 353
-#define __GO_UI_GRIDBAG_ANCHOR__ 354
-#define __GO_UI_GRIDBAG_PADDING__ 355
-#define __GO_UI_GRIDBAG_PREFERREDSIZE__ 356
-#define __GO_UI_GRID_GRID__ 357
-#define __GO_UI_GRID_PADDING__ 358
-#define __GO_UI_BORDER_POSITION__ 359
-#define __GO_UI_BORDER_PREFERREDSIZE__ 360
-#define __GO_GRID_OPT_GRID__ 361
-#define __GO_GRID_OPT_PADDING__ 362
-#define __GO_BORDER_OPT_PADDING__ 363
-#define __GO_UI_FRAME_BORDER__ 364
-#define __GO_UI_FRAME_BORDER_COLOR__ 365
-#define __GO_UI_FRAME_BORDER_HIGHLIGHT_IN__ 366
-#define __GO_UI_FRAME_BORDER_HIGHLIGHT_OUT__ 367
-#define __GO_UI_FRAME_BORDER_IN_BORDER__ 368
-#define __GO_UI_FRAME_BORDER_JUSTIFICATION__ 369
-#define __GO_UI_FRAME_BORDER_OUT_BORDER__ 370
-#define __GO_UI_FRAME_BORDER_ROUNDED__ 371
-#define __GO_UI_FRAME_BORDER_SHADOW_IN__ 372
-#define __GO_UI_FRAME_BORDER_SHADOW_OUT__ 373
-#define __GO_UI_FRAME_BORDER_TITLE__ 374
-#define __GO_UI_FRAME_BORDER_POSITION__ 375
-#define __GO_UI_FRAME_BORDER_STYLE__ 376
-#define __GO_UI_GROUP_NAME__ 377
-#define __GO_UI_TITLE_POSITION__ 378
-#define __GO_UI_TITLE_SCROLL__ 379
-#define __GO_UI_FRAME_BORDER_TYPE__ 380
-#define __GO_UI_SCROLLABLE__ 381
+#define __GO_X_AXIS_FORMAT__ 119
+#define __GO_X_AXIS_ST_FACTORS__ 120
+#define __GO_X_AXIS_AUTO_TICKS__ 121
+#define __GO_X_AXIS_NUMBER_TICKS__ 122
+#define __GO_X_AXIS_TICKS_LOCATIONS__ 123
+#define __GO_X_AXIS_TICKS_LABELS__ 124
+#define __GO_X_AXIS_SUBTICKS__ 125
+#define __GO_Y_AXIS_VISIBLE__ 126
+#define __GO_Y_AXIS_REVERSE__ 127
+#define __GO_Y_AXIS_GRID_COLOR__ 128
+#define __GO_Y_AXIS_GRID_THICKNESS__ 129
+#define __GO_Y_AXIS_GRID_STYLE__ 130
+#define __GO_Y_AXIS_LABEL__ 131
+#define __GO_Y_AXIS_LOCATION__ 132
+#define __GO_Y_AXIS_LOG_FLAG__ 133
+#define __GO_Y_AXIS_TICKS__ 134
+#define __GO_Y_AXIS_FORMAT__ 135
+#define __GO_Y_AXIS_ST_FACTORS__ 136
+#define __GO_Y_AXIS_AUTO_TICKS__ 137
+#define __GO_Y_AXIS_NUMBER_TICKS__ 138
+#define __GO_Y_AXIS_TICKS_LOCATIONS__ 139
+#define __GO_Y_AXIS_TICKS_LABELS__ 140
+#define __GO_Y_AXIS_SUBTICKS__ 141
+#define __GO_Z_AXIS_VISIBLE__ 142
+#define __GO_Z_AXIS_REVERSE__ 143
+#define __GO_Z_AXIS_GRID_COLOR__ 144
+#define __GO_Z_AXIS_GRID_THICKNESS__ 145
+#define __GO_Z_AXIS_GRID_STYLE__ 146
+#define __GO_Z_AXIS_LABEL__ 147
+#define __GO_Z_AXIS_LOCATION__ 148
+#define __GO_Z_AXIS_LOG_FLAG__ 149
+#define __GO_Z_AXIS_TICKS__ 150
+#define __GO_Z_AXIS_FORMAT__ 151
+#define __GO_Z_AXIS_ST_FACTORS__ 152
+#define __GO_Z_AXIS_AUTO_TICKS__ 153
+#define __GO_Z_AXIS_NUMBER_TICKS__ 154
+#define __GO_Z_AXIS_TICKS_LOCATIONS__ 155
+#define __GO_Z_AXIS_TICKS_LABELS__ 156
+#define __GO_Z_AXIS_SUBTICKS__ 157
+#define __GO_AUTO_SUBTICKS__ 158
+#define __GO_GRID_POSITION__ 159
+#define __GO_TITLE__ 160
+#define __GO_AUTO_CLEAR__ 161
+#define __GO_FILLED__ 162
+#define __GO_CAMERA__ 163
+#define __GO_VIEW__ 164
+#define __GO_ISOVIEW__ 165
+#define __GO_CUBE_SCALING__ 166
+#define __GO_ROTATION_ANGLES__ 167
+#define __GO_ROTATION_ANGLES_3D__ 168
+#define __GO_BOX_TYPE__ 169
+#define __GO_HIDDEN_AXIS_COLOR__ 170
+#define __GO_TIGHT_LIMITS__ 171
+#define __GO_DATA_BOUNDS__ 172
+#define __GO_REAL_DATA_BOUNDS__ 173
+#define __GO_ZOOM_ENABLED__ 174
+#define __GO_ZOOM_BOX__ 175
+#define __GO_AUTO_SCALE__ 176
+#define __GO_FIRST_PLOT__ 177
+#define __GO_MARGINS__ 178
+#define __GO_AUTO_MARGINS__ 179
+#define __GO_AXES_BOUNDS__ 180
+#define __GO_CLIP_PROPERTY__ 181
+#define __GO_CLIP_STATE__ 182
+#define __GO_CLIP_BOX__ 183
+#define __GO_CLIP_BOX_SET__ 184
+#define __GO_LINE__ 185
+#define __GO_LINE_MODE__ 186
+#define __GO_LINE_STYLE__ 187
+#define __GO_LINE_THICKNESS__ 188
+#define __GO_LINE_COLOR__ 189
+#define __GO_FILL_MODE__ 190
+#define __GO_MARK__ 191
+#define __GO_MARK_MODE__ 192
+#define __GO_MARK_STYLE__ 193
+#define __GO_MARK_SIZE_UNIT__ 194
+#define __GO_MARK_SIZE__ 195
+#define __GO_MARK_FOREGROUND__ 196
+#define __GO_MARK_BACKGROUND__ 197
+#define __GO_MARK_OFFSET__ 198
+#define __GO_MARK_STRIDE__ 199
+#define __GO_TICKS_DIRECTION__ 200
+#define __GO_X_NUMBER_TICKS__ 201
+#define __GO_Y_NUMBER_TICKS__ 202
+#define __GO_X_TICKS_COORDS__ 203
+#define __GO_Y_TICKS_COORDS__ 204
+#define __GO_TICKS_COLOR__ 205
+#define __GO_TICKS_SEGMENT__ 206
+#define __GO_TICKS_STYLE__ 207
+#define __GO_SUBTICKS__ 208
+#define __GO_NUMBER_TICKS_LABELS__ 209
+#define __GO_TICKS_LABELS__ 210
+#define __GO_FORMATN__ 211
+#define __GO_FONT__ 212
+#define __GO_FONT_STYLE__ 213
+#define __GO_FONT_SIZE__ 214
+#define __GO_FONT_COLOR__ 215
+#define __GO_FONT_FRACTIONAL__ 216
+#define __GO_Z_BOUNDS__ 217
+#define __GO_OUTSIDE_COLOR__ 218
+#define __GO_COLOR_RANGE__ 219
+#define __GO_DATA_MAPPING__ 220
+#define __GO_FONT_ANGLE__ 221
+#define __GO_AUTO_POSITION__ 222
+#define __GO_CORNERS__ 223
+#define __GO_AUTO_ROTATION__ 224
+#define __GO_LINKS__ 225
+#define __GO_LINKS_COUNT__ 226
+#define __GO_LEGEND_LOCATION__ 227
+#define __GO_MARKS_COUNT__ 228
+#define __GO_LINE_WIDTH__ 229
+#define __GO_CLOSED__ 230
+#define __GO_ARROW_SIZE_FACTOR__ 231
+#define __GO_POLYLINE_STYLE__ 232
+#define __GO_INTERP_COLOR_VECTOR__ 233
+#define __GO_INTERP_COLOR_VECTOR_SET__ 234
+#define __GO_INTERP_COLOR_MODE__ 235
+#define __GO_X_SHIFT__ 236
+#define __GO_Y_SHIFT__ 237
+#define __GO_Z_SHIFT__ 238
+#define __GO_BAR_WIDTH__ 239
+#define __GO_SURFACE_MODE__ 240
+#define __GO_COLOR_MODE__ 241
+#define __GO_COLOR_FLAG__ 242
+#define __GO_ALIGNMENT__ 243
+#define __GO_BOX__ 244
+#define __GO_TEXT_BOX__ 245
+#define __GO_TEXT_BOX_MODE__ 246
+#define __GO_AUTO_DIMENSIONING__ 247
+#define __GO_FORMATTED_TEXT__ 248
+#define __GO_TEXT_ARRAY_DIMENSIONS__ 249
+#define __GO_TEXT_STRINGS__ 250
+#define __GO_BASE__ 251
+#define __GO_BASE_X__ 252
+#define __GO_BASE_Y__ 253
+#define __GO_BASE_Z__ 254
+#define __GO_DIRECTION__ 255
+#define __GO_DIRECTION_X__ 256
+#define __GO_DIRECTION_Y__ 257
+#define __GO_DIRECTION_Z__ 258
+#define __GO_ARROW_SIZE__ 259
+#define __GO_SEGS_COLORS__ 260
+#define __GO_COLORED__ 261
+#define __GO_ARROWS__ 262
+#define __GO_NUMBER_ARROWS__ 263
+#define __GO_CHAMP_DIMENSIONS__ 264
+#define __GO_BOUNDING_BOX__ 265
+#define __GO_MAX_LENGTH__ 266
+#define __GO_MAX_USABLE_LENGTH__ 267
+#define __GO_HIDDEN_COLOR__ 268
+#define __GO_STYLE__ 269
+#define __GO_UI_CHECKBOX__ 270
+#define __GO_UI_EDIT__ 271
+#define __GO_UI_FRAME__ 272
+#define __GO_UI_FRAME_SCROLLABLE__ 273
+#define __GO_UI_IMAGE__ 274
+#define __GO_UI_LISTBOX__ 275
+#define __GO_UI_POPUPMENU__ 276
+#define __GO_UI_PUSHBUTTON__ 277
+#define __GO_UI_RADIOBUTTON__ 278
+#define __GO_UI_SLIDER__ 279
+#define __GO_UI_TABLE__ 280
+#define __GO_UI_TEXT__ 281
+#define __GO_UI_LAYER__ 282
+#define __GO_UI_BACKGROUNDCOLOR__ 283
+#define __GO_UI_ENABLE__ 284
+#define __GO_UI_FONTANGLE__ 285
+#define __GO_UI_FONTNAME__ 286
+#define __GO_UI_FONTSIZE__ 287
+#define __GO_UI_FONTUNITS__ 288
+#define __GO_UI_FONTWEIGHT__ 289
+#define __GO_UI_FOREGROUNDCOLOR__ 290
+#define __GO_UI_HORIZONTALALIGNMENT__ 291
+#define __GO_UI_LISTBOXTOP__ 292
+#define __GO_UI_LISTBOXTOP_SIZE__ 293
+#define __GO_UI_MAX__ 294
+#define __GO_UI_MIN__ 295
+#define __GO_UI_RELIEF__ 296
+#define __GO_UI_STRING__ 297
+#define __GO_UI_TAB_STRING__ 298
+#define __GO_UI_STRING_SIZE__ 299
+#define __GO_UI_STRING_COLNB__ 300
+#define __GO_UI_TOOLTIPSTRING__ 301
+#define __GO_UI_TOOLTIPSTRING_SIZE__ 302
+#define __GO_UI_SLIDERSTEP__ 303
+#define __GO_UI_UNITS__ 304
+#define __GO_UI_VALUE__ 305
+#define __GO_UI_TAB_VALUE__ 306
+#define __GO_UI_VALUE_SIZE__ 307
+#define __GO_UI_VERTICALALIGNMENT__ 308
+#define __GO_UIPARENTMENU__ 309
+#define __GO_UICHILDMENU__ 310
+#define __GO_UICHECKEDMENU__ 311
+#define __GO_UI_CHECKED__ 312
+#define __GO_UI_LABEL__ 313
+#define __GO_UI_MNEMONIC__ 314
+#define __GO_UI_ACCELERATOR__ 315
+#define __GO_UI_SEPARATOR__ 316
+#define __GO_UI_ICON__ 317
+#define __GO_CONSOLE__ 318
+#define __GO_SHOWHIDDENHANDLES__ 319
+#define __GO_USEDEPRECATEDLF__ 320
+#define __GO_WAITBAR__ 321
+#define __GO_PROGRESSIONBAR__ 322
+#define __GO_UI_MESSAGE__ 323
+#define __GO_UI_MESSAGE_SIZE__ 324
+#define __GO_DATATIP__ 325
+#define __GO_DATATIP_DATA__ 326
+#define __GO_DATATIP_ORIENTATION__ 327
+#define __GO_DATATIP_3COMPONENT__ 328
+#define __GO_DATATIP_AUTOORIENTATION__ 329
+#define __GO_DATATIP_INTERP_MODE__ 330
+#define __GO_DATATIP_DISPLAY_FNC__ 331
+#define __GO_DATATIP_BOX_MODE__ 332
+#define __GO_DATATIP_LABEL_MODE__ 333
+#define __GO_DATATIP_MARK__ 334
+#define __GO_AMBIENTCOLOR__ 335
+#define __GO_DIFFUSECOLOR__ 336
+#define __GO_SPECULARCOLOR__ 337
+#define __GO_COLOR_MATERIAL__ 338
+#define __GO_MATERIAL_SHININESS__ 339
+#define __GO_LIGHT__ 340
+#define __GO_LIGHT_TYPE__ 341
+#define __GO_DATATIPS__ 342
+#define __GO_DATATIPS_COUNT__ 343
+#define __GO_DATATIP_INDEXES__ 344
+#define __GO_DATA_MODEL_DISPLAY_FUNCTION__ 345
+#define __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ 346
+#define __GO_RESIZE__ 347
+#define __GO_TOOLBAR__ 348
+#define __GO_TOOLBAR_VISIBLE__ 349
+#define __GO_MENUBAR__ 350
+#define __GO_MENUBAR_VISIBLE__ 351
+#define __GO_INFOBAR_VISIBLE__ 352
+#define __GO_DOCKABLE__ 353
+#define __GO_LAYOUT__ 354
+#define __GO_LAYOUT_SET__ 355
+#define __GO_UI_TAB__ 356
+#define __GO_UI_GRIDBAG_GRID__ 357
+#define __GO_UI_GRIDBAG_WEIGHT__ 358
+#define __GO_UI_GRIDBAG_FILL__ 359
+#define __GO_UI_GRIDBAG_ANCHOR__ 360
+#define __GO_UI_GRIDBAG_PADDING__ 361
+#define __GO_UI_GRIDBAG_PREFERREDSIZE__ 362
+#define __GO_UI_GRID_GRID__ 363
+#define __GO_UI_GRID_PADDING__ 364
+#define __GO_UI_BORDER_POSITION__ 365
+#define __GO_UI_BORDER_PREFERREDSIZE__ 366
+#define __GO_GRID_OPT_GRID__ 367
+#define __GO_GRID_OPT_PADDING__ 368
+#define __GO_BORDER_OPT_PADDING__ 369
+#define __GO_UI_FRAME_BORDER__ 370
+#define __GO_UI_FRAME_BORDER_COLOR__ 371
+#define __GO_UI_FRAME_BORDER_HIGHLIGHT_IN__ 372
+#define __GO_UI_FRAME_BORDER_HIGHLIGHT_OUT__ 373
+#define __GO_UI_FRAME_BORDER_IN_BORDER__ 374
+#define __GO_UI_FRAME_BORDER_JUSTIFICATION__ 375
+#define __GO_UI_FRAME_BORDER_OUT_BORDER__ 376
+#define __GO_UI_FRAME_BORDER_ROUNDED__ 377
+#define __GO_UI_FRAME_BORDER_SHADOW_IN__ 378
+#define __GO_UI_FRAME_BORDER_SHADOW_OUT__ 379
+#define __GO_UI_FRAME_BORDER_TITLE__ 380
+#define __GO_UI_FRAME_BORDER_POSITION__ 381
+#define __GO_UI_FRAME_BORDER_STYLE__ 382
+#define __GO_UI_GROUP_NAME__ 383
+#define __GO_UI_TITLE_POSITION__ 384
+#define __GO_UI_TITLE_SCROLL__ 385
+#define __GO_UI_FRAME_BORDER_TYPE__ 386
+#define __GO_UI_SCROLLABLE__ 387
 
 #endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */
index 1b639d9..d159fe3 100644 (file)
@@ -52,38 +52,38 @@ public class Axes extends GraphicObject {
 
     /** Axes properties names */
     private enum AxesProperty {
-        XAXISVISIBLE, XAXISREVERSE, XAXISGRIDCOLOR, XAXISGRIDTHICKNESS, XAXISGRIDSTYLE, XAXISLABEL, XAXISLOCATION, XAXISLOGFLAG,
-            XAXISTICKS, XAXISAUTOTICKS, XAXISNUMBERTICKS, XAXISTICKSLOCATIONS, XAXISTICKSLABELS, XAXISSUBTICKS,
-            YAXISVISIBLE, YAXISREVERSE, YAXISGRIDCOLOR, YAXISGRIDTHICKNESS, YAXISGRIDSTYLE, YAXISLABEL, YAXISLOCATION, YAXISLOGFLAG,
-            YAXISTICKS, YAXISAUTOTICKS, YAXISNUMBERTICKS, YAXISTICKSLOCATIONS, YAXISTICKSLABELS, YAXISSUBTICKS,
-            ZAXISVISIBLE, ZAXISREVERSE, ZAXISGRIDCOLOR, ZAXISGRIDTHICKNESS, ZAXISGRIDSTYLE, ZAXISLABEL, ZAXISLOCATION, ZAXISLOGFLAG,
-            ZAXISTICKS, ZAXISAUTOTICKS, ZAXISNUMBERTICKS, ZAXISTICKSLOCATIONS, ZAXISTICKSLABELS, ZAXISSUBTICKS,
-            AUTOSUBTICKS,
-            FONT_STYLE, FONT_SIZE, FONT_COLOR, FONT_FRACTIONAL,
-            GRIDPOSITION, TITLE, AUTOCLEAR, FILLED, BACKGROUND,
-            MARGINS, AUTO_MARGINS, AXESBOUNDS,
-            HIDDENCOLOR
-            };
+        XAXISVISIBLE, XAXISFORMAT, XAXISSTFACTORS, XAXISREVERSE, XAXISGRIDCOLOR, XAXISGRIDTHICKNESS, XAXISGRIDSTYLE, XAXISLABEL, XAXISLOCATION, XAXISLOGFLAG,
+        XAXISTICKS, XAXISAUTOTICKS, XAXISNUMBERTICKS, XAXISTICKSLOCATIONS, XAXISTICKSLABELS, XAXISSUBTICKS,
+        YAXISVISIBLE, YAXISFORMAT, YAXISSTFACTORS, YAXISREVERSE, YAXISGRIDCOLOR, YAXISGRIDTHICKNESS, YAXISGRIDSTYLE, YAXISLABEL, YAXISLOCATION, YAXISLOGFLAG,
+        YAXISTICKS, YAXISAUTOTICKS, YAXISNUMBERTICKS, YAXISTICKSLOCATIONS, YAXISTICKSLABELS, YAXISSUBTICKS,
+        ZAXISVISIBLE, ZAXISFORMAT, ZAXISSTFACTORS, ZAXISREVERSE, ZAXISGRIDCOLOR, ZAXISGRIDTHICKNESS, ZAXISGRIDSTYLE, ZAXISLABEL, ZAXISLOCATION, ZAXISLOGFLAG,
+        ZAXISTICKS, ZAXISAUTOTICKS, ZAXISNUMBERTICKS, ZAXISTICKSLOCATIONS, ZAXISTICKSLABELS, ZAXISSUBTICKS,
+        AUTOSUBTICKS,
+        FONT_STYLE, FONT_SIZE, FONT_COLOR, FONT_FRACTIONAL,
+        GRIDPOSITION, TITLE, AUTOCLEAR, FILLED, BACKGROUND,
+        MARGINS, AUTO_MARGINS, AXESBOUNDS,
+        HIDDENCOLOR
+    };
 
     /** Specifies the grid position relative to the graphics entities */
     public static enum GridPosition { BACKGROUND, FOREGROUND;
 
-        /**
-         * Converts an integer to the corresponding enum
-         * @param intValue the integer value
-         * @return the grid position enum
-         */
-        public static GridPosition intToEnum(Integer intValue) {
-            switch (intValue) {
+                                      /**
+                                       * Converts an integer to the corresponding enum
+                                       * @param intValue the integer value
+                                       * @return the grid position enum
+                                       */
+    public static GridPosition intToEnum(Integer intValue) {
+        switch (intValue) {
             case 0:
                 return GridPosition.BACKGROUND;
             case 1:
                 return GridPosition.FOREGROUND;
             default:
                 return null;
-            }
         }
-    };
+    }
+                                    };
 
 
     /** 3-element array (properties of the X, Y and Z axes) */
@@ -216,176 +216,188 @@ public class Axes extends GraphicObject {
      */
     public Object getPropertyFromName(int propertyName) {
         switch (propertyName) {
-        case __GO_X_AXIS_VISIBLE__ :
-            return AxesProperty.XAXISVISIBLE;
-        case __GO_X_AXIS_REVERSE__ :
-            return AxesProperty.XAXISREVERSE;
-        case __GO_X_AXIS_GRID_COLOR__ :
-            return AxesProperty.XAXISGRIDCOLOR;
-        case __GO_X_AXIS_GRID_THICKNESS__ :
-            return AxesProperty.XAXISGRIDTHICKNESS;
-        case __GO_X_AXIS_GRID_STYLE__ :
-            return AxesProperty.XAXISGRIDSTYLE;
-        case __GO_X_AXIS_LABEL__ :
-            return AxesProperty.XAXISLABEL;
-        case __GO_X_AXIS_LOCATION__ :
-            return AxesProperty.XAXISLOCATION;
-        case __GO_X_AXIS_LOG_FLAG__ :
-            return AxesProperty.XAXISLOGFLAG;
-        case __GO_X_AXIS_TICKS__ :
-            return AxesProperty.XAXISTICKS;
-        case __GO_X_AXIS_AUTO_TICKS__ :
-            return AxesProperty.XAXISAUTOTICKS;
-        case __GO_X_AXIS_NUMBER_TICKS__ :
-            return AxesProperty.XAXISNUMBERTICKS;
-        case __GO_X_AXIS_TICKS_LOCATIONS__:
-            return AxesProperty.XAXISTICKSLOCATIONS;
-        case __GO_X_AXIS_TICKS_LABELS__ :
-            return AxesProperty.XAXISTICKSLABELS;
-        case __GO_X_AXIS_SUBTICKS__ :
-            return AxesProperty.XAXISSUBTICKS;
-        case __GO_Y_AXIS_VISIBLE__ :
-            return AxesProperty.YAXISVISIBLE;
-        case __GO_Y_AXIS_REVERSE__ :
-            return AxesProperty.YAXISREVERSE;
-        case __GO_Y_AXIS_GRID_COLOR__ :
-            return AxesProperty.YAXISGRIDCOLOR;
-        case __GO_Y_AXIS_GRID_THICKNESS__ :
-            return AxesProperty.YAXISGRIDTHICKNESS;
-        case __GO_Y_AXIS_GRID_STYLE__ :
-            return AxesProperty.YAXISGRIDSTYLE;
-        case __GO_Y_AXIS_LABEL__ :
-            return AxesProperty.YAXISLABEL;
-        case __GO_Y_AXIS_LOCATION__ :
-            return AxesProperty.YAXISLOCATION;
-        case __GO_Y_AXIS_LOG_FLAG__ :
-            return AxesProperty.YAXISLOGFLAG;
-        case __GO_Y_AXIS_TICKS__ :
-            return AxesProperty.YAXISTICKS;
-        case __GO_Y_AXIS_AUTO_TICKS__ :
-            return AxesProperty.YAXISAUTOTICKS;
-        case __GO_Y_AXIS_NUMBER_TICKS__ :
-            return AxesProperty.YAXISNUMBERTICKS;
-        case __GO_Y_AXIS_TICKS_LOCATIONS__ :
-            return AxesProperty.YAXISTICKSLOCATIONS;
-        case __GO_Y_AXIS_TICKS_LABELS__ :
-            return AxesProperty.YAXISTICKSLABELS;
-        case __GO_Y_AXIS_SUBTICKS__ :
-            return AxesProperty.YAXISSUBTICKS;
-        case __GO_Z_AXIS_VISIBLE__ :
-            return AxesProperty.ZAXISVISIBLE;
-        case __GO_Z_AXIS_REVERSE__ :
-            return AxesProperty.ZAXISREVERSE;
-        case __GO_Z_AXIS_GRID_COLOR__ :
-            return AxesProperty.ZAXISGRIDCOLOR;
-        case __GO_Z_AXIS_GRID_THICKNESS__ :
-            return AxesProperty.ZAXISGRIDTHICKNESS;
-        case __GO_Z_AXIS_GRID_STYLE__ :
-            return AxesProperty.ZAXISGRIDSTYLE;
-        case __GO_Z_AXIS_LABEL__ :
-            return AxesProperty.ZAXISLABEL;
-        case __GO_Z_AXIS_LOCATION__ :
-            return AxesProperty.ZAXISLOCATION;
-        case __GO_Z_AXIS_LOG_FLAG__ :
-            return AxesProperty.ZAXISLOGFLAG;
-        case __GO_Z_AXIS_TICKS__ :
-            return AxesProperty.ZAXISTICKS;
-        case __GO_Z_AXIS_AUTO_TICKS__ :
-            return AxesProperty.ZAXISAUTOTICKS;
-        case __GO_Z_AXIS_NUMBER_TICKS__ :
-            return AxesProperty.ZAXISNUMBERTICKS;
-        case __GO_Z_AXIS_TICKS_LOCATIONS__ :
-            return AxesProperty.ZAXISTICKSLOCATIONS;
-        case __GO_Z_AXIS_TICKS_LABELS__ :
-            return AxesProperty.ZAXISTICKSLABELS;
-        case __GO_Z_AXIS_SUBTICKS__ :
-            return AxesProperty.ZAXISSUBTICKS;
-        case __GO_AUTO_SUBTICKS__ :
-            return AxesProperty.AUTOSUBTICKS;
-        case __GO_FONT_STYLE__ :
-            return AxesProperty.FONT_STYLE;
-        case __GO_FONT_SIZE__ :
-            return AxesProperty.FONT_SIZE;
-        case __GO_FONT_COLOR__ :
-            return AxesProperty.FONT_COLOR;
-        case __GO_FONT_FRACTIONAL__ :
-            return AxesProperty.FONT_FRACTIONAL;
-        case __GO_GRID_POSITION__ :
-            return AxesProperty.GRIDPOSITION;
-        case __GO_TITLE__ :
-            return AxesProperty.TITLE;
-        case __GO_AUTO_CLEAR__ :
-            return AxesProperty.AUTOCLEAR;
-        case __GO_FILLED__ :
-            return AxesProperty.FILLED;
-        case __GO_BACKGROUND__ :
-            return AxesProperty.BACKGROUND;
-        case __GO_VIEW__ :
-            return Camera.CameraProperty.VIEW;
-        case __GO_ISOVIEW__ :
-            return Camera.CameraProperty.ISOVIEW;
-        case __GO_CUBE_SCALING__ :
-            return Camera.CameraProperty.CUBESCALING;
-        case __GO_ROTATION_ANGLES__ :
-            return Camera.CameraProperty.ROTATIONANGLES;
-        case __GO_ROTATION_ANGLES_3D__ :
-            return Camera.CameraProperty.ROTATIONANGLES3D;
-        case __GO_BOX_TYPE__ :
-            return Box.BoxProperty.BOX;
-        case __GO_HIDDEN_AXIS_COLOR__ :
-            return Box.BoxProperty.HIDDENAXISCOLOR;
-        case __GO_TIGHT_LIMITS__ :
-            return Box.BoxProperty.TIGHTLIMITS;
-        case __GO_DATA_BOUNDS__ :
-            return Box.BoxProperty.DATABOUNDS;
-        case __GO_REAL_DATA_BOUNDS__ :
-            return Box.BoxProperty.REALDATABOUNDS;
-        case __GO_ZOOM_ENABLED__ :
-            return Box.BoxProperty.ZOOMENABLED;
-        case __GO_ZOOM_BOX__ :
-            return Box.BoxProperty.ZOOMBOX;
-        case __GO_AUTO_SCALE__ :
-            return Box.BoxProperty.AUTOSCALE;
-        case __GO_FIRST_PLOT__ :
-            return Box.BoxProperty.FIRSTPLOT;
-        case __GO_MARGINS__ :
-            return AxesProperty.MARGINS;
-        case __GO_AUTO_MARGINS__ :
-            return AxesProperty.AUTO_MARGINS;
-        case __GO_AXES_BOUNDS__ :
-            return AxesProperty.AXESBOUNDS;
-        case __GO_HIDDEN_COLOR__ :
-            return AxesProperty.HIDDENCOLOR;
-        case __GO_LINE_MODE__ :
-            return LinePropertyType.MODE;
-        case __GO_LINE_STYLE__ :
-            return LinePropertyType.LINESTYLE;
-        case __GO_LINE_THICKNESS__ :
-            return LinePropertyType.THICKNESS;
-        case __GO_LINE_COLOR__ :
-            return LinePropertyType.COLOR;
-        case __GO_MARK_MODE__ :
-            return MarkPropertyType.MODE;
-        case __GO_MARK_STYLE__ :
-            return MarkPropertyType.STYLE;
-        case __GO_MARK_SIZE_UNIT__ :
-            return MarkPropertyType.SIZEUNIT;
-        case __GO_MARK_SIZE__ :
-            return MarkPropertyType.SIZE;
-        case __GO_MARK_FOREGROUND__ :
-            return MarkPropertyType.FOREGROUND;
-        case __GO_MARK_BACKGROUND__ :
-            return MarkPropertyType.BACKGROUND;
-        case __GO_CLIP_STATE__ :
-            return ClippablePropertyType.CLIPSTATE;
-        case __GO_CLIP_BOX__ :
-            return ClippablePropertyType.CLIPBOX;
-        case __GO_CLIP_BOX_SET__ :
-            return ClippablePropertyType.CLIPBOXSET;
-        case __GO_ARC_DRAWING_METHOD__ :
-            return ArcProperty.ARCDRAWINGMETHOD;
-        default :
-            return super.getPropertyFromName(propertyName);
+            case __GO_X_AXIS_VISIBLE__ :
+                return AxesProperty.XAXISVISIBLE;
+            case __GO_X_AXIS_REVERSE__ :
+                return AxesProperty.XAXISREVERSE;
+            case __GO_X_AXIS_GRID_COLOR__ :
+                return AxesProperty.XAXISGRIDCOLOR;
+            case __GO_X_AXIS_GRID_THICKNESS__ :
+                return AxesProperty.XAXISGRIDTHICKNESS;
+            case __GO_X_AXIS_GRID_STYLE__ :
+                return AxesProperty.XAXISGRIDSTYLE;
+            case __GO_X_AXIS_LABEL__ :
+                return AxesProperty.XAXISLABEL;
+            case __GO_X_AXIS_LOCATION__ :
+                return AxesProperty.XAXISLOCATION;
+            case __GO_X_AXIS_LOG_FLAG__ :
+                return AxesProperty.XAXISLOGFLAG;
+            case __GO_X_AXIS_TICKS__ :
+                return AxesProperty.XAXISTICKS;
+            case __GO_X_AXIS_FORMAT__ :
+                return AxesProperty.XAXISFORMAT;
+            case __GO_X_AXIS_ST_FACTORS__ :
+                return AxesProperty.XAXISSTFACTORS;
+            case __GO_X_AXIS_AUTO_TICKS__ :
+                return AxesProperty.XAXISAUTOTICKS;
+            case __GO_X_AXIS_NUMBER_TICKS__ :
+                return AxesProperty.XAXISNUMBERTICKS;
+            case __GO_X_AXIS_TICKS_LOCATIONS__:
+                return AxesProperty.XAXISTICKSLOCATIONS;
+            case __GO_X_AXIS_TICKS_LABELS__ :
+                return AxesProperty.XAXISTICKSLABELS;
+            case __GO_X_AXIS_SUBTICKS__ :
+                return AxesProperty.XAXISSUBTICKS;
+            case __GO_Y_AXIS_VISIBLE__ :
+                return AxesProperty.YAXISVISIBLE;
+            case __GO_Y_AXIS_REVERSE__ :
+                return AxesProperty.YAXISREVERSE;
+            case __GO_Y_AXIS_GRID_COLOR__ :
+                return AxesProperty.YAXISGRIDCOLOR;
+            case __GO_Y_AXIS_GRID_THICKNESS__ :
+                return AxesProperty.YAXISGRIDTHICKNESS;
+            case __GO_Y_AXIS_GRID_STYLE__ :
+                return AxesProperty.YAXISGRIDSTYLE;
+            case __GO_Y_AXIS_LABEL__ :
+                return AxesProperty.YAXISLABEL;
+            case __GO_Y_AXIS_LOCATION__ :
+                return AxesProperty.YAXISLOCATION;
+            case __GO_Y_AXIS_LOG_FLAG__ :
+                return AxesProperty.YAXISLOGFLAG;
+            case __GO_Y_AXIS_TICKS__ :
+                return AxesProperty.YAXISTICKS;
+            case __GO_Y_AXIS_FORMAT__ :
+                return AxesProperty.YAXISFORMAT;
+            case __GO_Y_AXIS_ST_FACTORS__ :
+                return AxesProperty.YAXISSTFACTORS;
+            case __GO_Y_AXIS_AUTO_TICKS__ :
+                return AxesProperty.YAXISAUTOTICKS;
+            case __GO_Y_AXIS_NUMBER_TICKS__ :
+                return AxesProperty.YAXISNUMBERTICKS;
+            case __GO_Y_AXIS_TICKS_LOCATIONS__ :
+                return AxesProperty.YAXISTICKSLOCATIONS;
+            case __GO_Y_AXIS_TICKS_LABELS__ :
+                return AxesProperty.YAXISTICKSLABELS;
+            case __GO_Y_AXIS_SUBTICKS__ :
+                return AxesProperty.YAXISSUBTICKS;
+            case __GO_Z_AXIS_VISIBLE__ :
+                return AxesProperty.ZAXISVISIBLE;
+            case __GO_Z_AXIS_REVERSE__ :
+                return AxesProperty.ZAXISREVERSE;
+            case __GO_Z_AXIS_GRID_COLOR__ :
+                return AxesProperty.ZAXISGRIDCOLOR;
+            case __GO_Z_AXIS_GRID_THICKNESS__ :
+                return AxesProperty.ZAXISGRIDTHICKNESS;
+            case __GO_Z_AXIS_GRID_STYLE__ :
+                return AxesProperty.ZAXISGRIDSTYLE;
+            case __GO_Z_AXIS_LABEL__ :
+                return AxesProperty.ZAXISLABEL;
+            case __GO_Z_AXIS_LOCATION__ :
+                return AxesProperty.ZAXISLOCATION;
+            case __GO_Z_AXIS_LOG_FLAG__ :
+                return AxesProperty.ZAXISLOGFLAG;
+            case __GO_Z_AXIS_TICKS__ :
+                return AxesProperty.ZAXISTICKS;
+            case __GO_Z_AXIS_FORMAT__ :
+                return AxesProperty.ZAXISFORMAT;
+            case __GO_Z_AXIS_ST_FACTORS__ :
+                return AxesProperty.ZAXISSTFACTORS;
+            case __GO_Z_AXIS_AUTO_TICKS__ :
+                return AxesProperty.ZAXISAUTOTICKS;
+            case __GO_Z_AXIS_NUMBER_TICKS__ :
+                return AxesProperty.ZAXISNUMBERTICKS;
+            case __GO_Z_AXIS_TICKS_LOCATIONS__ :
+                return AxesProperty.ZAXISTICKSLOCATIONS;
+            case __GO_Z_AXIS_TICKS_LABELS__ :
+                return AxesProperty.ZAXISTICKSLABELS;
+            case __GO_Z_AXIS_SUBTICKS__ :
+                return AxesProperty.ZAXISSUBTICKS;
+            case __GO_AUTO_SUBTICKS__ :
+                return AxesProperty.AUTOSUBTICKS;
+            case __GO_FONT_STYLE__ :
+                return AxesProperty.FONT_STYLE;
+            case __GO_FONT_SIZE__ :
+                return AxesProperty.FONT_SIZE;
+            case __GO_FONT_COLOR__ :
+                return AxesProperty.FONT_COLOR;
+            case __GO_FONT_FRACTIONAL__ :
+                return AxesProperty.FONT_FRACTIONAL;
+            case __GO_GRID_POSITION__ :
+                return AxesProperty.GRIDPOSITION;
+            case __GO_TITLE__ :
+                return AxesProperty.TITLE;
+            case __GO_AUTO_CLEAR__ :
+                return AxesProperty.AUTOCLEAR;
+            case __GO_FILLED__ :
+                return AxesProperty.FILLED;
+            case __GO_BACKGROUND__ :
+                return AxesProperty.BACKGROUND;
+            case __GO_VIEW__ :
+                return Camera.CameraProperty.VIEW;
+            case __GO_ISOVIEW__ :
+                return Camera.CameraProperty.ISOVIEW;
+            case __GO_CUBE_SCALING__ :
+                return Camera.CameraProperty.CUBESCALING;
+            case __GO_ROTATION_ANGLES__ :
+                return Camera.CameraProperty.ROTATIONANGLES;
+            case __GO_ROTATION_ANGLES_3D__ :
+                return Camera.CameraProperty.ROTATIONANGLES3D;
+            case __GO_BOX_TYPE__ :
+                return Box.BoxProperty.BOX;
+            case __GO_HIDDEN_AXIS_COLOR__ :
+                return Box.BoxProperty.HIDDENAXISCOLOR;
+            case __GO_TIGHT_LIMITS__ :
+                return Box.BoxProperty.TIGHTLIMITS;
+            case __GO_DATA_BOUNDS__ :
+                return Box.BoxProperty.DATABOUNDS;
+            case __GO_REAL_DATA_BOUNDS__ :
+                return Box.BoxProperty.REALDATABOUNDS;
+            case __GO_ZOOM_ENABLED__ :
+                return Box.BoxProperty.ZOOMENABLED;
+            case __GO_ZOOM_BOX__ :
+                return Box.BoxProperty.ZOOMBOX;
+            case __GO_AUTO_SCALE__ :
+                return Box.BoxProperty.AUTOSCALE;
+            case __GO_FIRST_PLOT__ :
+                return Box.BoxProperty.FIRSTPLOT;
+            case __GO_MARGINS__ :
+                return AxesProperty.MARGINS;
+            case __GO_AUTO_MARGINS__ :
+                return AxesProperty.AUTO_MARGINS;
+            case __GO_AXES_BOUNDS__ :
+                return AxesProperty.AXESBOUNDS;
+            case __GO_HIDDEN_COLOR__ :
+                return AxesProperty.HIDDENCOLOR;
+            case __GO_LINE_MODE__ :
+                return LinePropertyType.MODE;
+            case __GO_LINE_STYLE__ :
+                return LinePropertyType.LINESTYLE;
+            case __GO_LINE_THICKNESS__ :
+                return LinePropertyType.THICKNESS;
+            case __GO_LINE_COLOR__ :
+                return LinePropertyType.COLOR;
+            case __GO_MARK_MODE__ :
+                return MarkPropertyType.MODE;
+            case __GO_MARK_STYLE__ :
+                return MarkPropertyType.STYLE;
+            case __GO_MARK_SIZE_UNIT__ :
+                return MarkPropertyType.SIZEUNIT;
+            case __GO_MARK_SIZE__ :
+                return MarkPropertyType.SIZE;
+            case __GO_MARK_FOREGROUND__ :
+                return MarkPropertyType.FOREGROUND;
+            case __GO_MARK_BACKGROUND__ :
+                return MarkPropertyType.BACKGROUND;
+            case __GO_CLIP_STATE__ :
+                return ClippablePropertyType.CLIPSTATE;
+            case __GO_CLIP_BOX__ :
+                return ClippablePropertyType.CLIPBOX;
+            case __GO_CLIP_BOX_SET__ :
+                return ClippablePropertyType.CLIPBOXSET;
+            case __GO_ARC_DRAWING_METHOD__ :
+                return ArcProperty.ARCDRAWINGMETHOD;
+            default :
+                return super.getPropertyFromName(propertyName);
         }
     }
 
@@ -398,192 +410,204 @@ public class Axes extends GraphicObject {
         if (property instanceof AxesProperty) {
             AxesProperty ap = (AxesProperty) property;
             switch (ap) {
-            case XAXISVISIBLE:
-                return getXAxisVisible();
-            case XAXISREVERSE:
-                return getXAxisReverse();
-            case XAXISGRIDCOLOR:
-                return getXAxisGridColor();
-            case XAXISGRIDTHICKNESS:
-                return getXAxisGridThickness();
-            case XAXISGRIDSTYLE:
-                return getXAxisGridStyle();
-            case XAXISLABEL:
-                return getXAxisLabel();
-            case XAXISLOCATION:
-                return getXAxisLocation();
-            case XAXISLOGFLAG:
-                return getXAxisLogFlag();
-            case XAXISTICKS:
-                return getXAxisTicks();
-            case XAXISAUTOTICKS:
-                return getXAxisAutoTicks();
-            case XAXISNUMBERTICKS:
-                return getXAxisNumberTicks();
-            case XAXISTICKSLOCATIONS:
-                return getXAxisTicksLocations();
-            case XAXISTICKSLABELS:
-                return getXAxisTicksLabels();
-            case XAXISSUBTICKS:
-                return getXAxisSubticks();
-            case YAXISVISIBLE:
-                return getYAxisVisible();
-            case YAXISREVERSE:
-                return getYAxisReverse();
-            case YAXISGRIDCOLOR:
-                return getYAxisGridColor();
-            case YAXISGRIDTHICKNESS:
-                return getYAxisGridThickness();
-            case YAXISGRIDSTYLE:
-                return getYAxisGridStyle();
-            case YAXISLABEL:
-                return getYAxisLabel();
-            case YAXISLOCATION:
-                return getYAxisLocation();
-            case YAXISLOGFLAG:
-                return getYAxisLogFlag();
-            case YAXISTICKS:
-                return getYAxisTicks();
-            case YAXISAUTOTICKS:
-                return getYAxisAutoTicks();
-            case YAXISNUMBERTICKS:
-                return getYAxisNumberTicks();
-            case YAXISTICKSLOCATIONS:
-                return getYAxisTicksLocations();
-            case YAXISTICKSLABELS:
-                return getYAxisTicksLabels();
-            case YAXISSUBTICKS:
-                return getYAxisSubticks();
-            case ZAXISVISIBLE:
-                return getZAxisVisible();
-            case ZAXISREVERSE:
-                return getZAxisReverse();
-            case ZAXISGRIDCOLOR:
-                return getZAxisGridColor();
-            case ZAXISGRIDTHICKNESS:
-                return getZAxisGridThickness();
-            case ZAXISGRIDSTYLE:
-                return getZAxisGridStyle();
-            case ZAXISLABEL:
-                return getZAxisLabel();
-            case ZAXISLOCATION:
-                return getZAxisLocation();
-            case ZAXISLOGFLAG:
-                return getZAxisLogFlag();
-            case ZAXISTICKS:
-                return getZAxisTicks();
-            case ZAXISAUTOTICKS:
-                return getZAxisAutoTicks();
-            case ZAXISNUMBERTICKS:
-                return getZAxisNumberTicks();
-            case ZAXISTICKSLOCATIONS:
-                return getZAxisTicksLocations();
-            case ZAXISTICKSLABELS:
-                return getZAxisTicksLabels();
-            case ZAXISSUBTICKS:
-                return getZAxisSubticks();
-            case AUTOSUBTICKS:
-                return getAutoSubticks();
-            case FONT_STYLE:
-                return getFontStyle();
-            case FONT_SIZE:
-                return getFontSize();
-            case FONT_COLOR:
-                return getFontColor();
-            case FONT_FRACTIONAL:
-                return getFontFractional();
-            case GRIDPOSITION:
-                return getGridPosition();
-            case TITLE:
-                return getTitle();
-            case AUTOCLEAR:
-                return getAutoClear();
-            case FILLED:
-                return getFilled();
-            case BACKGROUND:
-                return getBackground();
-            case MARGINS:
-                return getMargins();
-            case AUTO_MARGINS:
-                return getAutoMargins();
-            case AXESBOUNDS:
-                return getAxesBounds();
-            case HIDDENCOLOR:
-                return getHiddenColor();
+                case XAXISVISIBLE:
+                    return getXAxisVisible();
+                case XAXISREVERSE:
+                    return getXAxisReverse();
+                case XAXISGRIDCOLOR:
+                    return getXAxisGridColor();
+                case XAXISGRIDTHICKNESS:
+                    return getXAxisGridThickness();
+                case XAXISGRIDSTYLE:
+                    return getXAxisGridStyle();
+                case XAXISLABEL:
+                    return getXAxisLabel();
+                case XAXISLOCATION:
+                    return getXAxisLocation();
+                case XAXISLOGFLAG:
+                    return getXAxisLogFlag();
+                case XAXISTICKS:
+                    return getXAxisTicks();
+                case XAXISFORMAT:
+                    return getXAxisFormat();
+                case XAXISSTFACTORS:
+                    return getXAxisSTFactors();
+                case XAXISAUTOTICKS:
+                    return getXAxisAutoTicks();
+                case XAXISNUMBERTICKS:
+                    return getXAxisNumberTicks();
+                case XAXISTICKSLOCATIONS:
+                    return getXAxisTicksLocations();
+                case XAXISTICKSLABELS:
+                    return getXAxisTicksLabels();
+                case XAXISSUBTICKS:
+                    return getXAxisSubticks();
+                case YAXISVISIBLE:
+                    return getYAxisVisible();
+                case YAXISREVERSE:
+                    return getYAxisReverse();
+                case YAXISGRIDCOLOR:
+                    return getYAxisGridColor();
+                case YAXISGRIDTHICKNESS:
+                    return getYAxisGridThickness();
+                case YAXISGRIDSTYLE:
+                    return getYAxisGridStyle();
+                case YAXISLABEL:
+                    return getYAxisLabel();
+                case YAXISLOCATION:
+                    return getYAxisLocation();
+                case YAXISLOGFLAG:
+                    return getYAxisLogFlag();
+                case YAXISTICKS:
+                    return getYAxisTicks();
+                case YAXISFORMAT:
+                    return getYAxisFormat();
+                case YAXISSTFACTORS:
+                    return getYAxisSTFactors();
+                case YAXISAUTOTICKS:
+                    return getYAxisAutoTicks();
+                case YAXISNUMBERTICKS:
+                    return getYAxisNumberTicks();
+                case YAXISTICKSLOCATIONS:
+                    return getYAxisTicksLocations();
+                case YAXISTICKSLABELS:
+                    return getYAxisTicksLabels();
+                case YAXISSUBTICKS:
+                    return getYAxisSubticks();
+                case ZAXISVISIBLE:
+                    return getZAxisVisible();
+                case ZAXISREVERSE:
+                    return getZAxisReverse();
+                case ZAXISGRIDCOLOR:
+                    return getZAxisGridColor();
+                case ZAXISGRIDTHICKNESS:
+                    return getZAxisGridThickness();
+                case ZAXISGRIDSTYLE:
+                    return getZAxisGridStyle();
+                case ZAXISLABEL:
+                    return getZAxisLabel();
+                case ZAXISLOCATION:
+                    return getZAxisLocation();
+                case ZAXISLOGFLAG:
+                    return getZAxisLogFlag();
+                case ZAXISTICKS:
+                    return getZAxisTicks();
+                case ZAXISFORMAT:
+                    return getZAxisFormat();
+                case ZAXISSTFACTORS:
+                    return getZAxisSTFactors();
+                case ZAXISAUTOTICKS:
+                    return getZAxisAutoTicks();
+                case ZAXISNUMBERTICKS:
+                    return getZAxisNumberTicks();
+                case ZAXISTICKSLOCATIONS:
+                    return getZAxisTicksLocations();
+                case ZAXISTICKSLABELS:
+                    return getZAxisTicksLabels();
+                case ZAXISSUBTICKS:
+                    return getZAxisSubticks();
+                case AUTOSUBTICKS:
+                    return getAutoSubticks();
+                case FONT_STYLE:
+                    return getFontStyle();
+                case FONT_SIZE:
+                    return getFontSize();
+                case FONT_COLOR:
+                    return getFontColor();
+                case FONT_FRACTIONAL:
+                    return getFontFractional();
+                case GRIDPOSITION:
+                    return getGridPosition();
+                case TITLE:
+                    return getTitle();
+                case AUTOCLEAR:
+                    return getAutoClear();
+                case FILLED:
+                    return getFilled();
+                case BACKGROUND:
+                    return getBackground();
+                case MARGINS:
+                    return getMargins();
+                case AUTO_MARGINS:
+                    return getAutoMargins();
+                case AXESBOUNDS:
+                    return getAxesBounds();
+                case HIDDENCOLOR:
+                    return getHiddenColor();
             }
         } else if (property instanceof Camera.CameraProperty) {
             Camera.CameraProperty cp = (Camera.CameraProperty) property;
             switch (cp) {
-            case VIEW:
-                return getView();
-            case ISOVIEW:
-                return getIsoview();
-            case CUBESCALING:
-                return getCubeScaling();
-            case ROTATIONANGLES:
-                return getRotationAngles();
-            case ROTATIONANGLES3D:
-                return getRotationAngles3d();
+                case VIEW:
+                    return getView();
+                case ISOVIEW:
+                    return getIsoview();
+                case CUBESCALING:
+                    return getCubeScaling();
+                case ROTATIONANGLES:
+                    return getRotationAngles();
+                case ROTATIONANGLES3D:
+                    return getRotationAngles3d();
             }
         } else if (property instanceof Box.BoxProperty) {
             Box.BoxProperty bp = (Box.BoxProperty) property;
             switch (bp) {
-            case BOX:
-                return getBoxType();
-            case HIDDENAXISCOLOR:
-                return getHiddenAxisColor();
-            case TIGHTLIMITS:
-                return getTightLimits();
-            case DATABOUNDS:
-                return getDataBounds();
-            case REALDATABOUNDS:
-                return getRealDataBounds();
-            case ZOOMENABLED:
-                return getZoomEnabled();
-            case ZOOMBOX:
-                return getZoomBox();
-            case AUTOSCALE:
-                return getAutoScale();
-            case FIRSTPLOT:
-                return getFirstPlot();
+                case BOX:
+                    return getBoxType();
+                case HIDDENAXISCOLOR:
+                    return getHiddenAxisColor();
+                case TIGHTLIMITS:
+                    return getTightLimits();
+                case DATABOUNDS:
+                    return getDataBounds();
+                case REALDATABOUNDS:
+                    return getRealDataBounds();
+                case ZOOMENABLED:
+                    return getZoomEnabled();
+                case ZOOMBOX:
+                    return getZoomBox();
+                case AUTOSCALE:
+                    return getAutoScale();
+                case FIRSTPLOT:
+                    return getFirstPlot();
             }
         } else if (property instanceof LinePropertyType) {
             LinePropertyType lp = (LinePropertyType) property;
             switch (lp) {
-            case MODE:
-                return getLineMode();
-            case LINESTYLE:
-                return getLineStyle();
-            case THICKNESS:
-                return getLineThickness();
-            case COLOR:
-                return getLineColor();
+                case MODE:
+                    return getLineMode();
+                case LINESTYLE:
+                    return getLineStyle();
+                case THICKNESS:
+                    return getLineThickness();
+                case COLOR:
+                    return getLineColor();
             }
         } else if (property instanceof MarkPropertyType) {
             MarkPropertyType mp = (MarkPropertyType) property;
             switch (mp) {
-            case MODE:
-                return getMarkMode();
-            case STYLE:
-                return getMarkStyle();
-            case SIZE:
-                return getMarkSize();
-            case SIZEUNIT:
-                return getMarkSizeUnit();
-            case FOREGROUND:
-                return getMarkForeground();
-            case BACKGROUND:
-                return getMarkBackground();
+                case MODE:
+                    return getMarkMode();
+                case STYLE:
+                    return getMarkStyle();
+                case SIZE:
+                    return getMarkSize();
+                case SIZEUNIT:
+                    return getMarkSizeUnit();
+                case FOREGROUND:
+                    return getMarkForeground();
+                case BACKGROUND:
+                    return getMarkBackground();
             }
         } else if (property instanceof ClippablePropertyType) {
             ClippablePropertyType cp = (ClippablePropertyType) property;
             switch (cp) {
-            case CLIPSTATE:
-                return getClipState();
-            case CLIPBOX:
-                return getClipBox();
-            case CLIPBOXSET:
-                return getClipBoxSet();
+                case CLIPSTATE:
+                    return getClipState();
+                case CLIPBOX:
+                    return getClipBox();
+                case CLIPBOXSET:
+                    return getClipBoxSet();
             }
         } else if (property == ArcProperty.ARCDRAWINGMETHOD) {
             return getArcDrawingMethod();
@@ -602,186 +626,198 @@ public class Axes extends GraphicObject {
         if (property instanceof AxesProperty) {
             AxesProperty ap = (AxesProperty) property;
             switch (ap) {
-            case XAXISVISIBLE:
-                return setXAxisVisible((Boolean) value);
-            case XAXISREVERSE:
-                return setXAxisReverse((Boolean) value);
-            case XAXISGRIDCOLOR:
-                return setXAxisGridColor((Integer) value);
-            case XAXISGRIDTHICKNESS:
-                return setXAxisGridThickness((Double) value);
-            case XAXISGRIDSTYLE:
-                return setXAxisGridStyle((Integer) value);
-            case XAXISLABEL:
-                return setXAxisLabel((Integer) value);
-            case XAXISLOCATION:
-                return setXAxisLocation((Integer) value);
-            case XAXISLOGFLAG:
-                return setXAxisLogFlag((Boolean) value);
-            case XAXISTICKS:
-                return setXAxisTicks((TicksProperty) value);
-            case XAXISAUTOTICKS:
-                return setXAxisAutoTicks((Boolean) value);
-            case XAXISTICKSLOCATIONS:
-                return setXAxisTicksLocations((Double[]) value);
-            case XAXISTICKSLABELS:
-                return setXAxisTicksLabels((String[]) value);
-            case XAXISSUBTICKS:
-                return setXAxisSubticks((Integer) value);
-            case YAXISVISIBLE:
-                return setYAxisVisible((Boolean) value);
-            case YAXISREVERSE:
-                return setYAxisReverse((Boolean) value);
-            case YAXISGRIDCOLOR:
-                return setYAxisGridColor((Integer) value);
-            case YAXISGRIDTHICKNESS:
-                return setYAxisGridThickness((Double) value);
-            case YAXISGRIDSTYLE:
-                return setYAxisGridStyle((Integer) value);
-            case YAXISLABEL:
-                return setYAxisLabel((Integer) value);
-            case YAXISLOCATION:
-                return setYAxisLocation((Integer) value);
-            case YAXISLOGFLAG:
-                return setYAxisLogFlag((Boolean) value);
-            case YAXISTICKS:
-                return setYAxisTicks((TicksProperty) value);
-            case YAXISAUTOTICKS:
-                return setYAxisAutoTicks((Boolean) value);
-            case YAXISTICKSLOCATIONS:
-                return setYAxisTicksLocations((Double[]) value);
-            case YAXISTICKSLABELS:
-                return setYAxisTicksLabels((String[]) value);
-            case YAXISSUBTICKS:
-                return setYAxisSubticks((Integer) value);
-            case ZAXISVISIBLE:
-                return setZAxisVisible((Boolean) value);
-            case ZAXISREVERSE:
-                return setZAxisReverse((Boolean) value);
-            case ZAXISGRIDCOLOR:
-                return setZAxisGridColor((Integer) value);
-            case ZAXISGRIDTHICKNESS:
-                return setZAxisGridThickness((Double) value);
-            case ZAXISGRIDSTYLE:
-                return setZAxisGridStyle((Integer) value);
-            case ZAXISLABEL:
-                return setZAxisLabel((Integer) value);
-            case ZAXISLOCATION:
-                return setZAxisLocation((Integer) value);
-            case ZAXISLOGFLAG:
-                return setZAxisLogFlag((Boolean) value);
-            case ZAXISTICKS:
-                return setZAxisTicks((TicksProperty) value);
-            case ZAXISAUTOTICKS:
-                return setZAxisAutoTicks((Boolean) value);
-            case ZAXISTICKSLOCATIONS:
-                return setZAxisTicksLocations((Double[]) value);
-            case ZAXISTICKSLABELS:
-                return setZAxisTicksLabels((String[]) value);
-            case ZAXISSUBTICKS:
-                return setZAxisSubticks((Integer) value);
-            case AUTOSUBTICKS:
-                return setAutoSubticks((Boolean) value);
-            case FONT_STYLE:
-                return setFontStyle((Integer) value);
-            case FONT_SIZE:
-                return setFontSize((Double) value);
-            case FONT_COLOR:
-                return setFontColor((Integer) value);
-            case FONT_FRACTIONAL:
-                return setFontFractional((Boolean) value);
-            case GRIDPOSITION:
-                return setGridPosition((Integer) value);
-            case TITLE:
-                return setTitle((Integer) value);
-            case AUTOCLEAR:
-                return setAutoClear((Boolean) value);
-            case FILLED:
-                return setFilled((Boolean) value);
-            case BACKGROUND:
-                return setBackground((Integer) value);
-            case MARGINS:
-                return setMargins((Double[]) value);
-            case AUTO_MARGINS:
-                return setAutoMargins((Boolean) value);
-            case AXESBOUNDS:
-                return setAxesBounds((Double[]) value);
-            case HIDDENCOLOR:
-                return setHiddenColor((Integer) value);
+                case XAXISVISIBLE:
+                    return setXAxisVisible((Boolean) value);
+                case XAXISREVERSE:
+                    return setXAxisReverse((Boolean) value);
+                case XAXISGRIDCOLOR:
+                    return setXAxisGridColor((Integer) value);
+                case XAXISGRIDTHICKNESS:
+                    return setXAxisGridThickness((Double) value);
+                case XAXISGRIDSTYLE:
+                    return setXAxisGridStyle((Integer) value);
+                case XAXISLABEL:
+                    return setXAxisLabel((Integer) value);
+                case XAXISLOCATION:
+                    return setXAxisLocation((Integer) value);
+                case XAXISLOGFLAG:
+                    return setXAxisLogFlag((Boolean) value);
+                case XAXISTICKS:
+                    return setXAxisTicks((TicksProperty) value);
+                case XAXISFORMAT:
+                    return setXAxisFormat((String) value);
+                case XAXISSTFACTORS:
+                    return setXAxisSTFactors((Double[]) value);
+                case XAXISAUTOTICKS:
+                    return setXAxisAutoTicks((Boolean) value);
+                case XAXISTICKSLOCATIONS:
+                    return setXAxisTicksLocations((Double[]) value);
+                case XAXISTICKSLABELS:
+                    return setXAxisTicksLabels((String[]) value);
+                case XAXISSUBTICKS:
+                    return setXAxisSubticks((Integer) value);
+                case YAXISVISIBLE:
+                    return setYAxisVisible((Boolean) value);
+                case YAXISREVERSE:
+                    return setYAxisReverse((Boolean) value);
+                case YAXISGRIDCOLOR:
+                    return setYAxisGridColor((Integer) value);
+                case YAXISGRIDTHICKNESS:
+                    return setYAxisGridThickness((Double) value);
+                case YAXISGRIDSTYLE:
+                    return setYAxisGridStyle((Integer) value);
+                case YAXISLABEL:
+                    return setYAxisLabel((Integer) value);
+                case YAXISLOCATION:
+                    return setYAxisLocation((Integer) value);
+                case YAXISLOGFLAG:
+                    return setYAxisLogFlag((Boolean) value);
+                case YAXISTICKS:
+                    return setYAxisTicks((TicksProperty) value);
+                case YAXISFORMAT:
+                    return setYAxisFormat((String) value);
+                case YAXISSTFACTORS:
+                    return setYAxisSTFactors((Double[]) value);
+                case YAXISAUTOTICKS:
+                    return setYAxisAutoTicks((Boolean) value);
+                case YAXISTICKSLOCATIONS:
+                    return setYAxisTicksLocations((Double[]) value);
+                case YAXISTICKSLABELS:
+                    return setYAxisTicksLabels((String[]) value);
+                case YAXISSUBTICKS:
+                    return setYAxisSubticks((Integer) value);
+                case ZAXISVISIBLE:
+                    return setZAxisVisible((Boolean) value);
+                case ZAXISREVERSE:
+                    return setZAxisReverse((Boolean) value);
+                case ZAXISGRIDCOLOR:
+                    return setZAxisGridColor((Integer) value);
+                case ZAXISGRIDTHICKNESS:
+                    return setZAxisGridThickness((Double) value);
+                case ZAXISGRIDSTYLE:
+                    return setZAxisGridStyle((Integer) value);
+                case ZAXISLABEL:
+                    return setZAxisLabel((Integer) value);
+                case ZAXISLOCATION:
+                    return setZAxisLocation((Integer) value);
+                case ZAXISLOGFLAG:
+                    return setZAxisLogFlag((Boolean) value);
+                case ZAXISTICKS:
+                    return setZAxisTicks((TicksProperty) value);
+                case ZAXISFORMAT:
+                    return setZAxisFormat((String) value);
+                case ZAXISSTFACTORS:
+                    return setZAxisSTFactors((Double[]) value);
+                case ZAXISAUTOTICKS:
+                    return setZAxisAutoTicks((Boolean) value);
+                case ZAXISTICKSLOCATIONS:
+                    return setZAxisTicksLocations((Double[]) value);
+                case ZAXISTICKSLABELS:
+                    return setZAxisTicksLabels((String[]) value);
+                case ZAXISSUBTICKS:
+                    return setZAxisSubticks((Integer) value);
+                case AUTOSUBTICKS:
+                    return setAutoSubticks((Boolean) value);
+                case FONT_STYLE:
+                    return setFontStyle((Integer) value);
+                case FONT_SIZE:
+                    return setFontSize((Double) value);
+                case FONT_COLOR:
+                    return setFontColor((Integer) value);
+                case FONT_FRACTIONAL:
+                    return setFontFractional((Boolean) value);
+                case GRIDPOSITION:
+                    return setGridPosition((Integer) value);
+                case TITLE:
+                    return setTitle((Integer) value);
+                case AUTOCLEAR:
+                    return setAutoClear((Boolean) value);
+                case FILLED:
+                    return setFilled((Boolean) value);
+                case BACKGROUND:
+                    return setBackground((Integer) value);
+                case MARGINS:
+                    return setMargins((Double[]) value);
+                case AUTO_MARGINS:
+                    return setAutoMargins((Boolean) value);
+                case AXESBOUNDS:
+                    return setAxesBounds((Double[]) value);
+                case HIDDENCOLOR:
+                    return setHiddenColor((Integer) value);
             }
         } else if (property instanceof Camera.CameraProperty) {
             Camera.CameraProperty cp = (Camera.CameraProperty) property;
             switch (cp) {
-            case VIEW:
-                return setView((Integer) value);
-            case ISOVIEW:
-                return setIsoview((Boolean) value);
-            case CUBESCALING:
-                return setCubeScaling((Boolean) value);
-            case ROTATIONANGLES:
-                return setRotationAngles((Double[]) value);
-            case ROTATIONANGLES3D:
-                return setRotationAngles3d((Double[]) value);
+                case VIEW:
+                    return setView((Integer) value);
+                case ISOVIEW:
+                    return setIsoview((Boolean) value);
+                case CUBESCALING:
+                    return setCubeScaling((Boolean) value);
+                case ROTATIONANGLES:
+                    return setRotationAngles((Double[]) value);
+                case ROTATIONANGLES3D:
+                    return setRotationAngles3d((Double[]) value);
             }
         } else if (property instanceof Box.BoxProperty) {
             Box.BoxProperty bp = (Box.BoxProperty) property;
             switch (bp) {
-            case BOX:
-                return setBoxType((Integer) value);
-            case HIDDENAXISCOLOR:
-                return setHiddenAxisColor((Integer) value);
-            case TIGHTLIMITS:
-                return setTightLimits((Boolean) value);
-            case DATABOUNDS:
-                return setDataBounds((Double[]) value);
-            case REALDATABOUNDS:
-                return setRealDataBounds((Double[]) value);
-            case ZOOMENABLED:
-                return setZoomEnabled((Boolean) value);
-            case ZOOMBOX:
-                return setZoomBox((Double[]) value);
-            case AUTOSCALE:
-                return setAutoScale((Boolean) value);
-            case FIRSTPLOT:
-                return setFirstPlot((Boolean) value);
+                case BOX:
+                    return setBoxType((Integer) value);
+                case HIDDENAXISCOLOR:
+                    return setHiddenAxisColor((Integer) value);
+                case TIGHTLIMITS:
+                    return setTightLimits((Boolean) value);
+                case DATABOUNDS:
+                    return setDataBounds((Double[]) value);
+                case REALDATABOUNDS:
+                    return setRealDataBounds((Double[]) value);
+                case ZOOMENABLED:
+                    return setZoomEnabled((Boolean) value);
+                case ZOOMBOX:
+                    return setZoomBox((Double[]) value);
+                case AUTOSCALE:
+                    return setAutoScale((Boolean) value);
+                case FIRSTPLOT:
+                    return setFirstPlot((Boolean) value);
             }
         } else if (property instanceof LinePropertyType) {
             LinePropertyType lp = (LinePropertyType) property;
             switch (lp) {
-            case MODE:
-                return setLineMode((Boolean) value);
-            case LINESTYLE:
-                return setLineStyle((Integer) value);
-            case THICKNESS:
-                return setLineThickness((Double) value);
-            case COLOR:
-                return setLineColor((Integer) value);
+                case MODE:
+                    return setLineMode((Boolean) value);
+                case LINESTYLE:
+                    return setLineStyle((Integer) value);
+                case THICKNESS:
+                    return setLineThickness((Double) value);
+                case COLOR:
+                    return setLineColor((Integer) value);
             }
         } else if (property instanceof MarkPropertyType) {
             MarkPropertyType mp = (MarkPropertyType) property;
             switch (mp) {
-            case MODE:
-                return setMarkMode((Boolean) value);
-            case STYLE:
-                return setMarkStyle((Integer) value);
-            case SIZE:
-                return setMarkSize((Integer) value);
-            case SIZEUNIT:
-                return setMarkSizeUnit((Integer) value);
-            case FOREGROUND:
-                return setMarkForeground((Integer) value);
-            case BACKGROUND:
-                return setMarkBackground((Integer) value);
+                case MODE:
+                    return setMarkMode((Boolean) value);
+                case STYLE:
+                    return setMarkStyle((Integer) value);
+                case SIZE:
+                    return setMarkSize((Integer) value);
+                case SIZEUNIT:
+                    return setMarkSizeUnit((Integer) value);
+                case FOREGROUND:
+                    return setMarkForeground((Integer) value);
+                case BACKGROUND:
+                    return setMarkBackground((Integer) value);
             }
         } else if (property instanceof ClippablePropertyType) {
             ClippablePropertyType cp = (ClippablePropertyType) property;
             switch (cp) {
-            case CLIPSTATE:
-                return setClipState((Integer) value);
-            case CLIPBOX:
-                return setClipBox((Double[]) value);
-            case CLIPBOXSET:
-                return setClipBoxSet((Boolean) value);
+                case CLIPSTATE:
+                    return setClipState((Integer) value);
+                case CLIPBOX:
+                    return setClipBox((Double[]) value);
+                case CLIPBOXSET:
+                    return setClipBoxSet((Boolean) value);
             }
         } else if (property == ArcProperty.ARCDRAWINGMETHOD) {
             return setArcDrawingMethod((Integer) value);
@@ -856,6 +892,34 @@ public class Axes extends GraphicObject {
     }
 
     /**
+     * @return the x axis format
+     */
+    public String getXAxisFormat() {
+        return axes[0].getFormat();
+    }
+
+    /**
+     * @param format the x axis format to set
+     */
+    public UpdateStatus setXAxisFormat(String format) {
+        return axes[0].setFormat(format);
+    }
+
+    /**
+     * @return the x axis scale-translate factors
+     */
+    public Double[] getXAxisSTFactors() {
+        return axes[0].getSTFactors();
+    }
+
+    /**
+     * @param factors the x axis scale-translate factors
+     */
+    public UpdateStatus setXAxisSTFactors(Double[] factors) {
+        return axes[0].setSTFactors(factors);
+    }
+
+    /**
      * @return the x axis reverse
      */
     public Boolean getXAxisReverse() {
@@ -1090,6 +1154,34 @@ public class Axes extends GraphicObject {
     }
 
     /**
+     * @return the y axis format
+     */
+    public String getYAxisFormat() {
+        return axes[1].getFormat();
+    }
+
+    /**
+     * @param format the x axis format to set
+     */
+    public UpdateStatus setYAxisFormat(String format) {
+        return axes[1].setFormat(format);
+    }
+
+    /**
+     * @return the y axis scale-translate factors
+     */
+    public Double[] getYAxisSTFactors() {
+        return axes[1].getSTFactors();
+    }
+
+    /**
+     * @param factors the y axis scale-translate factors
+     */
+    public UpdateStatus setYAxisSTFactors(Double[] factors) {
+        return axes[1].setSTFactors(factors);
+    }
+
+    /**
      * @return the y axis reverse
      */
     public Boolean getYAxisReverse() {
@@ -1324,6 +1416,34 @@ public class Axes extends GraphicObject {
     }
 
     /**
+     * @return the z axis format
+     */
+    public String getZAxisFormat() {
+        return axes[2].getFormat();
+    }
+
+    /**
+     * @param format the z axis format to set
+     */
+    public UpdateStatus setZAxisFormat(String format) {
+        return axes[2].setFormat(format);
+    }
+
+    /**
+     * @return the z axis scale-translate factors
+     */
+    public Double[] getZAxisSTFactors() {
+        return axes[2].getSTFactors();
+    }
+
+    /**
+     * @param factors the z axis scale-translate factors
+     */
+    public UpdateStatus setZAxisSTFactors(Double[] factors) {
+        return axes[2].setSTFactors(factors);
+    }
+
+    /**
      * @return the z axis reverse
      */
     public Boolean getZAxisReverse() {
@@ -1685,7 +1805,7 @@ public class Axes extends GraphicObject {
      */
     public UpdateStatus setAxesBounds(Double[] axesBounds) {
         if (this.axesBounds[0] != axesBounds[0] || this.axesBounds[1] != axesBounds[1]
-            || this.axesBounds[2] != axesBounds[2] || this.axesBounds[3] != axesBounds[3]) {
+                || this.axesBounds[2] != axesBounds[2] || this.axesBounds[3] != axesBounds[3]) {
             this.axesBounds[0] = axesBounds[0];
             this.axesBounds[1] = axesBounds[1];
             this.axesBounds[2] = axesBounds[2];
@@ -2042,7 +2162,7 @@ public class Axes extends GraphicObject {
         f[0] = new double[] {2 / (bounds[1] - bounds[0]),
                              2 / (bounds[3] - bounds[2]),
                              2 / (bounds[5] - bounds[4])
-        };
+                            };
 
         // translate factors
         f[1] = new double[] { -(bounds[1] + bounds[0]) / (bounds[1] - bounds[0]), -(bounds[3] + bounds[2]) / (bounds[3] - bounds[2]), -(bounds[5] + bounds[4]) / (bounds[5] - bounds[4])};
index 22b76d5..184c56d 100644 (file)
@@ -501,6 +501,34 @@ public class AxisProperty {
     }
 
     /**
+     * @return the ticks labels format
+     */
+    public String getFormat() {
+        return ticks.getFormat();
+    }
+
+    /**
+     * @param format the ticks labels format set
+     */
+    public UpdateStatus setFormat(String format) {
+        return ticks.setFormat(format);
+    }
+
+    /**
+     * @return the ticks labels scale-translate factors
+     */
+    public Double[] getSTFactors() {
+        return ticks.getSTFactors();
+    }
+
+    /**
+     * @param factors the ticks labels scale-translate factors
+     */
+    public UpdateStatus setSTFactors(Double[] factors) {
+        return ticks.setSTFactors(factors);
+    }
+
+    /**
      * Supposes all ticks labels have the same font color.
      * To be corrected.
      * @return the ticks labels font color
@@ -535,5 +563,4 @@ public class AxisProperty {
     public UpdateStatus setFontFractional(Boolean fontFractional) {
         return ticks.setFontFractional(fontFractional);
     }
-
 }
index b07002f..bc738fd 100644 (file)
@@ -41,6 +41,9 @@ public class TicksProperty {
     /** Default font */
     private Font defaultFont;
 
+    private String format = "";
+    private Double[] st_factors = new Double[] {1., 0.};
+
     /** TicksArrays class */
     private class TicksArrays {
         /** Ticks locations */
@@ -356,6 +359,8 @@ public class TicksProperty {
         auto = ticksProperty.auto;
 
         subticks = ticksProperty.subticks;
+        format = ticksProperty.format;
+        st_factors = ticksProperty.st_factors;
 
         defaultFont = new Font(ticksProperty.defaultFont);
 
@@ -386,6 +391,44 @@ public class TicksProperty {
     }
 
     /**
+     * @return the format
+     */
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * @param format the format to set
+     */
+    public UpdateStatus setFormat(String format) {
+        if (!this.format.equals(format)) {
+            this.format = format;
+            return UpdateStatus.Success;
+        }
+
+        return UpdateStatus.NoChange;
+    }
+
+    /**
+     * @return the format
+     */
+    public Double[] getSTFactors() {
+        return st_factors;
+    }
+
+    /**
+     * @param format the format to set
+     */
+    public UpdateStatus setSTFactors(Double[] factors) {
+        if (!this.st_factors[0].equals(factors[0]) || !this.st_factors[1].equals(factors[1])) {
+            this.st_factors = factors;
+            return UpdateStatus.Success;
+        }
+
+        return UpdateStatus.NoChange;
+    }
+
+    /**
      * @return the auto
      */
     public Boolean getAuto() {
index a146823..362c8c3 100755 (executable)
@@ -139,268 +139,274 @@ public class GraphicObjectProperties {
     public static final int __GO_X_AXIS_LOCATION__ = 116;
     public static final int __GO_X_AXIS_LOG_FLAG__ = 117;
     public static final int __GO_X_AXIS_TICKS__ = 118;
-    public static final int __GO_X_AXIS_AUTO_TICKS__ = 119;
-    public static final int __GO_X_AXIS_NUMBER_TICKS__ = 120;
-    public static final int __GO_X_AXIS_TICKS_LOCATIONS__ = 121;
-    public static final int __GO_X_AXIS_TICKS_LABELS__ = 122;
-    public static final int __GO_X_AXIS_SUBTICKS__ = 123;
-    public static final int __GO_Y_AXIS_VISIBLE__ = 124;
-    public static final int __GO_Y_AXIS_REVERSE__ = 125;
-    public static final int __GO_Y_AXIS_GRID_COLOR__ = 126;
-    public static final int __GO_Y_AXIS_GRID_THICKNESS__ = 127;
-    public static final int __GO_Y_AXIS_GRID_STYLE__ = 128;
-    public static final int __GO_Y_AXIS_LABEL__ = 129;
-    public static final int __GO_Y_AXIS_LOCATION__ = 130;
-    public static final int __GO_Y_AXIS_LOG_FLAG__ = 131;
-    public static final int __GO_Y_AXIS_TICKS__ = 132;
-    public static final int __GO_Y_AXIS_AUTO_TICKS__ = 133;
-    public static final int __GO_Y_AXIS_NUMBER_TICKS__ = 134;
-    public static final int __GO_Y_AXIS_TICKS_LOCATIONS__ = 135;
-    public static final int __GO_Y_AXIS_TICKS_LABELS__ = 136;
-    public static final int __GO_Y_AXIS_SUBTICKS__ = 137;
-    public static final int __GO_Z_AXIS_VISIBLE__ = 138;
-    public static final int __GO_Z_AXIS_REVERSE__ = 139;
-    public static final int __GO_Z_AXIS_GRID_COLOR__ = 140;
-    public static final int __GO_Z_AXIS_GRID_THICKNESS__ = 141;
-    public static final int __GO_Z_AXIS_GRID_STYLE__ = 142;
-    public static final int __GO_Z_AXIS_LABEL__ = 143;
-    public static final int __GO_Z_AXIS_LOCATION__ = 144;
-    public static final int __GO_Z_AXIS_LOG_FLAG__ = 145;
-    public static final int __GO_Z_AXIS_TICKS__ = 146;
-    public static final int __GO_Z_AXIS_AUTO_TICKS__ = 147;
-    public static final int __GO_Z_AXIS_NUMBER_TICKS__ = 148;
-    public static final int __GO_Z_AXIS_TICKS_LOCATIONS__ = 149;
-    public static final int __GO_Z_AXIS_TICKS_LABELS__ = 150;
-    public static final int __GO_Z_AXIS_SUBTICKS__ = 151;
-    public static final int __GO_AUTO_SUBTICKS__ = 152;
-    public static final int __GO_GRID_POSITION__ = 153;
-    public static final int __GO_TITLE__ = 154;
-    public static final int __GO_AUTO_CLEAR__ = 155;
-    public static final int __GO_FILLED__ = 156;
-    public static final int __GO_CAMERA__ = 157;
-    public static final int __GO_VIEW__ = 158;
-    public static final int __GO_ISOVIEW__ = 159;
-    public static final int __GO_CUBE_SCALING__ = 160;
-    public static final int __GO_ROTATION_ANGLES__ = 161;
-    public static final int __GO_ROTATION_ANGLES_3D__ = 162;
-    public static final int __GO_BOX_TYPE__ = 163;
-    public static final int __GO_HIDDEN_AXIS_COLOR__ = 164;
-    public static final int __GO_TIGHT_LIMITS__ = 165;
-    public static final int __GO_DATA_BOUNDS__ = 166;
-    public static final int __GO_REAL_DATA_BOUNDS__ = 167;
-    public static final int __GO_ZOOM_ENABLED__ = 168;
-    public static final int __GO_ZOOM_BOX__ = 169;
-    public static final int __GO_AUTO_SCALE__ = 170;
-    public static final int __GO_FIRST_PLOT__ = 171;
-    public static final int __GO_MARGINS__ = 172;
-    public static final int __GO_AUTO_MARGINS__ = 173;
-    public static final int __GO_AXES_BOUNDS__ = 174;
-    public static final int __GO_CLIP_PROPERTY__ = 175;
-    public static final int __GO_CLIP_STATE__ = 176;
-    public static final int __GO_CLIP_BOX__ = 177;
-    public static final int __GO_CLIP_BOX_SET__ = 178;
-    public static final int __GO_LINE__ = 179;
-    public static final int __GO_LINE_MODE__ = 180;
-    public static final int __GO_LINE_STYLE__ = 181;
-    public static final int __GO_LINE_THICKNESS__ = 182;
-    public static final int __GO_LINE_COLOR__ = 183;
-    public static final int __GO_FILL_MODE__ = 184;
-    public static final int __GO_MARK__ = 185;
-    public static final int __GO_MARK_MODE__ = 186;
-    public static final int __GO_MARK_STYLE__ = 187;
-    public static final int __GO_MARK_SIZE_UNIT__ = 188;
-    public static final int __GO_MARK_SIZE__ = 189;
-    public static final int __GO_MARK_FOREGROUND__ = 190;
-    public static final int __GO_MARK_BACKGROUND__ = 191;
-    public static final int __GO_MARK_OFFSET__ = 192;
-    public static final int __GO_MARK_STRIDE__ = 193;
-    public static final int __GO_TICKS_DIRECTION__ = 194;
-    public static final int __GO_X_NUMBER_TICKS__ = 195;
-    public static final int __GO_Y_NUMBER_TICKS__ = 196;
-    public static final int __GO_X_TICKS_COORDS__ = 197;
-    public static final int __GO_Y_TICKS_COORDS__ = 198;
-    public static final int __GO_TICKS_COLOR__ = 199;
-    public static final int __GO_TICKS_SEGMENT__ = 200;
-    public static final int __GO_TICKS_STYLE__ = 201;
-    public static final int __GO_SUBTICKS__ = 202;
-    public static final int __GO_NUMBER_TICKS_LABELS__ = 203;
-    public static final int __GO_TICKS_LABELS__ = 204;
-    public static final int __GO_FORMATN__ = 205;
-    public static final int __GO_FONT__ = 206;
-    public static final int __GO_FONT_STYLE__ = 207;
-    public static final int __GO_FONT_SIZE__ = 208;
-    public static final int __GO_FONT_COLOR__ = 209;
-    public static final int __GO_FONT_FRACTIONAL__ = 210;
-    public static final int __GO_Z_BOUNDS__ = 211;
-    public static final int __GO_OUTSIDE_COLOR__ = 212;
-    public static final int __GO_COLOR_RANGE__ = 213;
-    public static final int __GO_DATA_MAPPING__ = 214;
-    public static final int __GO_FONT_ANGLE__ = 215;
-    public static final int __GO_AUTO_POSITION__ = 216;
-    public static final int __GO_CORNERS__ = 217;
-    public static final int __GO_AUTO_ROTATION__ = 218;
-    public static final int __GO_LINKS__ = 219;
-    public static final int __GO_LINKS_COUNT__ = 220;
-    public static final int __GO_LEGEND_LOCATION__ = 221;
-    public static final int __GO_MARKS_COUNT__ = 222;
-    public static final int __GO_LINE_WIDTH__ = 223;
-    public static final int __GO_CLOSED__ = 224;
-    public static final int __GO_ARROW_SIZE_FACTOR__ = 225;
-    public static final int __GO_POLYLINE_STYLE__ = 226;
-    public static final int __GO_INTERP_COLOR_VECTOR__ = 227;
-    public static final int __GO_INTERP_COLOR_VECTOR_SET__ = 228;
-    public static final int __GO_INTERP_COLOR_MODE__ = 229;
-    public static final int __GO_X_SHIFT__ = 230;
-    public static final int __GO_Y_SHIFT__ = 231;
-    public static final int __GO_Z_SHIFT__ = 232;
-    public static final int __GO_BAR_WIDTH__ = 233;
-    public static final int __GO_SURFACE_MODE__ = 234;
-    public static final int __GO_COLOR_MODE__ = 235;
-    public static final int __GO_COLOR_FLAG__ = 236;
-    public static final int __GO_ALIGNMENT__ = 237;
-    public static final int __GO_BOX__ = 238;
-    public static final int __GO_TEXT_BOX__ = 239;
-    public static final int __GO_TEXT_BOX_MODE__ = 240;
-    public static final int __GO_AUTO_DIMENSIONING__ = 241;
-    public static final int __GO_FORMATTED_TEXT__ = 242;
-    public static final int __GO_TEXT_ARRAY_DIMENSIONS__ = 243;
-    public static final int __GO_TEXT_STRINGS__ = 244;
-    public static final int __GO_BASE__ = 245;
-    public static final int __GO_BASE_X__ = 246;
-    public static final int __GO_BASE_Y__ = 247;
-    public static final int __GO_BASE_Z__ = 248;
-    public static final int __GO_DIRECTION__ = 249;
-    public static final int __GO_DIRECTION_X__ = 250;
-    public static final int __GO_DIRECTION_Y__ = 251;
-    public static final int __GO_DIRECTION_Z__ = 252;
-    public static final int __GO_ARROW_SIZE__ = 253;
-    public static final int __GO_SEGS_COLORS__ = 254;
-    public static final int __GO_COLORED__ = 255;
-    public static final int __GO_ARROWS__ = 256;
-    public static final int __GO_NUMBER_ARROWS__ = 257;
-    public static final int __GO_CHAMP_DIMENSIONS__ = 258;
-    public static final int __GO_BOUNDING_BOX__ = 259;
-    public static final int __GO_MAX_LENGTH__ = 260;
-    public static final int __GO_MAX_USABLE_LENGTH__ = 261;
-    public static final int __GO_HIDDEN_COLOR__ = 262;
-    public static final int __GO_STYLE__ = 263;
-    public static final int __GO_UI_CHECKBOX__ = 264;
-    public static final int __GO_UI_EDIT__ = 265;
-    public static final int __GO_UI_FRAME__ = 266;
-    public static final int __GO_UI_FRAME_SCROLLABLE__ = 267;
-    public static final int __GO_UI_IMAGE__ = 268;
-    public static final int __GO_UI_LISTBOX__ = 269;
-    public static final int __GO_UI_POPUPMENU__ = 270;
-    public static final int __GO_UI_PUSHBUTTON__ = 271;
-    public static final int __GO_UI_RADIOBUTTON__ = 272;
-    public static final int __GO_UI_SLIDER__ = 273;
-    public static final int __GO_UI_TABLE__ = 274;
-    public static final int __GO_UI_TEXT__ = 275;
-    public static final int __GO_UI_LAYER__ = 276;
-    public static final int __GO_UI_BACKGROUNDCOLOR__ = 277;
-    public static final int __GO_UI_ENABLE__ = 278;
-    public static final int __GO_UI_FONTANGLE__ = 279;
-    public static final int __GO_UI_FONTNAME__ = 280;
-    public static final int __GO_UI_FONTSIZE__ = 281;
-    public static final int __GO_UI_FONTUNITS__ = 282;
-    public static final int __GO_UI_FONTWEIGHT__ = 283;
-    public static final int __GO_UI_FOREGROUNDCOLOR__ = 284;
-    public static final int __GO_UI_HORIZONTALALIGNMENT__ = 285;
-    public static final int __GO_UI_LISTBOXTOP__ = 286;
-    public static final int __GO_UI_LISTBOXTOP_SIZE__ = 287;
-    public static final int __GO_UI_MAX__ = 288;
-    public static final int __GO_UI_MIN__ = 289;
-    public static final int __GO_UI_RELIEF__ = 290;
-    public static final int __GO_UI_STRING__ = 291;
-    public static final int __GO_UI_TAB_STRING__ = 292;
-    public static final int __GO_UI_STRING_SIZE__ = 293;
-    public static final int __GO_UI_STRING_COLNB__ = 294;
-    public static final int __GO_UI_TOOLTIPSTRING__ = 295;
-    public static final int __GO_UI_TOOLTIPSTRING_SIZE__ = 296;
-    public static final int __GO_UI_SLIDERSTEP__ = 297;
-    public static final int __GO_UI_UNITS__ = 298;
-    public static final int __GO_UI_VALUE__ = 299;
-    public static final int __GO_UI_TAB_VALUE__ = 300;
-    public static final int __GO_UI_VALUE_SIZE__ = 301;
-    public static final int __GO_UI_VERTICALALIGNMENT__ = 302;
-    public static final int __GO_UIPARENTMENU__ = 303;
-    public static final int __GO_UICHILDMENU__ = 304;
-    public static final int __GO_UICHECKEDMENU__ = 305;
-    public static final int __GO_UI_CHECKED__ = 306;
-    public static final int __GO_UI_LABEL__ = 307;
-    public static final int __GO_UI_MNEMONIC__ = 308;
-    public static final int __GO_UI_ACCELERATOR__ = 309;
-    public static final int __GO_UI_SEPARATOR__ = 310;
-    public static final int __GO_UI_ICON__ = 311;
-    public static final int __GO_CONSOLE__ = 312;
-    public static final int __GO_SHOWHIDDENHANDLES__ = 313;
-    public static final int __GO_USEDEPRECATEDLF__ = 314;
-    public static final int __GO_WAITBAR__ = 315;
-    public static final int __GO_PROGRESSIONBAR__ = 316;
-    public static final int __GO_UI_MESSAGE__ = 317;
-    public static final int __GO_UI_MESSAGE_SIZE__ = 318;
-    public static final int __GO_DATATIP__ = 319;
-    public static final int __GO_DATATIP_DATA__ = 320;
-    public static final int __GO_DATATIP_ORIENTATION__ = 321;
-    public static final int __GO_DATATIP_3COMPONENT__ = 322;
-    public static final int __GO_DATATIP_AUTOORIENTATION__ = 323;
-    public static final int __GO_DATATIP_INTERP_MODE__ = 324;
-    public static final int __GO_DATATIP_DISPLAY_FNC__ = 325;
-    public static final int __GO_DATATIP_BOX_MODE__ = 326;
-    public static final int __GO_DATATIP_LABEL_MODE__ = 327;
-    public static final int __GO_DATATIP_MARK__ = 328;
-    public static final int __GO_AMBIENTCOLOR__ = 329;
-    public static final int __GO_DIFFUSECOLOR__ = 330;
-    public static final int __GO_SPECULARCOLOR__ = 331;
-    public static final int __GO_COLOR_MATERIAL__ = 332;
-    public static final int __GO_MATERIAL_SHININESS__ = 333;
-    public static final int __GO_LIGHT__ = 334;
-    public static final int __GO_LIGHT_TYPE__ = 335;
-    public static final int __GO_DATATIPS__ = 336;
-    public static final int __GO_DATATIPS_COUNT__ = 337;
-    public static final int __GO_DATATIP_INDEXES__ = 338;
-    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION__ = 339;
-    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ = 340;
-    public static final int __GO_RESIZE__ = 341;
-    public static final int __GO_TOOLBAR__ = 342;
-    public static final int __GO_TOOLBAR_VISIBLE__ = 343;
-    public static final int __GO_MENUBAR__ = 344;
-    public static final int __GO_MENUBAR_VISIBLE__ = 345;
-    public static final int __GO_INFOBAR_VISIBLE__ = 346;
-    public static final int __GO_DOCKABLE__ = 347;
-    public static final int __GO_LAYOUT__ = 348;
-    public static final int __GO_LAYOUT_SET__ = 349;
-    public static final int __GO_UI_TAB__ = 350;
-    public static final int __GO_UI_GRIDBAG_GRID__ = 351;
-    public static final int __GO_UI_GRIDBAG_WEIGHT__ = 352;
-    public static final int __GO_UI_GRIDBAG_FILL__ = 353;
-    public static final int __GO_UI_GRIDBAG_ANCHOR__ = 354;
-    public static final int __GO_UI_GRIDBAG_PADDING__ = 355;
-    public static final int __GO_UI_GRIDBAG_PREFERREDSIZE__ = 356;
-    public static final int __GO_UI_GRID_GRID__ = 357;
-    public static final int __GO_UI_GRID_PADDING__ = 358;
-    public static final int __GO_UI_BORDER_POSITION__ = 359;
-    public static final int __GO_UI_BORDER_PREFERREDSIZE__ = 360;
-    public static final int __GO_GRID_OPT_GRID__ = 361;
-    public static final int __GO_GRID_OPT_PADDING__ = 362;
-    public static final int __GO_BORDER_OPT_PADDING__ = 363;
-    public static final int __GO_UI_FRAME_BORDER__ = 364;
-    public static final int __GO_UI_FRAME_BORDER_COLOR__ = 365;
-    public static final int __GO_UI_FRAME_BORDER_HIGHLIGHT_IN__ = 366;
-    public static final int __GO_UI_FRAME_BORDER_HIGHLIGHT_OUT__ = 367;
-    public static final int __GO_UI_FRAME_BORDER_IN_BORDER__ = 368;
-    public static final int __GO_UI_FRAME_BORDER_JUSTIFICATION__ = 369;
-    public static final int __GO_UI_FRAME_BORDER_OUT_BORDER__ = 370;
-    public static final int __GO_UI_FRAME_BORDER_ROUNDED__ = 371;
-    public static final int __GO_UI_FRAME_BORDER_SHADOW_IN__ = 372;
-    public static final int __GO_UI_FRAME_BORDER_SHADOW_OUT__ = 373;
-    public static final int __GO_UI_FRAME_BORDER_TITLE__ = 374;
-    public static final int __GO_UI_FRAME_BORDER_POSITION__ = 375;
-    public static final int __GO_UI_FRAME_BORDER_STYLE__ = 376;
-    public static final int __GO_UI_GROUP_NAME__ = 377;
-    public static final int __GO_UI_TITLE_POSITION__ = 378;
-    public static final int __GO_UI_TITLE_SCROLL__ = 379;
-    public static final int __GO_UI_FRAME_BORDER_TYPE__ = 380;
-    public static final int __GO_UI_SCROLLABLE__ = 381;
+    public static final int __GO_X_AXIS_FORMAT__ = 119;
+    public static final int __GO_X_AXIS_ST_FACTORS__ = 120;
+    public static final int __GO_X_AXIS_AUTO_TICKS__ = 121;
+    public static final int __GO_X_AXIS_NUMBER_TICKS__ = 122;
+    public static final int __GO_X_AXIS_TICKS_LOCATIONS__ = 123;
+    public static final int __GO_X_AXIS_TICKS_LABELS__ = 124;
+    public static final int __GO_X_AXIS_SUBTICKS__ = 125;
+    public static final int __GO_Y_AXIS_VISIBLE__ = 126;
+    public static final int __GO_Y_AXIS_REVERSE__ = 127;
+    public static final int __GO_Y_AXIS_GRID_COLOR__ = 128;
+    public static final int __GO_Y_AXIS_GRID_THICKNESS__ = 129;
+    public static final int __GO_Y_AXIS_GRID_STYLE__ = 130;
+    public static final int __GO_Y_AXIS_LABEL__ = 131;
+    public static final int __GO_Y_AXIS_LOCATION__ = 132;
+    public static final int __GO_Y_AXIS_LOG_FLAG__ = 133;
+    public static final int __GO_Y_AXIS_TICKS__ = 134;
+    public static final int __GO_Y_AXIS_FORMAT__ = 135;
+    public static final int __GO_Y_AXIS_ST_FACTORS__ = 136;
+    public static final int __GO_Y_AXIS_AUTO_TICKS__ = 137;
+    public static final int __GO_Y_AXIS_NUMBER_TICKS__ = 138;
+    public static final int __GO_Y_AXIS_TICKS_LOCATIONS__ = 139;
+    public static final int __GO_Y_AXIS_TICKS_LABELS__ = 140;
+    public static final int __GO_Y_AXIS_SUBTICKS__ = 141;
+    public static final int __GO_Z_AXIS_VISIBLE__ = 142;
+    public static final int __GO_Z_AXIS_REVERSE__ = 143;
+    public static final int __GO_Z_AXIS_GRID_COLOR__ = 144;
+    public static final int __GO_Z_AXIS_GRID_THICKNESS__ = 145;
+    public static final int __GO_Z_AXIS_GRID_STYLE__ = 146;
+    public static final int __GO_Z_AXIS_LABEL__ = 147;
+    public static final int __GO_Z_AXIS_LOCATION__ = 148;
+    public static final int __GO_Z_AXIS_LOG_FLAG__ = 149;
+    public static final int __GO_Z_AXIS_TICKS__ = 150;
+    public static final int __GO_Z_AXIS_FORMAT__ = 151;
+    public static final int __GO_Z_AXIS_ST_FACTORS__ = 152;
+    public static final int __GO_Z_AXIS_AUTO_TICKS__ = 153;
+    public static final int __GO_Z_AXIS_NUMBER_TICKS__ = 154;
+    public static final int __GO_Z_AXIS_TICKS_LOCATIONS__ = 155;
+    public static final int __GO_Z_AXIS_TICKS_LABELS__ = 156;
+    public static final int __GO_Z_AXIS_SUBTICKS__ = 157;
+    public static final int __GO_AUTO_SUBTICKS__ = 158;
+    public static final int __GO_GRID_POSITION__ = 159;
+    public static final int __GO_TITLE__ = 160;
+    public static final int __GO_AUTO_CLEAR__ = 161;
+    public static final int __GO_FILLED__ = 162;
+    public static final int __GO_CAMERA__ = 163;
+    public static final int __GO_VIEW__ = 164;
+    public static final int __GO_ISOVIEW__ = 165;
+    public static final int __GO_CUBE_SCALING__ = 166;
+    public static final int __GO_ROTATION_ANGLES__ = 167;
+    public static final int __GO_ROTATION_ANGLES_3D__ = 168;
+    public static final int __GO_BOX_TYPE__ = 169;
+    public static final int __GO_HIDDEN_AXIS_COLOR__ = 170;
+    public static final int __GO_TIGHT_LIMITS__ = 171;
+    public static final int __GO_DATA_BOUNDS__ = 172;
+    public static final int __GO_REAL_DATA_BOUNDS__ = 173;
+    public static final int __GO_ZOOM_ENABLED__ = 174;
+    public static final int __GO_ZOOM_BOX__ = 175;
+    public static final int __GO_AUTO_SCALE__ = 176;
+    public static final int __GO_FIRST_PLOT__ = 177;
+    public static final int __GO_MARGINS__ = 178;
+    public static final int __GO_AUTO_MARGINS__ = 179;
+    public static final int __GO_AXES_BOUNDS__ = 180;
+    public static final int __GO_CLIP_PROPERTY__ = 181;
+    public static final int __GO_CLIP_STATE__ = 182;
+    public static final int __GO_CLIP_BOX__ = 183;
+    public static final int __GO_CLIP_BOX_SET__ = 184;
+    public static final int __GO_LINE__ = 185;
+    public static final int __GO_LINE_MODE__ = 186;
+    public static final int __GO_LINE_STYLE__ = 187;
+    public static final int __GO_LINE_THICKNESS__ = 188;
+    public static final int __GO_LINE_COLOR__ = 189;
+    public static final int __GO_FILL_MODE__ = 190;
+    public static final int __GO_MARK__ = 191;
+    public static final int __GO_MARK_MODE__ = 192;
+    public static final int __GO_MARK_STYLE__ = 193;
+    public static final int __GO_MARK_SIZE_UNIT__ = 194;
+    public static final int __GO_MARK_SIZE__ = 195;
+    public static final int __GO_MARK_FOREGROUND__ = 196;
+    public static final int __GO_MARK_BACKGROUND__ = 197;
+    public static final int __GO_MARK_OFFSET__ = 198;
+    public static final int __GO_MARK_STRIDE__ = 199;
+    public static final int __GO_TICKS_DIRECTION__ = 200;
+    public static final int __GO_X_NUMBER_TICKS__ = 201;
+    public static final int __GO_Y_NUMBER_TICKS__ = 202;
+    public static final int __GO_X_TICKS_COORDS__ = 203;
+    public static final int __GO_Y_TICKS_COORDS__ = 204;
+    public static final int __GO_TICKS_COLOR__ = 205;
+    public static final int __GO_TICKS_SEGMENT__ = 206;
+    public static final int __GO_TICKS_STYLE__ = 207;
+    public static final int __GO_SUBTICKS__ = 208;
+    public static final int __GO_NUMBER_TICKS_LABELS__ = 209;
+    public static final int __GO_TICKS_LABELS__ = 210;
+    public static final int __GO_FORMATN__ = 211;
+    public static final int __GO_FONT__ = 212;
+    public static final int __GO_FONT_STYLE__ = 213;
+    public static final int __GO_FONT_SIZE__ = 214;
+    public static final int __GO_FONT_COLOR__ = 215;
+    public static final int __GO_FONT_FRACTIONAL__ = 216;
+    public static final int __GO_Z_BOUNDS__ = 217;
+    public static final int __GO_OUTSIDE_COLOR__ = 218;
+    public static final int __GO_COLOR_RANGE__ = 219;
+    public static final int __GO_DATA_MAPPING__ = 220;
+    public static final int __GO_FONT_ANGLE__ = 221;
+    public static final int __GO_AUTO_POSITION__ = 222;
+    public static final int __GO_CORNERS__ = 223;
+    public static final int __GO_AUTO_ROTATION__ = 224;
+    public static final int __GO_LINKS__ = 225;
+    public static final int __GO_LINKS_COUNT__ = 226;
+    public static final int __GO_LEGEND_LOCATION__ = 227;
+    public static final int __GO_MARKS_COUNT__ = 228;
+    public static final int __GO_LINE_WIDTH__ = 229;
+    public static final int __GO_CLOSED__ = 230;
+    public static final int __GO_ARROW_SIZE_FACTOR__ = 231;
+    public static final int __GO_POLYLINE_STYLE__ = 232;
+    public static final int __GO_INTERP_COLOR_VECTOR__ = 233;
+    public static final int __GO_INTERP_COLOR_VECTOR_SET__ = 234;
+    public static final int __GO_INTERP_COLOR_MODE__ = 235;
+    public static final int __GO_X_SHIFT__ = 236;
+    public static final int __GO_Y_SHIFT__ = 237;
+    public static final int __GO_Z_SHIFT__ = 238;
+    public static final int __GO_BAR_WIDTH__ = 239;
+    public static final int __GO_SURFACE_MODE__ = 240;
+    public static final int __GO_COLOR_MODE__ = 241;
+    public static final int __GO_COLOR_FLAG__ = 242;
+    public static final int __GO_ALIGNMENT__ = 243;
+    public static final int __GO_BOX__ = 244;
+    public static final int __GO_TEXT_BOX__ = 245;
+    public static final int __GO_TEXT_BOX_MODE__ = 246;
+    public static final int __GO_AUTO_DIMENSIONING__ = 247;
+    public static final int __GO_FORMATTED_TEXT__ = 248;
+    public static final int __GO_TEXT_ARRAY_DIMENSIONS__ = 249;
+    public static final int __GO_TEXT_STRINGS__ = 250;
+    public static final int __GO_BASE__ = 251;
+    public static final int __GO_BASE_X__ = 252;
+    public static final int __GO_BASE_Y__ = 253;
+    public static final int __GO_BASE_Z__ = 254;
+    public static final int __GO_DIRECTION__ = 255;
+    public static final int __GO_DIRECTION_X__ = 256;
+    public static final int __GO_DIRECTION_Y__ = 257;
+    public static final int __GO_DIRECTION_Z__ = 258;
+    public static final int __GO_ARROW_SIZE__ = 259;
+    public static final int __GO_SEGS_COLORS__ = 260;
+    public static final int __GO_COLORED__ = 261;
+    public static final int __GO_ARROWS__ = 262;
+    public static final int __GO_NUMBER_ARROWS__ = 263;
+    public static final int __GO_CHAMP_DIMENSIONS__ = 264;
+    public static final int __GO_BOUNDING_BOX__ = 265;
+    public static final int __GO_MAX_LENGTH__ = 266;
+    public static final int __GO_MAX_USABLE_LENGTH__ = 267;
+    public static final int __GO_HIDDEN_COLOR__ = 268;
+    public static final int __GO_STYLE__ = 269;
+    public static final int __GO_UI_CHECKBOX__ = 270;
+    public static final int __GO_UI_EDIT__ = 271;
+    public static final int __GO_UI_FRAME__ = 272;
+    public static final int __GO_UI_FRAME_SCROLLABLE__ = 273;
+    public static final int __GO_UI_IMAGE__ = 274;
+    public static final int __GO_UI_LISTBOX__ = 275;
+    public static final int __GO_UI_POPUPMENU__ = 276;
+    public static final int __GO_UI_PUSHBUTTON__ = 277;
+    public static final int __GO_UI_RADIOBUTTON__ = 278;
+    public static final int __GO_UI_SLIDER__ = 279;
+    public static final int __GO_UI_TABLE__ = 280;
+    public static final int __GO_UI_TEXT__ = 281;
+    public static final int __GO_UI_LAYER__ = 282;
+    public static final int __GO_UI_BACKGROUNDCOLOR__ = 283;
+    public static final int __GO_UI_ENABLE__ = 284;
+    public static final int __GO_UI_FONTANGLE__ = 285;
+    public static final int __GO_UI_FONTNAME__ = 286;
+    public static final int __GO_UI_FONTSIZE__ = 287;
+    public static final int __GO_UI_FONTUNITS__ = 288;
+    public static final int __GO_UI_FONTWEIGHT__ = 289;
+    public static final int __GO_UI_FOREGROUNDCOLOR__ = 290;
+    public static final int __GO_UI_HORIZONTALALIGNMENT__ = 291;
+    public static final int __GO_UI_LISTBOXTOP__ = 292;
+    public static final int __GO_UI_LISTBOXTOP_SIZE__ = 293;
+    public static final int __GO_UI_MAX__ = 294;
+    public static final int __GO_UI_MIN__ = 295;
+    public static final int __GO_UI_RELIEF__ = 296;
+    public static final int __GO_UI_STRING__ = 297;
+    public static final int __GO_UI_TAB_STRING__ = 298;
+    public static final int __GO_UI_STRING_SIZE__ = 299;
+    public static final int __GO_UI_STRING_COLNB__ = 300;
+    public static final int __GO_UI_TOOLTIPSTRING__ = 301;
+    public static final int __GO_UI_TOOLTIPSTRING_SIZE__ = 302;
+    public static final int __GO_UI_SLIDERSTEP__ = 303;
+    public static final int __GO_UI_UNITS__ = 304;
+    public static final int __GO_UI_VALUE__ = 305;
+    public static final int __GO_UI_TAB_VALUE__ = 306;
+    public static final int __GO_UI_VALUE_SIZE__ = 307;
+    public static final int __GO_UI_VERTICALALIGNMENT__ = 308;
+    public static final int __GO_UIPARENTMENU__ = 309;
+    public static final int __GO_UICHILDMENU__ = 310;
+    public static final int __GO_UICHECKEDMENU__ = 311;
+    public static final int __GO_UI_CHECKED__ = 312;
+    public static final int __GO_UI_LABEL__ = 313;
+    public static final int __GO_UI_MNEMONIC__ = 314;
+    public static final int __GO_UI_ACCELERATOR__ = 315;
+    public static final int __GO_UI_SEPARATOR__ = 316;
+    public static final int __GO_UI_ICON__ = 317;
+    public static final int __GO_CONSOLE__ = 318;
+    public static final int __GO_SHOWHIDDENHANDLES__ = 319;
+    public static final int __GO_USEDEPRECATEDLF__ = 320;
+    public static final int __GO_WAITBAR__ = 321;
+    public static final int __GO_PROGRESSIONBAR__ = 322;
+    public static final int __GO_UI_MESSAGE__ = 323;
+    public static final int __GO_UI_MESSAGE_SIZE__ = 324;
+    public static final int __GO_DATATIP__ = 325;
+    public static final int __GO_DATATIP_DATA__ = 326;
+    public static final int __GO_DATATIP_ORIENTATION__ = 327;
+    public static final int __GO_DATATIP_3COMPONENT__ = 328;
+    public static final int __GO_DATATIP_AUTOORIENTATION__ = 329;
+    public static final int __GO_DATATIP_INTERP_MODE__ = 330;
+    public static final int __GO_DATATIP_DISPLAY_FNC__ = 331;
+    public static final int __GO_DATATIP_BOX_MODE__ = 332;
+    public static final int __GO_DATATIP_LABEL_MODE__ = 333;
+    public static final int __GO_DATATIP_MARK__ = 334;
+    public static final int __GO_AMBIENTCOLOR__ = 335;
+    public static final int __GO_DIFFUSECOLOR__ = 336;
+    public static final int __GO_SPECULARCOLOR__ = 337;
+    public static final int __GO_COLOR_MATERIAL__ = 338;
+    public static final int __GO_MATERIAL_SHININESS__ = 339;
+    public static final int __GO_LIGHT__ = 340;
+    public static final int __GO_LIGHT_TYPE__ = 341;
+    public static final int __GO_DATATIPS__ = 342;
+    public static final int __GO_DATATIPS_COUNT__ = 343;
+    public static final int __GO_DATATIP_INDEXES__ = 344;
+    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION__ = 345;
+    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ = 346;
+    public static final int __GO_RESIZE__ = 347;
+    public static final int __GO_TOOLBAR__ = 348;
+    public static final int __GO_TOOLBAR_VISIBLE__ = 349;
+    public static final int __GO_MENUBAR__ = 350;
+    public static final int __GO_MENUBAR_VISIBLE__ = 351;
+    public static final int __GO_INFOBAR_VISIBLE__ = 352;
+    public static final int __GO_DOCKABLE__ = 353;
+    public static final int __GO_LAYOUT__ = 354;
+    public static final int __GO_LAYOUT_SET__ = 355;
+    public static final int __GO_UI_TAB__ = 356;
+    public static final int __GO_UI_GRIDBAG_GRID__ = 357;
+    public static final int __GO_UI_GRIDBAG_WEIGHT__ = 358;
+    public static final int __GO_UI_GRIDBAG_FILL__ = 359;
+    public static final int __GO_UI_GRIDBAG_ANCHOR__ = 360;
+    public static final int __GO_UI_GRIDBAG_PADDING__ = 361;
+    public static final int __GO_UI_GRIDBAG_PREFERREDSIZE__ = 362;
+    public static final int __GO_UI_GRID_GRID__ = 363;
+    public static final int __GO_UI_GRID_PADDING__ = 364;
+    public static final int __GO_UI_BORDER_POSITION__ = 365;
+    public static final int __GO_UI_BORDER_PREFERREDSIZE__ = 366;
+    public static final int __GO_GRID_OPT_GRID__ = 367;
+    public static final int __GO_GRID_OPT_PADDING__ = 368;
+    public static final int __GO_BORDER_OPT_PADDING__ = 369;
+    public static final int __GO_UI_FRAME_BORDER__ = 370;
+    public static final int __GO_UI_FRAME_BORDER_COLOR__ = 371;
+    public static final int __GO_UI_FRAME_BORDER_HIGHLIGHT_IN__ = 372;
+    public static final int __GO_UI_FRAME_BORDER_HIGHLIGHT_OUT__ = 373;
+    public static final int __GO_UI_FRAME_BORDER_IN_BORDER__ = 374;
+    public static final int __GO_UI_FRAME_BORDER_JUSTIFICATION__ = 375;
+    public static final int __GO_UI_FRAME_BORDER_OUT_BORDER__ = 376;
+    public static final int __GO_UI_FRAME_BORDER_ROUNDED__ = 377;
+    public static final int __GO_UI_FRAME_BORDER_SHADOW_IN__ = 378;
+    public static final int __GO_UI_FRAME_BORDER_SHADOW_OUT__ = 379;
+    public static final int __GO_UI_FRAME_BORDER_TITLE__ = 380;
+    public static final int __GO_UI_FRAME_BORDER_POSITION__ = 381;
+    public static final int __GO_UI_FRAME_BORDER_STYLE__ = 382;
+    public static final int __GO_UI_GROUP_NAME__ = 383;
+    public static final int __GO_UI_TITLE_POSITION__ = 384;
+    public static final int __GO_UI_TITLE_SCROLL__ = 385;
+    public static final int __GO_UI_FRAME_BORDER_TYPE__ = 386;
+    public static final int __GO_UI_SCROLLABLE__ = 387;
 
 }
index ffc624b..21feb01 100755 (executable)
@@ -132,6 +132,8 @@ __GO_X_AXIS_LABEL__
 __GO_X_AXIS_LOCATION__
 __GO_X_AXIS_LOG_FLAG__
 __GO_X_AXIS_TICKS__
+__GO_X_AXIS_FORMAT__
+__GO_X_AXIS_ST_FACTORS__
 __GO_X_AXIS_AUTO_TICKS__
 __GO_X_AXIS_NUMBER_TICKS__
 __GO_X_AXIS_TICKS_LOCATIONS__
@@ -147,6 +149,8 @@ __GO_Y_AXIS_LABEL__
 __GO_Y_AXIS_LOCATION__
 __GO_Y_AXIS_LOG_FLAG__
 __GO_Y_AXIS_TICKS__
+__GO_Y_AXIS_FORMAT__
+__GO_Y_AXIS_ST_FACTORS__
 __GO_Y_AXIS_AUTO_TICKS__
 __GO_Y_AXIS_NUMBER_TICKS__
 __GO_Y_AXIS_TICKS_LOCATIONS__
@@ -162,6 +166,8 @@ __GO_Z_AXIS_LABEL__
 __GO_Z_AXIS_LOCATION__
 __GO_Z_AXIS_LOG_FLAG__
 __GO_Z_AXIS_TICKS__
+__GO_Z_AXIS_FORMAT__
+__GO_Z_AXIS_ST_FACTORS__
 __GO_Z_AXIS_AUTO_TICKS__
 __GO_Z_AXIS_NUMBER_TICKS__
 __GO_Z_AXIS_TICKS_LOCATIONS__
index 1a202d3..47467cc 100644 (file)
@@ -150,6 +150,8 @@ src/c/getHandleProperty/get_info_message_property.c \
 src/c/getHandleProperty/get_y_ticks_property.c \
 src/c/getHandleProperty/get_z_ticks_property.c \
 src/c/getHandleProperty/get_x_ticks_property.c \
+src/c/getHandleProperty/get_ticks_format_property.c \
+src/c/getHandleProperty/get_ticks_st_property.c \
 src/c/getHandleProperty/setGetHashTable.c \
 src/c/getHandleProperty/get_segs_color_property.c \
 src/c/getHandleProperty/get_screen_position_property.c \
@@ -296,6 +298,8 @@ src/c/getHandleProperty/set_surface_color_property.c \
 src/c/getHandleProperty/set_yticks_coord_property.c \
 src/c/getHandleProperty/CheckTicksProperty.c \
 src/c/getHandleProperty/set_x_ticks_property.c \
+src/c/getHandleProperty/set_ticks_format_property.c \
+src/c/getHandleProperty/set_ticks_st_property.c \
 src/c/getHandleProperty/set_viewport_property.c \
 src/c/getHandleProperty/set_info_message_property.c \
 src/c/getHandleProperty/set_screen_position_property.c \
index a7e6beb..712a8da 100644 (file)
@@ -297,6 +297,8 @@ am__objects_1 = src/c/libscigraphics_algo_la-GetCommandArg.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_y_ticks_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_z_ticks_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_x_ticks_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_format_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_st_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-setGetHashTable.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_segs_color_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_screen_position_property.lo \
@@ -443,6 +445,8 @@ am__objects_1 = src/c/libscigraphics_algo_la-GetCommandArg.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_yticks_coord_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-CheckTicksProperty.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_x_ticks_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_format_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_st_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_viewport_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_info_message_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_screen_position_property.lo \
@@ -1091,6 +1095,8 @@ src/c/getHandleProperty/get_info_message_property.c \
 src/c/getHandleProperty/get_y_ticks_property.c \
 src/c/getHandleProperty/get_z_ticks_property.c \
 src/c/getHandleProperty/get_x_ticks_property.c \
+src/c/getHandleProperty/get_ticks_format_property.c \
+src/c/getHandleProperty/get_ticks_st_property.c \
 src/c/getHandleProperty/setGetHashTable.c \
 src/c/getHandleProperty/get_segs_color_property.c \
 src/c/getHandleProperty/get_screen_position_property.c \
@@ -1237,6 +1243,8 @@ src/c/getHandleProperty/set_surface_color_property.c \
 src/c/getHandleProperty/set_yticks_coord_property.c \
 src/c/getHandleProperty/CheckTicksProperty.c \
 src/c/getHandleProperty/set_x_ticks_property.c \
+src/c/getHandleProperty/set_ticks_format_property.c \
+src/c/getHandleProperty/set_ticks_st_property.c \
 src/c/getHandleProperty/set_viewport_property.c \
 src/c/getHandleProperty/set_info_message_property.c \
 src/c/getHandleProperty/set_screen_position_property.c \
@@ -2021,6 +2029,12 @@ src/c/getHandleProperty/libscigraphics_algo_la-get_z_ticks_property.lo:  \
 src/c/getHandleProperty/libscigraphics_algo_la-get_x_ticks_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_format_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_st_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
 src/c/getHandleProperty/libscigraphics_algo_la-setGetHashTable.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
@@ -2458,6 +2472,12 @@ src/c/getHandleProperty/libscigraphics_algo_la-CheckTicksProperty.lo:  \
 src/c/getHandleProperty/libscigraphics_algo_la-set_x_ticks_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_format_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_st_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
 src/c/getHandleProperty/libscigraphics_algo_la-set_viewport_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
@@ -3161,6 +3181,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_text_box_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_text_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_thickness_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_ticks_format_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_ticks_st_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_tics_color_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_tics_direction_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_tics_label_property.Plo@am__quote@
@@ -3325,6 +3347,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_text_box_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_text_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_thickness_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_ticks_format_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_ticks_st_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_tics_color_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_tics_direction_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_tics_labels_property.Plo@am__quote@
@@ -4256,6 +4280,20 @@ src/c/getHandleProperty/libscigraphics_algo_la-get_x_ticks_property.lo: src/c/ge
 @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_x_ticks_property.lo `test -f 'src/c/getHandleProperty/get_x_ticks_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_x_ticks_property.c
 
+src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_format_property.lo: src/c/getHandleProperty/get_ticks_format_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_ticks_format_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_ticks_format_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_format_property.lo `test -f 'src/c/getHandleProperty/get_ticks_format_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_ticks_format_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_ticks_format_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_ticks_format_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_ticks_format_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_format_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_ticks_format_property.lo `test -f 'src/c/getHandleProperty/get_ticks_format_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_ticks_format_property.c
+
+src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_st_property.lo: src/c/getHandleProperty/get_ticks_st_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_ticks_st_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_ticks_st_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_st_property.lo `test -f 'src/c/getHandleProperty/get_ticks_st_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_ticks_st_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_ticks_st_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_ticks_st_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_ticks_st_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_ticks_st_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_ticks_st_property.lo `test -f 'src/c/getHandleProperty/get_ticks_st_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_ticks_st_property.c
+
 src/c/getHandleProperty/libscigraphics_algo_la-setGetHashTable.lo: src/c/getHandleProperty/setGetHashTable.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-setGetHashTable.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-setGetHashTable.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-setGetHashTable.lo `test -f 'src/c/getHandleProperty/setGetHashTable.c' || echo '$(srcdir)/'`src/c/getHandleProperty/setGetHashTable.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-setGetHashTable.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-setGetHashTable.Plo
@@ -5278,6 +5316,20 @@ src/c/getHandleProperty/libscigraphics_algo_la-set_x_ticks_property.lo: src/c/ge
 @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_x_ticks_property.lo `test -f 'src/c/getHandleProperty/set_x_ticks_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_x_ticks_property.c
 
+src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_format_property.lo: src/c/getHandleProperty/set_ticks_format_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_ticks_format_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_ticks_format_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_format_property.lo `test -f 'src/c/getHandleProperty/set_ticks_format_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_ticks_format_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_ticks_format_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_ticks_format_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_ticks_format_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_format_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_ticks_format_property.lo `test -f 'src/c/getHandleProperty/set_ticks_format_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_ticks_format_property.c
+
+src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_st_property.lo: src/c/getHandleProperty/set_ticks_st_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_ticks_st_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_ticks_st_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_st_property.lo `test -f 'src/c/getHandleProperty/set_ticks_st_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_ticks_st_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_ticks_st_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_ticks_st_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_ticks_st_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_ticks_st_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_ticks_st_property.lo `test -f 'src/c/getHandleProperty/set_ticks_st_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_ticks_st_property.c
+
 src/c/getHandleProperty/libscigraphics_algo_la-set_viewport_property.lo: src/c/getHandleProperty/set_viewport_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_viewport_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_viewport_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_viewport_property.lo `test -f 'src/c/getHandleProperty/set_viewport_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_viewport_property.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_viewport_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_viewport_property.Plo
index d9a9a06..731d0a9 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -398,6 +398,8 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_x_location_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_x_shift_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_x_ticks_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\get_ticks_format_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\get_ticks_st_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_xtics_coord_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_y_label_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_y_location_property.c" />
@@ -606,6 +608,8 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\set_x_location_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_x_shift_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_x_ticks_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\set_ticks_format_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\set_ticks_st_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_xtics_coord_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_y_label_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_y_location_property.c" />
@@ -739,4 +743,4 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 1e1c9d3..458a0c6 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="src\c\getHandleProperty\get_x_ticks_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\get_ticks_format_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\get_ticks_st_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\get_xtics_coord_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\set_x_ticks_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\set_ticks_format_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\set_ticks_st_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\set_xtics_coord_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
index a5c8593..f0b4bc0 100644 (file)
                             </listitem>
                         </varlistentry>
                         <varlistentry>
+                            <term>ticks_format: </term>
+                            <listitem>
+                                <para>This property specifies the format to use for each axes.
+                                    It is a row vector with at most 3 columns containing strings format (as specified for <link linkend="mprintf">mprintf</link>). Each ticks position will be used to format the string used as label.
+                                </para>
+                                <para>
+                                    So, for example ticks_format="%.2e" will print ticks positions in using scientific notation with two decimals.
+                                </para>
+                            </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                            <term>ticks_st: </term>
+                            <listitem>
+                                <para>
+                                    This property specifies scale-translate factors to apply to each ticks position before to use it in the formatted string used as label. So if the factors are <literal>[x_s y_s z_s ; x_t y_t z_t]</literal> and if a x_tick is positionned at X, the value used to format the label will be <literal>x_s*(X-x_t)</literal>. It could be particulary useful when the axes bounds are too closed.
+                                    <para>
+                                        It is a matrix with 2 rows and at most 3 columns.
+                                    </para>
+                                </para>
+                                <para>
+                                    So, for example <literal>base=B</literal>, labels could be printed with <literal>ticks_format=string(base)+"%+.2e"</literal> and <literal>ticks_st=[1 base]</literal>
+                                </para>
+                            </listitem>
+                        </varlistentry>
+                        <varlistentry>
                             <term>box: </term>
                             <listitem>
                                 <para>This property specifies whether to enclose the axes in a box.
@@ -922,6 +947,14 @@ a.x_ticks = tlist(["ticks", "locations", "labels"], (0:6)', [mathml;"1";"$\sin(x
 a.y_ticks = tlist(["ticks", "locations", "labels"], (-2:0.5:2)', ["0";"1";"2";"3";"$\cos(a)$";"5";"6";mathml;"8"]);
 
  ]]></programlisting>
+        <para/>
+        <programlisting role="example"><![CDATA[
+m=[66.425514; 66.425513];
+plot([69;70], m);
+a=gca();
+a.ticks_format=["" sprintf("%.2f", m(2))+"%+.1e"];
+a.ticks_st=[1 1;0 m(2)];
+ ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>See Also</title>
@@ -972,6 +1005,7 @@ a.y_ticks = tlist(["ticks", "locations", "labels"], (-2:0.5:2)', ["0";"1";"2";"3
                 <revnumber>5.5.0</revnumber>
                 <revremark>line_style values 9 and 10 can be used to have respectively longblank dot and bigblank dot styles.</revremark>
                 <revremark>auto_margins property added to allow automatic computation of the margins.</revremark>
+                <revremark>ticks_format and ticks_st properties added to improve ticks labels display.</revremark>
             </revision>
         </revhistory>
     </refsection>
index 6fec250..5b5bca8 100755 (executable)
@@ -173,6 +173,8 @@ function %h_p(h)
             "x_ticks.labels = "+labx
             "y_ticks.labels = "+laby
             "z_ticks.labels = "+labz
+            "ticks_format = "+sci2exp(h.ticks_format)
+            "ticks_st = "+sci2exp(h.ticks_st, 0)
             "box = "+sci2exp(h.box)
             "filled = " + sci2exp(h.filled)
             "sub_ticks = "+sci2exp(h.sub_ticks,0)
index a22fd7b..2c78930 100644 (file)
@@ -162,7 +162,7 @@ int sci_set(char *fname, unsigned long fname_len)
             case sci_strings :
                 if (strcmp(pstProperty, "tics_labels") == 0 || strcmp(pstProperty, "auto_ticks") == 0 ||
                         strcmp(pstProperty, "axes_visible") == 0 || strcmp(pstProperty, "axes_reverse") == 0 ||
-                        strcmp(pstProperty, "text") == 0)
+                        strcmp(pstProperty, "text") == 0 || strcmp(pstProperty, "ticks_format") == 0)
                 {
                     isMatrixOfString = 1;
                     if (getAllocatedMatrixOfString(pvApiCtx, piAddr2, &iRows2, &iCols2, (char***)&pvData))
@@ -374,7 +374,7 @@ int sci_set(char *fname, unsigned long fname_len)
                     if (strcmp(pstProperty, "tics_labels") != 0 && strcmp(pstProperty, "auto_ticks") != 0 &&
                             strcmp(pstProperty, "axes_visible") != 0 && strcmp(pstProperty, "axes_reverse") != 0 &&
                             strcmp(pstProperty, "text") != 0 && stricmp(pstProperty, "string") != 0 &&
-                            stricmp(pstProperty, "tooltipstring") != 0) /* Added for uicontrols */
+                            stricmp(pstProperty, "tooltipstring") != 0 && stricmp(pstProperty, "ticks_format") != 0) /* Added for uicontrols */
                     {
                         if (isScalar(pvApiCtx, piAddr3) == 0)
                         {
index 84a55ff..c7186a6 100755 (executable)
@@ -249,7 +249,9 @@ static getHashTableCouple propertyGetTable[] =
     {"scrollable", get_scrollable_property},
     {"icon", GetUicontrolIcon},
     {"line_width", get_line_width_property},
-    {"marks_count", get_marks_count_property}
+    {"marks_count", get_marks_count_property},
+    {"ticks_format", get_ticks_format_property},
+    {"ticks_st", get_ticks_st_property},
 };
 
 /*--------------------------------------------------------------------------*/
index f9a2153..1ca1e17 100755 (executable)
@@ -251,7 +251,9 @@ static setHashTableCouple propertySetTable[] =
     {"scrollable", set_scrollable_property},
     {"icon", SetUicontrolIcon},
     {"line_width", set_line_width_property},
-    {"marks_count", set_marks_count_property}
+    {"marks_count", set_marks_count_property},
+    {"ticks_format", set_ticks_format_property},
+    {"ticks_st", set_ticks_st_property},
 };
 
 /*--------------------------------------------------------------------------*/
index 602fe68..d412810 100755 (executable)
@@ -197,5 +197,7 @@ int get_scrollable_property(void* _pvCtx, int iObjUID);
 int get_line_width_property(void* _pvCtx, int iObjUID);
 int get_marks_count_property(void* _pvCtx, int iObjUID);
 int get_auto_margins_property(void* _pvCtx, int iObjUID);
+int get_ticks_format_property(void* _pvCtx, int iObjUID);
+int get_ticks_st_property(void* _pvCtx, int iObjUID);
 
 #endif /* _GET_HANDLE_PROPERTY_H_ */
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_ticks_format_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_ticks_format_property.c
new file mode 100644 (file)
index 0000000..8c8b40e
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2014 - 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_ticks_format_property.c                                      */
+/* desc : function to retrieve in Scilab the ticks_format field of        */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+#include "getHandleProperty.h"
+#include "returnProperty.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "MALLOC.h"
+
+#include "getGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int get_ticks_format_property(void* _pvCtx, int iObjUID)
+{
+    int const propr[3] = {__GO_X_AXIS_FORMAT__, __GO_Y_AXIS_FORMAT__, __GO_Z_AXIS_FORMAT__};
+    char * fmts[3]  = { NULL, NULL, NULL };
+    int i = 0;
+
+    for (i = 0 ; i < 3 ; i++)
+    {
+        getGraphicObjectProperty(iObjUID, propr[i], jni_string, (void **)(fmts + i));
+
+        if (fmts[i] == NULL)
+        {
+            Scierror(999, _("'%s' property does not exist for this handle.\n"), "ticks_format");
+            return -1;
+        }
+    }
+
+    return sciReturnRowStringVector(_pvCtx, fmts, 3);
+}
+/*------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_ticks_st_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_ticks_st_property.c
new file mode 100644 (file)
index 0000000..e8646b3
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2014 - 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_ticks_st_property.c                                          */
+/* desc : function to retrieve in Scilab the ticks_st field of            */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "getHandleProperty.h"
+#include "returnProperty.h"
+#include "Scierror.h"
+#include "localization.h"
+
+#include "getGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int get_ticks_st_property(void* _pvCtx, int iObjUID)
+{
+    int const propr[3] = {__GO_X_AXIS_ST_FACTORS__, __GO_Y_AXIS_ST_FACTORS__, __GO_Z_AXIS_ST_FACTORS__};
+    double factors[] = {1., 0., 1., 0., 1., 0.};
+    int i = 0;
+
+    for (i = 0 ; i < 3 ; i++)
+    {
+        double * dbls = NULL;
+        getGraphicObjectProperty(iObjUID, propr[i], jni_double_vector, (void **)&dbls);
+        if (dbls == NULL)
+        {
+            Scierror(999, _("'%s' property does not exist for this handle.\n"), "ticks_st");
+            return -1;
+        }
+        factors[2 * i] = dbls[0];
+        factors[2 * i + 1] = dbls[1];
+    }
+
+    return sciReturnMatrix(_pvCtx, factors, 2, 3);
+}
+/*------------------------------------------------------------------------*/
index ec7e158..5667a9f 100755 (executable)
@@ -201,5 +201,7 @@ int set_scrollable_property(void* _pvCtx, int iObj, void* _pvData, int valueType
 int set_line_width_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_marks_count_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_auto_margins_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
+int set_ticks_format_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
+int set_ticks_st_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 
 #endif /* _SET_HANDLE_PROPERTY_H_ */
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_ticks_format_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_ticks_format_property.c
new file mode 100644 (file)
index 0000000..eec2a76
--- /dev/null
@@ -0,0 +1,63 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2014 - 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_ticks_format_property.c                                      */
+/* desc : function to modify in Scilab the ticks_format field of          */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "setHandleProperty.h"
+#include "SetProperty.h"
+#include "getPropertyAssignedValue.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "SetPropertyStatus.h"
+#include "sci_types.h"
+
+#include "setGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int set_ticks_format_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+{
+    BOOL status = FALSE;
+    char ** values = (char**)_pvData;
+    int propr[3] = {__GO_X_AXIS_FORMAT__, __GO_Y_AXIS_FORMAT__, __GO_Z_AXIS_FORMAT__};
+    int nb = nbRow * nbCol;
+    int i = 0;
+
+    if (valueType != sci_strings)
+    {
+        Scierror(999, _("Wrong type for '%s' property: String expected.\n"), "ticks_format");
+        return SET_PROPERTY_ERROR;
+    }
+
+    if (nb > 3)
+    {
+        Scierror(999, _("Wrong size for '%s' property: At most %d elements expected.\n"), "ticks_format", 3);
+        return SET_PROPERTY_ERROR;
+    }
+
+    for (i = 0; i < nb; i++)
+    {
+        status = setGraphicObjectProperty(iObjUID, propr[i], values[i], jni_string, 1);
+        if (status == FALSE)
+        {
+            Scierror(999, _("'%s' property does not exist for this handle.\n"), "ticks_format");
+            return SET_PROPERTY_ERROR;
+        }
+    }
+
+    return SET_PROPERTY_SUCCEED;
+}
+/*------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_ticks_st_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_ticks_st_property.c
new file mode 100644 (file)
index 0000000..6216d0a
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2014 - 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_ticks_st_property.c                                          */
+/* desc : function to modify in Scilab the ticks_st field of              */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "setHandleProperty.h"
+#include "SetProperty.h"
+#include "getPropertyAssignedValue.h"
+#include "SetPropertyStatus.h"
+#include "Scierror.h"
+#include "localization.h"
+
+#include "setGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int set_ticks_st_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+{
+    BOOL status = FALSE;
+    int propr[3] = {__GO_X_AXIS_ST_FACTORS__, __GO_Y_AXIS_ST_FACTORS__, __GO_Z_AXIS_ST_FACTORS__};
+    double* values = (double*)_pvData;
+    int nb = nbRow * nbCol;
+    int i = 0;
+
+    if (valueType != sci_matrix)
+    {
+        Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "ticks_st");
+        return SET_PROPERTY_ERROR;
+    }
+
+    if (nbRow != 2 && nbCol > 3)
+    {
+        Scierror(999, _("Wrong size for '%s' property: At most %d columns and %d rows expected.\n"), "ticks_st", 3, 2);
+        return SET_PROPERTY_ERROR;
+    }
+
+    for (i = 0; i < nb / 2; i++)
+    {
+        status = setGraphicObjectProperty(iObjUID, propr[i], values + 2 * i, jni_double_vector, 2);
+        if (status == FALSE)
+        {
+            Scierror(999, _("'%s' property does not exist for this handle.\n"), "ticks_st");
+            return SET_PROPERTY_ERROR;
+        }
+    }
+
+    return SET_PROPERTY_SUCCEED;
+}
+/*------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/tests/unit_tests/ticks_format.dia.ref b/scilab/modules/graphics/tests/unit_tests/ticks_format.dia.ref
new file mode 100644 (file)
index 0000000..0707092
--- /dev/null
@@ -0,0 +1,22 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH GRAPHIC -->
+// test ticks_format & ticks_st (axes properties)
+plot([69;70], [66.425514; 66.425513])
+a=gca();
+assert_checkequal(a.x_ticks.labels(1), string(69));
+a.ticks_format="%.2f";
+assert_checkequal(a.x_ticks.labels(1), sprintf("%.2f", 69));
+a.ticks_format="%.3e";
+assert_checkequal(a.x_ticks.labels(1), sprintf("%.3e", 69));
+a.ticks_format="hello %.3e scilab";
+assert_checkequal(a.x_ticks.labels(1), sprintf("hello %.3e scilab", 69));
+a.ticks_st=[1, 0; 1 66.425513]';
+a.ticks_format=["" "%.2e"];
+assert_checkequal(a.y_ticks.labels(1), sprintf("%.2e", 0));
+a.ticks_st=[1, 0; 1e6 66.425513]';
+assert_checkequal(a.y_ticks.labels($), sprintf("%.2e", 1.2));
diff --git a/scilab/modules/graphics/tests/unit_tests/ticks_format.tst b/scilab/modules/graphics/tests/unit_tests/ticks_format.tst
new file mode 100644 (file)
index 0000000..410bb39
--- /dev/null
@@ -0,0 +1,26 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH GRAPHIC -->
+
+// test ticks_format & ticks_st (axes properties)
+
+plot([69;70], [66.425514; 66.425513])
+a=gca();
+assert_checkequal(a.x_ticks.labels(1), string(69));
+a.ticks_format="%.2f";
+assert_checkequal(a.x_ticks.labels(1), sprintf("%.2f", 69));
+a.ticks_format="%.3e";
+assert_checkequal(a.x_ticks.labels(1), sprintf("%.3e", 69));
+a.ticks_format="hello %.3e scilab";
+assert_checkequal(a.x_ticks.labels(1), sprintf("hello %.3e scilab", 69));
+
+a.ticks_st=[1, 0; 1 66.425513]';
+a.ticks_format=["" "%.2e"];
+assert_checkequal(a.y_ticks.labels(1), sprintf("%.2e", 0));
+a.ticks_st=[1, 0; 1e6 66.425513]';
+assert_checkequal(a.y_ticks.labels($), sprintf("%.2e", 1.2));
index 719a01d..5c72e2e 100644 (file)
@@ -279,6 +279,8 @@ function [] = %_save(%__filename__, varargin)
         "x_ticks", ...
         "y_ticks", ...
         "z_ticks", ...
+        "ticks_format", ...
+        "ticks_st", ...
         "box", ...
         "filled", ...
         "sub_tics", ...
index 1f82c53..b8f172d 100644 (file)
@@ -2,7 +2,7 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2009-2010 - DIGITEO - Pierre Lando
  * Copyright (C) 2011 - DIGITEO - Manuel Juliachs
- * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+ * Copyright (C) 2013-2014 - 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
@@ -140,6 +140,8 @@ public class AxesRulerDrawer {
 
         setRulerBounds(axes.getXAxis(), rulerModel, bounds[0], bounds[1]);
 
+        rulerModel.setFormat(axes.getXAxisFormat());
+        rulerModel.setSTFactors(axes.getXAxisSTFactors());
         rulerModel.setLogarithmic(axes.getXAxis().getLogFlag());
         rulerModel.setMinimalSubTicksDistance(axes.getXAxis().getLogFlag() ? LOG_MINIMAL_SUB_TICKS_DISTANCE : LINEAR_MINIMAL_SUB_TICKS_DISTANCE);
 
@@ -197,6 +199,8 @@ public class AxesRulerDrawer {
         }
 
         setRulerBounds(axes.getYAxis(), rulerModel, bounds[2], bounds[3]);
+        rulerModel.setFormat(axes.getYAxisFormat());
+        rulerModel.setSTFactors(axes.getYAxisSTFactors());
         rulerModel.setLogarithmic(axes.getYAxis().getLogFlag());
         rulerModel.setMinimalSubTicksDistance(axes.getYAxis().getLogFlag() ? LOG_MINIMAL_SUB_TICKS_DISTANCE : LINEAR_MINIMAL_SUB_TICKS_DISTANCE);
 
@@ -262,6 +266,8 @@ public class AxesRulerDrawer {
             }
 
             setRulerBounds(axes.getZAxis(), rulerModel, bounds[4], bounds[5]);
+            rulerModel.setFormat(axes.getZAxisFormat());
+            rulerModel.setSTFactors(axes.getZAxisSTFactors());
             rulerModel.setLogarithmic(axes.getZAxis().getLogFlag());
             rulerModel.setMinimalSubTicksDistance(axes.getZAxis().getLogFlag() ? LOG_MINIMAL_SUB_TICKS_DISTANCE : LINEAR_MINIMAL_SUB_TICKS_DISTANCE);
 
index e0e2ad1..1a6063f 100644 (file)
@@ -42,6 +42,12 @@ class RulerDrawerManager {
                 GraphicObjectProperties.__GO_X_AXIS_AUTO_TICKS__,
                 GraphicObjectProperties.__GO_Y_AXIS_AUTO_TICKS__,
                 GraphicObjectProperties.__GO_Z_AXIS_AUTO_TICKS__,
+                GraphicObjectProperties.__GO_X_AXIS_FORMAT__,
+                GraphicObjectProperties.__GO_Y_AXIS_FORMAT__,
+                GraphicObjectProperties.__GO_Z_AXIS_FORMAT__,
+                GraphicObjectProperties.__GO_X_AXIS_ST_FACTORS__,
+                GraphicObjectProperties.__GO_Y_AXIS_ST_FACTORS__,
+                GraphicObjectProperties.__GO_Z_AXIS_ST_FACTORS__,
                 GraphicObjectProperties.__GO_X_AXIS_LOG_FLAG__,
                 GraphicObjectProperties.__GO_Y_AXIS_LOG_FLAG__,
                 GraphicObjectProperties.__GO_Z_AXIS_LOG_FLAG__
index 00e563a..18b94c1 100644 (file)
@@ -113,6 +113,9 @@ public final class DefaultRulerModel implements RulerModel {
     private double lineWidth = DEFAULT_LINE_WIDTH;
 
     private int subticksNumber = -1;
+    private String format = "";
+    private double scale;
+    private double translate;
 
     /**
      * Default constructor.
@@ -399,4 +402,35 @@ public final class DefaultRulerModel implements RulerModel {
         this.subticksNumber = N;
     }
 
+    @Override
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * Set the format.
+     * @param format the format as used in String.format.
+     */
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    @Override
+    public double getScale() {
+        return scale;
+    }
+
+    @Override
+    public double getTranslate() {
+        return translate;
+    }
+
+    /**
+     * Set the scale-translate factors.
+     * @param .
+     */
+    public void setSTFactors(Double[] factors) {
+        this.scale = factors[0];
+        this.translate = factors[1];
+    }
 }
index bcd60ba..4576034 100644 (file)
@@ -28,6 +28,7 @@ import org.scilab.forge.scirenderer.SciRendererException;
 import org.scilab.forge.scirenderer.buffers.BuffersManager;
 import org.scilab.forge.scirenderer.buffers.ElementsBuffer;
 import org.scilab.forge.scirenderer.ruler.graduations.Graduations;
+import org.scilab.forge.scirenderer.ruler.graduations.UserDefinedFormat;
 import org.scilab.forge.scirenderer.shapes.appearance.Appearance;
 import org.scilab.forge.scirenderer.shapes.geometry.DefaultGeometry;
 import org.scilab.forge.scirenderer.shapes.geometry.Geometry;
@@ -332,6 +333,11 @@ public class RulerDrawer {
             Graduations currentGraduations = rulerModel.getGraduations();
             Graduations ticksGraduation = currentGraduations;
             DecimalFormat format = currentGraduations.getFormat();
+            String f = rulerModel.getFormat();
+            if (f != null && !f.isEmpty()) {
+                format = new UserDefinedFormat(format, f, rulerModel.getScale(), rulerModel.getTranslate());
+            }
+
             boolean canGetMore = true;
             List<PositionedSprite> newSpritesList = new LinkedList<PositionedSprite>();
             while (currentGraduations != null) {
index fc25901..baaa869 100644 (file)
@@ -204,4 +204,22 @@ public interface RulerModel {
      * @return the number of subticks or -1 if the computation is automatic.
      */
     int getSubticksNumber();
+
+    /**
+     * Get the format to print the ticks label
+     * @return the format
+     */
+    String getFormat();
+
+    /**
+     * Get the scale factor to recompute label value
+     * @return the scale factor
+     */
+    double getScale();
+
+    /**
+     * Get the translate factor to recompute label value
+     * @return the translate factor
+     */
+    double getTranslate();
 }
index a34f7b5..2d9424e 100644 (file)
@@ -164,7 +164,9 @@ public abstract class AbstractGraduations implements Graduations {
 
             if (maxDisplayedValue < 1e-3) {
                 numberFormat = new DecimalFormat("0.##########E00");
-            } else if (len <= 1e-3) {
+            } else if (false && len <= 1e-3) {
+                // desactivated for now...
+                // the user should be able to do that itself
                 numberFormat = new TinyIntervalFormat("0.####E00", "0.##E00");
             } else if (maxDisplayedValue >= 1e6) {
                 numberFormat = new DecimalFormat("0.##########E00");
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/ruler/graduations/UserDefinedFormat.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/ruler/graduations/UserDefinedFormat.java
new file mode 100644 (file)
index 0000000..311ee6b
--- /dev/null
@@ -0,0 +1,92 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2014 - 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
+ */
+
+package org.scilab.forge.scirenderer.ruler.graduations;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.FieldPosition;
+import java.util.Formatter;
+import java.util.IllegalFormatConversionException;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Use a user defined format to format ticks label.
+ */
+public class UserDefinedFormat extends DecimalFormat {
+
+    private String format;
+    private double scale;
+    private double translation;
+    private DecimalFormat fallback;
+
+    /**
+     * Constructor
+     * @param basePattern the pattern to represent the base
+     * @param fracPattern the pattern to represent frac
+     */
+    public UserDefinedFormat(DecimalFormat fallback, String format, double scale, double translation) {
+        super();
+        this.format = format;
+        this.scale = scale;
+        this.translation = translation;
+        this.fallback = fallback;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public StringBuffer format(double number, StringBuffer result, FieldPosition fieldPosition) {
+        final double d = scale * (number - translation);
+        if (format != null && !format.isEmpty()) {
+            try {
+                Formatter fmt = new Formatter(Locale.US);
+                fmt.format(Locale.US, format, d);
+                return result.append(fmt.toString());
+            } catch (IllegalFormatConversionException e) {
+                try {
+                    Formatter fmt = new Formatter(Locale.US);
+                    fmt.format(Locale.US, format, (long) d);
+                    return result.append(fmt.toString());
+                } catch (Exception ee) { }
+            } catch (ArrayIndexOutOfBoundsException e) {
+                // Java bug in Formatter format("%.1g", 0.) or something like that is faulty
+                // So what is following is just a crappy workaround to replace g by f...
+                if (d == 0) {
+                    Pattern pat = Pattern.compile("([^%]*%[-#+ 0,(]?\\.[01])[gG](.*)");
+                    Matcher match = pat.matcher(format);
+                    if (match.find() && match.groupCount() == 2) {
+                        StringBuilder buffer = new StringBuilder(format.length());
+                        buffer.append(format.substring(0, match.start())).append(match.group(1)).append('f').append(match.group(2));
+                        format = buffer.toString();
+
+                        try {
+                            Formatter fmt = new Formatter(Locale.US);
+                            fmt.format(Locale.US, format, d);
+                            return result.append(fmt.toString());
+                        } catch (Exception ee) { }
+                    }
+                }
+            } catch (Exception e) { }
+        }
+
+        return fallback.format(number, result, fieldPosition);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setDecimalFormatSymbols(DecimalFormatSymbols newSymbols) {
+        fallback.setDecimalFormatSymbols(newSymbols);
+    }
+}