Bugs 6191, 7169 fixed: it was not possible to specify thickness and style in grids... 21/13521/4
Calixte DENIZET [Thu, 23 Jan 2014 14:17:43 +0000 (15:17 +0100)]
Change-Id: Ifd3b27946819fe0e610d6eface3dd773678ac57f

27 files changed:
SEP/INDEX
SEP/SEP_123_Grid_improvements.odt [new file with mode: 0644]
scilab/CHANGES_5.5.X
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/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/help/en_US/xgrid.xml
scilab/modules/graphics/help/fr_FR/xgrid.xml
scilab/modules/graphics/help/ja_JP/xgrid.xml
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/c/sci_xgrid.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_grid_style_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/get_grid_thickness_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_grid_style_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/set_grid_thickness_property.c [new file with mode: 0644]
scilab/modules/graphics/tests/nonreg_tests/bug_6191.dia.ref [new file with mode: 0644]
scilab/modules/graphics/tests/nonreg_tests/bug_6191.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

index 60422e5..13c6d86 100644 (file)
--- a/SEP/INDEX
+++ b/SEP/INDEX
@@ -118,3 +118,5 @@ SEP #119: Management of encoding in xmlRead
 SEP #120: New function tbx_build_pal_loader
 SEP #121: New rect property for matplot handle
 SEP #122: Customized mark draw
+SEP #123: Grid improvements
+
diff --git a/SEP/SEP_123_Grid_improvements.odt b/SEP/SEP_123_Grid_improvements.odt
new file mode 100644 (file)
index 0000000..b59f3bb
Binary files /dev/null and b/SEP/SEP_123_Grid_improvements.odt differ
index 9350682..bcf080d 100644 (file)
@@ -64,6 +64,8 @@ Scilab Bug Fixes
 
 * Bug #5886 fixed - There was no property labels_font_style on axis.
 
+* Bug #6191 fixed - It was not possible to set thickness and line_style properties for a grid.
+
 * Bug #6305 fixed - dsearch function did not work with integers, strings and hypermatrices.
 
 * Bug #6306 fixed - It is now possible to compute an histogram instead of plotting it
@@ -92,6 +94,8 @@ Scilab Bug Fixes
 
 * Bug #7133 fixed - help_from_sci with no input argument now launches a full demonstration.
 
+* Bug #7169 fixed - It was not possible to specify different option value (thickness, style, ...) for X and Y grids.
+
 * Bug #7244 fixed - Extraction from a struct array with a boolean vector had a strange behavior.
 
 * Bug #7561 fixed - roots help page now explains that it uses coefficients in the contrary order of poly.
index 6a7ac71..bcdd609 100755 (executable)
 #define __GO_X_AXIS_VISIBLE__ 110
 #define __GO_X_AXIS_REVERSE__ 111
 #define __GO_X_AXIS_GRID_COLOR__ 112
-#define __GO_X_AXIS_LABEL__ 113
-#define __GO_X_AXIS_LOCATION__ 114
-#define __GO_X_AXIS_LOG_FLAG__ 115
-#define __GO_X_AXIS_TICKS__ 116
-#define __GO_X_AXIS_AUTO_TICKS__ 117
-#define __GO_X_AXIS_NUMBER_TICKS__ 118
-#define __GO_X_AXIS_TICKS_LOCATIONS__ 119
-#define __GO_X_AXIS_TICKS_LABELS__ 120
-#define __GO_X_AXIS_SUBTICKS__ 121
-#define __GO_Y_AXIS_VISIBLE__ 122
-#define __GO_Y_AXIS_REVERSE__ 123
-#define __GO_Y_AXIS_GRID_COLOR__ 124
-#define __GO_Y_AXIS_LABEL__ 125
-#define __GO_Y_AXIS_LOCATION__ 126
-#define __GO_Y_AXIS_LOG_FLAG__ 127
-#define __GO_Y_AXIS_TICKS__ 128
-#define __GO_Y_AXIS_AUTO_TICKS__ 129
-#define __GO_Y_AXIS_NUMBER_TICKS__ 130
-#define __GO_Y_AXIS_TICKS_LOCATIONS__ 131
-#define __GO_Y_AXIS_TICKS_LABELS__ 132
-#define __GO_Y_AXIS_SUBTICKS__ 133
-#define __GO_Z_AXIS_VISIBLE__ 134
-#define __GO_Z_AXIS_REVERSE__ 135
-#define __GO_Z_AXIS_GRID_COLOR__ 136
-#define __GO_Z_AXIS_LABEL__ 137
-#define __GO_Z_AXIS_LOCATION__ 138
-#define __GO_Z_AXIS_LOG_FLAG__ 139
-#define __GO_Z_AXIS_TICKS__ 140
-#define __GO_Z_AXIS_AUTO_TICKS__ 141
-#define __GO_Z_AXIS_NUMBER_TICKS__ 142
-#define __GO_Z_AXIS_TICKS_LOCATIONS__ 143
-#define __GO_Z_AXIS_TICKS_LABELS__ 144
-#define __GO_Z_AXIS_SUBTICKS__ 145
-#define __GO_AUTO_SUBTICKS__ 146
-#define __GO_GRID_POSITION__ 147
-#define __GO_TITLE__ 148
-#define __GO_AUTO_CLEAR__ 149
-#define __GO_FILLED__ 150
-#define __GO_CAMERA__ 151
-#define __GO_VIEW__ 152
-#define __GO_ISOVIEW__ 153
-#define __GO_CUBE_SCALING__ 154
-#define __GO_ROTATION_ANGLES__ 155
-#define __GO_ROTATION_ANGLES_3D__ 156
-#define __GO_BOX_TYPE__ 157
-#define __GO_HIDDEN_AXIS_COLOR__ 158
-#define __GO_TIGHT_LIMITS__ 159
-#define __GO_DATA_BOUNDS__ 160
-#define __GO_REAL_DATA_BOUNDS__ 161
-#define __GO_ZOOM_ENABLED__ 162
-#define __GO_ZOOM_BOX__ 163
-#define __GO_AUTO_SCALE__ 164
-#define __GO_FIRST_PLOT__ 165
-#define __GO_MARGINS__ 166
-#define __GO_AXES_BOUNDS__ 167
-#define __GO_CLIP_PROPERTY__ 168
-#define __GO_CLIP_STATE__ 169
-#define __GO_CLIP_BOX__ 170
-#define __GO_CLIP_BOX_SET__ 171
-#define __GO_LINE__ 172
-#define __GO_LINE_MODE__ 173
-#define __GO_LINE_STYLE__ 174
-#define __GO_LINE_THICKNESS__ 175
-#define __GO_LINE_COLOR__ 176
-#define __GO_FILL_MODE__ 177
-#define __GO_MARK__ 178
-#define __GO_MARK_MODE__ 179
-#define __GO_MARK_STYLE__ 180
-#define __GO_MARK_SIZE_UNIT__ 181
-#define __GO_MARK_SIZE__ 182
-#define __GO_MARK_FOREGROUND__ 183
-#define __GO_MARK_BACKGROUND__ 184
-#define __GO_MARK_OFFSET__ 185
-#define __GO_MARK_STRIDE__ 186
-#define __GO_TICKS_DIRECTION__ 187
-#define __GO_X_NUMBER_TICKS__ 188
-#define __GO_Y_NUMBER_TICKS__ 189
-#define __GO_X_TICKS_COORDS__ 190
-#define __GO_Y_TICKS_COORDS__ 191
-#define __GO_TICKS_COLOR__ 192
-#define __GO_TICKS_SEGMENT__ 193
-#define __GO_TICKS_STYLE__ 194
-#define __GO_SUBTICKS__ 195
-#define __GO_NUMBER_TICKS_LABELS__ 196
-#define __GO_TICKS_LABELS__ 197
-#define __GO_FORMATN__ 198
-#define __GO_FONT__ 199
-#define __GO_FONT_STYLE__ 200
-#define __GO_FONT_SIZE__ 201
-#define __GO_FONT_COLOR__ 202
-#define __GO_FONT_FRACTIONAL__ 203
-#define __GO_Z_BOUNDS__ 204
-#define __GO_OUTSIDE_COLOR__ 205
-#define __GO_COLOR_RANGE__ 206
-#define __GO_DATA_MAPPING__ 207
-#define __GO_FONT_ANGLE__ 208
-#define __GO_AUTO_POSITION__ 209
-#define __GO_CORNERS__ 210
-#define __GO_AUTO_ROTATION__ 211
-#define __GO_LINKS__ 212
-#define __GO_LINKS_COUNT__ 213
-#define __GO_LEGEND_LOCATION__ 214
-#define __GO_CLOSED__ 215
-#define __GO_ARROW_SIZE_FACTOR__ 216
-#define __GO_POLYLINE_STYLE__ 217
-#define __GO_INTERP_COLOR_VECTOR__ 218
-#define __GO_INTERP_COLOR_VECTOR_SET__ 219
-#define __GO_INTERP_COLOR_MODE__ 220
-#define __GO_X_SHIFT__ 221
-#define __GO_Y_SHIFT__ 222
-#define __GO_Z_SHIFT__ 223
-#define __GO_BAR_WIDTH__ 224
-#define __GO_SURFACE_MODE__ 225
-#define __GO_COLOR_MODE__ 226
-#define __GO_COLOR_FLAG__ 227
-#define __GO_ALIGNMENT__ 228
-#define __GO_BOX__ 229
-#define __GO_TEXT_BOX__ 230
-#define __GO_TEXT_BOX_MODE__ 231
-#define __GO_AUTO_DIMENSIONING__ 232
-#define __GO_FORMATTED_TEXT__ 233
-#define __GO_TEXT_ARRAY_DIMENSIONS__ 234
-#define __GO_TEXT_STRINGS__ 235
-#define __GO_BASE__ 236
-#define __GO_BASE_X__ 237
-#define __GO_BASE_Y__ 238
-#define __GO_BASE_Z__ 239
-#define __GO_DIRECTION__ 240
-#define __GO_DIRECTION_X__ 241
-#define __GO_DIRECTION_Y__ 242
-#define __GO_DIRECTION_Z__ 243
-#define __GO_ARROW_SIZE__ 244
-#define __GO_SEGS_COLORS__ 245
-#define __GO_COLORED__ 246
-#define __GO_ARROWS__ 247
-#define __GO_NUMBER_ARROWS__ 248
-#define __GO_CHAMP_DIMENSIONS__ 249
-#define __GO_BOUNDING_BOX__ 250
-#define __GO_MAX_LENGTH__ 251
-#define __GO_MAX_USABLE_LENGTH__ 252
-#define __GO_HIDDEN_COLOR__ 253
-#define __GO_STYLE__ 254
-#define __GO_UI_CHECKBOX__ 255
-#define __GO_UI_EDIT__ 256
-#define __GO_UI_FRAME__ 257
-#define __GO_UI_IMAGE__ 258
-#define __GO_UI_LISTBOX__ 259
-#define __GO_UI_POPUPMENU__ 260
-#define __GO_UI_PUSHBUTTON__ 261
-#define __GO_UI_RADIOBUTTON__ 262
-#define __GO_UI_SLIDER__ 263
-#define __GO_UI_TABLE__ 264
-#define __GO_UI_TEXT__ 265
-#define __GO_UI_BACKGROUNDCOLOR__ 266
-#define __GO_UI_ENABLE__ 267
-#define __GO_UI_FONTANGLE__ 268
-#define __GO_UI_FONTNAME__ 269
-#define __GO_UI_FONTSIZE__ 270
-#define __GO_UI_FONTUNITS__ 271
-#define __GO_UI_FONTWEIGHT__ 272
-#define __GO_UI_FOREGROUNDCOLOR__ 273
-#define __GO_UI_HORIZONTALALIGNMENT__ 274
-#define __GO_UI_LISTBOXTOP__ 275
-#define __GO_UI_LISTBOXTOP_SIZE__ 276
-#define __GO_UI_MAX__ 277
-#define __GO_UI_MIN__ 278
-#define __GO_UI_RELIEF__ 279
-#define __GO_UI_STRING__ 280
-#define __GO_UI_STRING_SIZE__ 281
-#define __GO_UI_STRING_COLNB__ 282
-#define __GO_UI_TOOLTIPSTRING__ 283
-#define __GO_UI_TOOLTIPSTRING_SIZE__ 284
-#define __GO_UI_SLIDERSTEP__ 285
-#define __GO_UI_UNITS__ 286
-#define __GO_UI_VALUE__ 287
-#define __GO_UI_VALUE_SIZE__ 288
-#define __GO_UI_VERTICALALIGNMENT__ 289
-#define __GO_UIPARENTMENU__ 290
-#define __GO_UICHILDMENU__ 291
-#define __GO_UICHECKEDMENU__ 292
-#define __GO_UI_CHECKED__ 293
-#define __GO_UI_LABEL__ 294
-#define __GO_UI_MNEMONIC__ 295
-#define __GO_UI_ACCELERATOR__ 296
-#define __GO_UI_SEPARATOR__ 297
-#define __GO_UI_ICON__ 298
-#define __GO_CONSOLE__ 299
-#define __GO_SHOWHIDDENHANDLES__ 300
-#define __GO_WAITBAR__ 301
-#define __GO_PROGRESSIONBAR__ 302
-#define __GO_UI_MESSAGE__ 303
-#define __GO_UI_MESSAGE_SIZE__ 304
-#define __GO_DATATIP__ 305
-#define __GO_DATATIP_DATA__ 306
-#define __GO_DATATIP_ORIENTATION__ 307
-#define __GO_DATATIP_3COMPONENT__ 308
-#define __GO_DATATIP_AUTOORIENTATION__ 309
-#define __GO_DATATIP_INTERP_MODE__ 310
-#define __GO_DATATIP_DISPLAY_FNC__ 311
-#define __GO_DATATIP_BOX_MODE__ 312
-#define __GO_DATATIP_LABEL_MODE__ 313
-#define __GO_AMBIENTCOLOR__ 314
-#define __GO_DIFFUSECOLOR__ 315
-#define __GO_SPECULARCOLOR__ 316
-#define __GO_COLOR_MATERIAL__ 317
-#define __GO_MATERIAL_SHININESS__ 318
-#define __GO_LIGHT__ 319
-#define __GO_LIGHT_TYPE__ 320
-#define __GO_DATATIPS__ 321
-#define __GO_DATATIPS_COUNT__ 322
-#define __GO_DATATIP_INDEXES__ 323
-#define __GO_DATA_MODEL_DISPLAY_FUNCTION__ 324
-#define __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ 325
-#define __GO_RESIZE__ 326
-#define __GO_TOOLBAR__ 327
-#define __GO_TOOLBAR_VISIBLE__ 328
-#define __GO_MENUBAR__ 329
-#define __GO_MENUBAR_VISIBLE__ 330
-#define __GO_INFOBAR_VISIBLE__ 331
-#define __GO_DOCKABLE__ 332
-#define __GO_LAYOUT__ 333
-#define __GO_LAYOUT_SET__ 334
-#define __GO_UI_BORDER_CONSTRAINTS__ 335
-#define __GO_UI_GRID_CONSTRAINTS__ 336
-#define __GO_UI_TABGROUP__ 337
-#define __GO_UI_TAB__ 338
+#define __GO_X_AXIS_GRID_THICKNESS__ 113
+#define __GO_X_AXIS_GRID_STYLE__ 114
+#define __GO_X_AXIS_LABEL__ 115
+#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_AXES_BOUNDS__ 173
+#define __GO_CLIP_PROPERTY__ 174
+#define __GO_CLIP_STATE__ 175
+#define __GO_CLIP_BOX__ 176
+#define __GO_CLIP_BOX_SET__ 177
+#define __GO_LINE__ 178
+#define __GO_LINE_MODE__ 179
+#define __GO_LINE_STYLE__ 180
+#define __GO_LINE_THICKNESS__ 181
+#define __GO_LINE_COLOR__ 182
+#define __GO_FILL_MODE__ 183
+#define __GO_MARK__ 184
+#define __GO_MARK_MODE__ 185
+#define __GO_MARK_STYLE__ 186
+#define __GO_MARK_SIZE_UNIT__ 187
+#define __GO_MARK_SIZE__ 188
+#define __GO_MARK_FOREGROUND__ 189
+#define __GO_MARK_BACKGROUND__ 190
+#define __GO_MARK_OFFSET__ 191
+#define __GO_MARK_STRIDE__ 192
+#define __GO_TICKS_DIRECTION__ 193
+#define __GO_X_NUMBER_TICKS__ 194
+#define __GO_Y_NUMBER_TICKS__ 195
+#define __GO_X_TICKS_COORDS__ 196
+#define __GO_Y_TICKS_COORDS__ 197
+#define __GO_TICKS_COLOR__ 198
+#define __GO_TICKS_SEGMENT__ 199
+#define __GO_TICKS_STYLE__ 200
+#define __GO_SUBTICKS__ 201
+#define __GO_NUMBER_TICKS_LABELS__ 202
+#define __GO_TICKS_LABELS__ 203
+#define __GO_FORMATN__ 204
+#define __GO_FONT__ 205
+#define __GO_FONT_STYLE__ 206
+#define __GO_FONT_SIZE__ 207
+#define __GO_FONT_COLOR__ 208
+#define __GO_FONT_FRACTIONAL__ 209
+#define __GO_Z_BOUNDS__ 210
+#define __GO_OUTSIDE_COLOR__ 211
+#define __GO_COLOR_RANGE__ 212
+#define __GO_DATA_MAPPING__ 213
+#define __GO_FONT_ANGLE__ 214
+#define __GO_AUTO_POSITION__ 215
+#define __GO_CORNERS__ 216
+#define __GO_AUTO_ROTATION__ 217
+#define __GO_LINKS__ 218
+#define __GO_LINKS_COUNT__ 219
+#define __GO_LEGEND_LOCATION__ 220
+#define __GO_CLOSED__ 221
+#define __GO_ARROW_SIZE_FACTOR__ 222
+#define __GO_POLYLINE_STYLE__ 223
+#define __GO_INTERP_COLOR_VECTOR__ 224
+#define __GO_INTERP_COLOR_VECTOR_SET__ 225
+#define __GO_INTERP_COLOR_MODE__ 226
+#define __GO_X_SHIFT__ 227
+#define __GO_Y_SHIFT__ 228
+#define __GO_Z_SHIFT__ 229
+#define __GO_BAR_WIDTH__ 230
+#define __GO_SURFACE_MODE__ 231
+#define __GO_COLOR_MODE__ 232
+#define __GO_COLOR_FLAG__ 233
+#define __GO_ALIGNMENT__ 234
+#define __GO_BOX__ 235
+#define __GO_TEXT_BOX__ 236
+#define __GO_TEXT_BOX_MODE__ 237
+#define __GO_AUTO_DIMENSIONING__ 238
+#define __GO_FORMATTED_TEXT__ 239
+#define __GO_TEXT_ARRAY_DIMENSIONS__ 240
+#define __GO_TEXT_STRINGS__ 241
+#define __GO_BASE__ 242
+#define __GO_BASE_X__ 243
+#define __GO_BASE_Y__ 244
+#define __GO_BASE_Z__ 245
+#define __GO_DIRECTION__ 246
+#define __GO_DIRECTION_X__ 247
+#define __GO_DIRECTION_Y__ 248
+#define __GO_DIRECTION_Z__ 249
+#define __GO_ARROW_SIZE__ 250
+#define __GO_SEGS_COLORS__ 251
+#define __GO_COLORED__ 252
+#define __GO_ARROWS__ 253
+#define __GO_NUMBER_ARROWS__ 254
+#define __GO_CHAMP_DIMENSIONS__ 255
+#define __GO_BOUNDING_BOX__ 256
+#define __GO_MAX_LENGTH__ 257
+#define __GO_MAX_USABLE_LENGTH__ 258
+#define __GO_HIDDEN_COLOR__ 259
+#define __GO_STYLE__ 260
+#define __GO_UI_CHECKBOX__ 261
+#define __GO_UI_EDIT__ 262
+#define __GO_UI_FRAME__ 263
+#define __GO_UI_IMAGE__ 264
+#define __GO_UI_LISTBOX__ 265
+#define __GO_UI_POPUPMENU__ 266
+#define __GO_UI_PUSHBUTTON__ 267
+#define __GO_UI_RADIOBUTTON__ 268
+#define __GO_UI_SLIDER__ 269
+#define __GO_UI_TABLE__ 270
+#define __GO_UI_TEXT__ 271
+#define __GO_UI_BACKGROUNDCOLOR__ 272
+#define __GO_UI_ENABLE__ 273
+#define __GO_UI_FONTANGLE__ 274
+#define __GO_UI_FONTNAME__ 275
+#define __GO_UI_FONTSIZE__ 276
+#define __GO_UI_FONTUNITS__ 277
+#define __GO_UI_FONTWEIGHT__ 278
+#define __GO_UI_FOREGROUNDCOLOR__ 279
+#define __GO_UI_HORIZONTALALIGNMENT__ 280
+#define __GO_UI_LISTBOXTOP__ 281
+#define __GO_UI_LISTBOXTOP_SIZE__ 282
+#define __GO_UI_MAX__ 283
+#define __GO_UI_MIN__ 284
+#define __GO_UI_RELIEF__ 285
+#define __GO_UI_STRING__ 286
+#define __GO_UI_STRING_SIZE__ 287
+#define __GO_UI_STRING_COLNB__ 288
+#define __GO_UI_TOOLTIPSTRING__ 289
+#define __GO_UI_TOOLTIPSTRING_SIZE__ 290
+#define __GO_UI_SLIDERSTEP__ 291
+#define __GO_UI_UNITS__ 292
+#define __GO_UI_VALUE__ 293
+#define __GO_UI_VALUE_SIZE__ 294
+#define __GO_UI_VERTICALALIGNMENT__ 295
+#define __GO_UIPARENTMENU__ 296
+#define __GO_UICHILDMENU__ 297
+#define __GO_UICHECKEDMENU__ 298
+#define __GO_UI_CHECKED__ 299
+#define __GO_UI_LABEL__ 300
+#define __GO_UI_MNEMONIC__ 301
+#define __GO_UI_ACCELERATOR__ 302
+#define __GO_UI_SEPARATOR__ 303
+#define __GO_UI_ICON__ 304
+#define __GO_CONSOLE__ 305
+#define __GO_SHOWHIDDENHANDLES__ 306
+#define __GO_WAITBAR__ 307
+#define __GO_PROGRESSIONBAR__ 308
+#define __GO_UI_MESSAGE__ 309
+#define __GO_UI_MESSAGE_SIZE__ 310
+#define __GO_DATATIP__ 311
+#define __GO_DATATIP_DATA__ 312
+#define __GO_DATATIP_ORIENTATION__ 313
+#define __GO_DATATIP_3COMPONENT__ 314
+#define __GO_DATATIP_AUTOORIENTATION__ 315
+#define __GO_DATATIP_INTERP_MODE__ 316
+#define __GO_DATATIP_DISPLAY_FNC__ 317
+#define __GO_DATATIP_BOX_MODE__ 318
+#define __GO_DATATIP_LABEL_MODE__ 319
+#define __GO_AMBIENTCOLOR__ 320
+#define __GO_DIFFUSECOLOR__ 321
+#define __GO_SPECULARCOLOR__ 322
+#define __GO_COLOR_MATERIAL__ 323
+#define __GO_MATERIAL_SHININESS__ 324
+#define __GO_LIGHT__ 325
+#define __GO_LIGHT_TYPE__ 326
+#define __GO_DATATIPS__ 327
+#define __GO_DATATIPS_COUNT__ 328
+#define __GO_DATATIP_INDEXES__ 329
+#define __GO_DATA_MODEL_DISPLAY_FUNCTION__ 330
+#define __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ 331
+#define __GO_RESIZE__ 332
+#define __GO_TOOLBAR__ 333
+#define __GO_TOOLBAR_VISIBLE__ 334
+#define __GO_MENUBAR__ 335
+#define __GO_MENUBAR_VISIBLE__ 336
+#define __GO_INFOBAR_VISIBLE__ 337
+#define __GO_DOCKABLE__ 338
+#define __GO_LAYOUT__ 339
+#define __GO_LAYOUT_SET__ 340
+#define __GO_UI_BORDER_CONSTRAINTS__ 341
+#define __GO_UI_GRID_CONSTRAINTS__ 342
+#define __GO_UI_TABGROUP__ 343
+#define __GO_UI_TAB__ 344
 
 #endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */
index 9011842..b72a30b 100644 (file)
@@ -52,11 +52,11 @@ public class Axes extends GraphicObject {
 
     /** Axes properties names */
     private enum AxesProperty {
-        XAXISVISIBLE, XAXISREVERSE, XAXISGRIDCOLOR, XAXISLABEL, XAXISLOCATION, XAXISLOGFLAG,
+        XAXISVISIBLE, XAXISREVERSE, XAXISGRIDCOLOR, XAXISGRIDTHICKNESS, XAXISGRIDSTYLE, XAXISLABEL, XAXISLOCATION, XAXISLOGFLAG,
         XAXISTICKS, XAXISAUTOTICKS, XAXISNUMBERTICKS, XAXISTICKSLOCATIONS, XAXISTICKSLABELS, XAXISSUBTICKS,
-        YAXISVISIBLE, YAXISREVERSE, YAXISGRIDCOLOR, YAXISLABEL, YAXISLOCATION, YAXISLOGFLAG,
+        YAXISVISIBLE, YAXISREVERSE, YAXISGRIDCOLOR, YAXISGRIDTHICKNESS, YAXISGRIDSTYLE, YAXISLABEL, YAXISLOCATION, YAXISLOGFLAG,
         YAXISTICKS, YAXISAUTOTICKS, YAXISNUMBERTICKS, YAXISTICKSLOCATIONS, YAXISTICKSLABELS, YAXISSUBTICKS,
-        ZAXISVISIBLE, ZAXISREVERSE, ZAXISGRIDCOLOR, ZAXISLABEL, ZAXISLOCATION, ZAXISLOGFLAG,
+        ZAXISVISIBLE, ZAXISREVERSE, ZAXISGRIDCOLOR, ZAXISGRIDTHICKNESS, ZAXISGRIDSTYLE, ZAXISLABEL, ZAXISLOCATION, ZAXISLOGFLAG,
         ZAXISTICKS, ZAXISAUTOTICKS, ZAXISNUMBERTICKS, ZAXISTICKSLOCATIONS, ZAXISTICKSLABELS, ZAXISSUBTICKS,
         AUTOSUBTICKS,
         FONT_STYLE, FONT_SIZE, FONT_COLOR, FONT_FRACTIONAL,
@@ -219,6 +219,10 @@ public class Axes extends GraphicObject {
                 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__ :
@@ -243,6 +247,10 @@ public class Axes extends GraphicObject {
                 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__ :
@@ -267,6 +275,10 @@ public class Axes extends GraphicObject {
                 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__ :
@@ -387,6 +399,10 @@ public class Axes extends GraphicObject {
                     return getXAxisReverse();
                 case XAXISGRIDCOLOR:
                     return getXAxisGridColor();
+                case XAXISGRIDTHICKNESS:
+                    return getXAxisGridThickness();
+                case XAXISGRIDSTYLE:
+                    return getXAxisGridStyle();
                 case XAXISLABEL:
                     return getXAxisLabel();
                 case XAXISLOCATION:
@@ -411,6 +427,10 @@ public class Axes extends GraphicObject {
                     return getYAxisReverse();
                 case YAXISGRIDCOLOR:
                     return getYAxisGridColor();
+                case YAXISGRIDTHICKNESS:
+                    return getYAxisGridThickness();
+                case YAXISGRIDSTYLE:
+                    return getYAxisGridStyle();
                 case YAXISLABEL:
                     return getYAxisLabel();
                 case YAXISLOCATION:
@@ -435,6 +455,10 @@ public class Axes extends GraphicObject {
                     return getZAxisReverse();
                 case ZAXISGRIDCOLOR:
                     return getZAxisGridColor();
+                case ZAXISGRIDTHICKNESS:
+                    return getZAxisGridThickness();
+                case ZAXISGRIDSTYLE:
+                    return getZAxisGridStyle();
                 case ZAXISLABEL:
                     return getZAxisLabel();
                 case ZAXISLOCATION:
@@ -577,6 +601,10 @@ public class Axes extends GraphicObject {
                     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:
@@ -599,6 +627,10 @@ public class Axes extends GraphicObject {
                     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:
@@ -621,6 +653,10 @@ public class Axes extends GraphicObject {
                     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:
@@ -839,6 +875,35 @@ public class Axes extends GraphicObject {
     }
 
     /**
+     * @return the x axis grid thickness
+     */
+    public Double getXAxisGridThickness() {
+        Double d = axes[0].getGridThickness();
+        return d == -1 ? getLineThickness() : d;
+    }
+
+    /**
+     * @param gridThickness the x axis grid thickness to set
+     */
+    public UpdateStatus setXAxisGridThickness(Double gridThickness) {
+        return axes[0].setGridThickness(gridThickness);
+    }
+
+    /**
+     * @return the x axis grid style
+     */
+    public Integer getXAxisGridStyle() {
+        return axes[0].getGridStyle();
+    }
+
+    /**
+     * @param gridStyle the x axis grid style to set
+     */
+    public UpdateStatus setXAxisGridStyle(Integer gridStyle) {
+        return axes[0].setGridStyle(gridStyle);
+    }
+
+    /**
      * @return the x axis label UID
      */
     public Integer getXAxisLabel() {
@@ -1044,6 +1109,35 @@ public class Axes extends GraphicObject {
     }
 
     /**
+     * @return the y axis grid thickness
+     */
+    public Double getYAxisGridThickness() {
+        Double d = axes[1].getGridThickness();
+        return d == -1 ? getLineThickness() : d;
+    }
+
+    /**
+     * @param gridThickness the y axis grid thickness to set
+     */
+    public UpdateStatus setYAxisGridThickness(Double gridThickness) {
+        return axes[1].setGridThickness(gridThickness);
+    }
+
+    /**
+     * @return the y axis grid style
+     */
+    public Integer getYAxisGridStyle() {
+        return axes[1].getGridStyle();
+    }
+
+    /**
+     * @param gridStyle the y axis grid style to set
+     */
+    public UpdateStatus setYAxisGridStyle(Integer gridStyle) {
+        return axes[1].setGridStyle(gridStyle);
+    }
+
+    /**
      * @return the y axis label UID
      */
     public Integer getYAxisLabel() {
@@ -1249,6 +1343,35 @@ public class Axes extends GraphicObject {
     }
 
     /**
+     * @return the x axis grid thickness
+     */
+    public Double getZAxisGridThickness() {
+        Double d = axes[2].getGridThickness();
+        return d == -1 ? getLineThickness() : d;
+    }
+
+    /**
+     * @param gridThickness the x axis grid thickness to set
+     */
+    public UpdateStatus setZAxisGridThickness(Double gridThickness) {
+        return axes[2].setGridThickness(gridThickness);
+    }
+
+    /**
+     * @return the z axis grid style
+     */
+    public Integer getZAxisGridStyle() {
+        return axes[2].getGridStyle();
+    }
+
+    /**
+     * @param gridStyle the z axis grid style to set
+     */
+    public UpdateStatus setZAxisGridStyle(Integer gridStyle) {
+        return axes[2].setGridStyle(gridStyle);
+    }
+
+    /**
      * @return the z axis label UID
      */
     public Integer getZAxisLabel() {
index a981a12..22b76d5 100644 (file)
@@ -13,6 +13,7 @@
 
 package org.scilab.modules.graphic_objects.axes;
 
+import org.scilab.modules.graphic_objects.contouredObject.Line;
 import org.scilab.modules.graphic_objects.graphicObject.GraphicObject.UpdateStatus;
 import org.scilab.modules.graphic_objects.textObject.FormattedText;
 
@@ -27,7 +28,7 @@ public class AxisProperty {
     /**
      * AxisProperty properties names
      */
-    public enum AxisPropertyProperty { VISIBLE, REVERSE, GRIDCOLOR, LABEL, AXISLOCATION,
+    public enum AxisPropertyProperty { VISIBLE, REVERSE, GRIDCOLOR, GRIDTHICKNESS, GRIDSTYLE, LABEL, AXISLOCATION,
                                        LOGFLAG, UNKNOWNPROPERTY
                                      }
 
@@ -73,6 +74,12 @@ public class AxisProperty {
     /** Grid color */
     private int gridColor;
 
+    /** Grid thickness */
+    private double gridThickness;
+
+    /** Grid style */
+    private Line.LineType gridStyle;
+
     /** Axis label UID */
     private Integer label;
 
@@ -90,6 +97,8 @@ public class AxisProperty {
         visible = false;
         reverse = false;
         gridColor = 0;
+        gridThickness = -1;
+        gridStyle = Line.LineType.DASH_DOT;
 
         /* Sets the label to the null object */
         label = 0;
@@ -107,6 +116,8 @@ public class AxisProperty {
         visible = axisProperty.visible;
         reverse = axisProperty.reverse;
         gridColor = axisProperty.gridColor;
+        gridThickness = axisProperty.gridThickness;
+        gridStyle = axisProperty.gridStyle;
 
         label = 0;
 
@@ -127,6 +138,10 @@ public class AxisProperty {
             return AxisPropertyProperty.REVERSE;
         } else if (propertyName.equals("GridColor")) {
             return AxisPropertyProperty.GRIDCOLOR;
+        } else if (propertyName.equals("GridThickness")) {
+            return AxisPropertyProperty.GRIDTHICKNESS;
+        } else if (propertyName.equals("GridStyle")) {
+            return AxisPropertyProperty.GRIDSTYLE;
         } else if (propertyName.equals("Label")) {
             return AxisPropertyProperty.LABEL;
         } else if (propertyName.equals("AxisLocation")) {
@@ -150,6 +165,10 @@ public class AxisProperty {
             return getReverse();
         } else if (property == AxisPropertyProperty.GRIDCOLOR) {
             return getGridColor();
+        } else if (property == AxisPropertyProperty.GRIDTHICKNESS) {
+            return getGridThickness();
+        } else if (property == AxisPropertyProperty.GRIDSTYLE) {
+            return getGridStyle();
         } else if (property == AxisPropertyProperty.LABEL) {
             return getLabel();
         } else if (property == AxisPropertyProperty.AXISLOCATION) {
@@ -174,6 +193,10 @@ public class AxisProperty {
             setReverse((Boolean) value);
         } else if (property == AxisPropertyProperty.GRIDCOLOR) {
             setGridColor((Integer) value);
+        } else if (property == AxisPropertyProperty.GRIDTHICKNESS) {
+            setGridThickness((Double) value);
+        } else if (property == AxisPropertyProperty.GRIDSTYLE) {
+            setGridStyle((Integer) value);
         } else if (property == AxisPropertyProperty.LABEL) {
             setLabel((Integer) value);
         } else if (property == AxisPropertyProperty.AXISLOCATION) {
@@ -231,6 +254,45 @@ public class AxisProperty {
     }
 
     /**
+     * @return the gridThickness
+     */
+    public Double getGridThickness() {
+        return gridThickness;
+    }
+
+    /**
+     * @param gridThickness the gridThickness to set
+     */
+    public UpdateStatus setGridThickness(Double gridThickness) {
+        if (this.gridThickness != gridThickness) {
+            this.gridThickness = gridThickness;
+            return UpdateStatus.Success;
+        }
+
+        return UpdateStatus.NoChange;
+    }
+
+    /**
+     * @return the gridStyle
+     */
+    public Integer getGridStyle() {
+        return gridStyle.asScilabIndex();
+    }
+
+    /**
+     * @param gridStyle the gridStyle to set
+     */
+    public UpdateStatus setGridStyle(Integer gridStyle) {
+        Line.LineType type = Line.LineType.fromScilabIndex(gridStyle);
+        if (this.gridStyle != type) {
+            this.gridStyle = type;
+            return UpdateStatus.Success;
+        }
+
+        return UpdateStatus.NoChange;
+    }
+
+    /**
      * @return the label
      */
     public Integer getLabel() {
index d389c7a..437bdda 100755 (executable)
@@ -133,231 +133,237 @@ public class GraphicObjectProperties {
     public static final int __GO_X_AXIS_VISIBLE__ = 110;
     public static final int __GO_X_AXIS_REVERSE__ = 111;
     public static final int __GO_X_AXIS_GRID_COLOR__ = 112;
-    public static final int __GO_X_AXIS_LABEL__ = 113;
-    public static final int __GO_X_AXIS_LOCATION__ = 114;
-    public static final int __GO_X_AXIS_LOG_FLAG__ = 115;
-    public static final int __GO_X_AXIS_TICKS__ = 116;
-    public static final int __GO_X_AXIS_AUTO_TICKS__ = 117;
-    public static final int __GO_X_AXIS_NUMBER_TICKS__ = 118;
-    public static final int __GO_X_AXIS_TICKS_LOCATIONS__ = 119;
-    public static final int __GO_X_AXIS_TICKS_LABELS__ = 120;
-    public static final int __GO_X_AXIS_SUBTICKS__ = 121;
-    public static final int __GO_Y_AXIS_VISIBLE__ = 122;
-    public static final int __GO_Y_AXIS_REVERSE__ = 123;
-    public static final int __GO_Y_AXIS_GRID_COLOR__ = 124;
-    public static final int __GO_Y_AXIS_LABEL__ = 125;
-    public static final int __GO_Y_AXIS_LOCATION__ = 126;
-    public static final int __GO_Y_AXIS_LOG_FLAG__ = 127;
-    public static final int __GO_Y_AXIS_TICKS__ = 128;
-    public static final int __GO_Y_AXIS_AUTO_TICKS__ = 129;
-    public static final int __GO_Y_AXIS_NUMBER_TICKS__ = 130;
-    public static final int __GO_Y_AXIS_TICKS_LOCATIONS__ = 131;
-    public static final int __GO_Y_AXIS_TICKS_LABELS__ = 132;
-    public static final int __GO_Y_AXIS_SUBTICKS__ = 133;
-    public static final int __GO_Z_AXIS_VISIBLE__ = 134;
-    public static final int __GO_Z_AXIS_REVERSE__ = 135;
-    public static final int __GO_Z_AXIS_GRID_COLOR__ = 136;
-    public static final int __GO_Z_AXIS_LABEL__ = 137;
-    public static final int __GO_Z_AXIS_LOCATION__ = 138;
-    public static final int __GO_Z_AXIS_LOG_FLAG__ = 139;
-    public static final int __GO_Z_AXIS_TICKS__ = 140;
-    public static final int __GO_Z_AXIS_AUTO_TICKS__ = 141;
-    public static final int __GO_Z_AXIS_NUMBER_TICKS__ = 142;
-    public static final int __GO_Z_AXIS_TICKS_LOCATIONS__ = 143;
-    public static final int __GO_Z_AXIS_TICKS_LABELS__ = 144;
-    public static final int __GO_Z_AXIS_SUBTICKS__ = 145;
-    public static final int __GO_AUTO_SUBTICKS__ = 146;
-    public static final int __GO_GRID_POSITION__ = 147;
-    public static final int __GO_TITLE__ = 148;
-    public static final int __GO_AUTO_CLEAR__ = 149;
-    public static final int __GO_FILLED__ = 150;
-    public static final int __GO_CAMERA__ = 151;
-    public static final int __GO_VIEW__ = 152;
-    public static final int __GO_ISOVIEW__ = 153;
-    public static final int __GO_CUBE_SCALING__ = 154;
-    public static final int __GO_ROTATION_ANGLES__ = 155;
-    public static final int __GO_ROTATION_ANGLES_3D__ = 156;
-    public static final int __GO_BOX_TYPE__ = 157;
-    public static final int __GO_HIDDEN_AXIS_COLOR__ = 158;
-    public static final int __GO_TIGHT_LIMITS__ = 159;
-    public static final int __GO_DATA_BOUNDS__ = 160;
-    public static final int __GO_REAL_DATA_BOUNDS__ = 161;
-    public static final int __GO_ZOOM_ENABLED__ = 162;
-    public static final int __GO_ZOOM_BOX__ = 163;
-    public static final int __GO_AUTO_SCALE__ = 164;
-    public static final int __GO_FIRST_PLOT__ = 165;
-    public static final int __GO_MARGINS__ = 166;
-    public static final int __GO_AXES_BOUNDS__ = 167;
-    public static final int __GO_CLIP_PROPERTY__ = 168;
-    public static final int __GO_CLIP_STATE__ = 169;
-    public static final int __GO_CLIP_BOX__ = 170;
-    public static final int __GO_CLIP_BOX_SET__ = 171;
-    public static final int __GO_LINE__ = 172;
-    public static final int __GO_LINE_MODE__ = 173;
-    public static final int __GO_LINE_STYLE__ = 174;
-    public static final int __GO_LINE_THICKNESS__ = 175;
-    public static final int __GO_LINE_COLOR__ = 176;
-    public static final int __GO_FILL_MODE__ = 177;
-    public static final int __GO_MARK__ = 178;
-    public static final int __GO_MARK_MODE__ = 179;
-    public static final int __GO_MARK_STYLE__ = 180;
-    public static final int __GO_MARK_SIZE_UNIT__ = 181;
-    public static final int __GO_MARK_SIZE__ = 182;
-    public static final int __GO_MARK_FOREGROUND__ = 183;
-    public static final int __GO_MARK_BACKGROUND__ = 184;
-    public static final int __GO_MARK_OFFSET__ = 185;
-    public static final int __GO_MARK_STRIDE__ = 186;
-    public static final int __GO_TICKS_DIRECTION__ = 187;
-    public static final int __GO_X_NUMBER_TICKS__ = 188;
-    public static final int __GO_Y_NUMBER_TICKS__ = 189;
-    public static final int __GO_X_TICKS_COORDS__ = 190;
-    public static final int __GO_Y_TICKS_COORDS__ = 191;
-    public static final int __GO_TICKS_COLOR__ = 192;
-    public static final int __GO_TICKS_SEGMENT__ = 193;
-    public static final int __GO_TICKS_STYLE__ = 194;
-    public static final int __GO_SUBTICKS__ = 195;
-    public static final int __GO_NUMBER_TICKS_LABELS__ = 196;
-    public static final int __GO_TICKS_LABELS__ = 197;
-    public static final int __GO_FORMATN__ = 198;
-    public static final int __GO_FONT__ = 199;
-    public static final int __GO_FONT_STYLE__ = 200;
-    public static final int __GO_FONT_SIZE__ = 201;
-    public static final int __GO_FONT_COLOR__ = 202;
-    public static final int __GO_FONT_FRACTIONAL__ = 203;
-    public static final int __GO_Z_BOUNDS__ = 204;
-    public static final int __GO_OUTSIDE_COLOR__ = 205;
-    public static final int __GO_COLOR_RANGE__ = 206;
-    public static final int __GO_DATA_MAPPING__ = 207;
-    public static final int __GO_FONT_ANGLE__ = 208;
-    public static final int __GO_AUTO_POSITION__ = 209;
-    public static final int __GO_CORNERS__ = 210;
-    public static final int __GO_AUTO_ROTATION__ = 211;
-    public static final int __GO_LINKS__ = 212;
-    public static final int __GO_LINKS_COUNT__ = 213;
-    public static final int __GO_LEGEND_LOCATION__ = 214;
-    public static final int __GO_CLOSED__ = 215;
-    public static final int __GO_ARROW_SIZE_FACTOR__ = 216;
-    public static final int __GO_POLYLINE_STYLE__ = 217;
-    public static final int __GO_INTERP_COLOR_VECTOR__ = 218;
-    public static final int __GO_INTERP_COLOR_VECTOR_SET__ = 219;
-    public static final int __GO_INTERP_COLOR_MODE__ = 220;
-    public static final int __GO_X_SHIFT__ = 221;
-    public static final int __GO_Y_SHIFT__ = 222;
-    public static final int __GO_Z_SHIFT__ = 223;
-    public static final int __GO_BAR_WIDTH__ = 224;
-    public static final int __GO_SURFACE_MODE__ = 225;
-    public static final int __GO_COLOR_MODE__ = 226;
-    public static final int __GO_COLOR_FLAG__ = 227;
-    public static final int __GO_ALIGNMENT__ = 228;
-    public static final int __GO_BOX__ = 229;
-    public static final int __GO_TEXT_BOX__ = 230;
-    public static final int __GO_TEXT_BOX_MODE__ = 231;
-    public static final int __GO_AUTO_DIMENSIONING__ = 232;
-    public static final int __GO_FORMATTED_TEXT__ = 233;
-    public static final int __GO_TEXT_ARRAY_DIMENSIONS__ = 234;
-    public static final int __GO_TEXT_STRINGS__ = 235;
-    public static final int __GO_BASE__ = 236;
-    public static final int __GO_BASE_X__ = 237;
-    public static final int __GO_BASE_Y__ = 238;
-    public static final int __GO_BASE_Z__ = 239;
-    public static final int __GO_DIRECTION__ = 240;
-    public static final int __GO_DIRECTION_X__ = 241;
-    public static final int __GO_DIRECTION_Y__ = 242;
-    public static final int __GO_DIRECTION_Z__ = 243;
-    public static final int __GO_ARROW_SIZE__ = 244;
-    public static final int __GO_SEGS_COLORS__ = 245;
-    public static final int __GO_COLORED__ = 246;
-    public static final int __GO_ARROWS__ = 247;
-    public static final int __GO_NUMBER_ARROWS__ = 248;
-    public static final int __GO_CHAMP_DIMENSIONS__ = 249;
-    public static final int __GO_BOUNDING_BOX__ = 250;
-    public static final int __GO_MAX_LENGTH__ = 251;
-    public static final int __GO_MAX_USABLE_LENGTH__ = 252;
-    public static final int __GO_HIDDEN_COLOR__ = 253;
-    public static final int __GO_STYLE__ = 254;
-    public static final int __GO_UI_CHECKBOX__ = 255;
-    public static final int __GO_UI_EDIT__ = 256;
-    public static final int __GO_UI_FRAME__ = 257;
-    public static final int __GO_UI_IMAGE__ = 258;
-    public static final int __GO_UI_LISTBOX__ = 259;
-    public static final int __GO_UI_POPUPMENU__ = 260;
-    public static final int __GO_UI_PUSHBUTTON__ = 261;
-    public static final int __GO_UI_RADIOBUTTON__ = 262;
-    public static final int __GO_UI_SLIDER__ = 263;
-    public static final int __GO_UI_TABLE__ = 264;
-    public static final int __GO_UI_TEXT__ = 265;
-    public static final int __GO_UI_BACKGROUNDCOLOR__ = 266;
-    public static final int __GO_UI_ENABLE__ = 267;
-    public static final int __GO_UI_FONTANGLE__ = 268;
-    public static final int __GO_UI_FONTNAME__ = 269;
-    public static final int __GO_UI_FONTSIZE__ = 270;
-    public static final int __GO_UI_FONTUNITS__ = 271;
-    public static final int __GO_UI_FONTWEIGHT__ = 272;
-    public static final int __GO_UI_FOREGROUNDCOLOR__ = 273;
-    public static final int __GO_UI_HORIZONTALALIGNMENT__ = 274;
-    public static final int __GO_UI_LISTBOXTOP__ = 275;
-    public static final int __GO_UI_LISTBOXTOP_SIZE__ = 276;
-    public static final int __GO_UI_MAX__ = 277;
-    public static final int __GO_UI_MIN__ = 278;
-    public static final int __GO_UI_RELIEF__ = 279;
-    public static final int __GO_UI_STRING__ = 280;
-    public static final int __GO_UI_STRING_SIZE__ = 281;
-    public static final int __GO_UI_STRING_COLNB__ = 282;
-    public static final int __GO_UI_TOOLTIPSTRING__ = 283;
-    public static final int __GO_UI_TOOLTIPSTRING_SIZE__ = 284;
-    public static final int __GO_UI_SLIDERSTEP__ = 285;
-    public static final int __GO_UI_UNITS__ = 286;
-    public static final int __GO_UI_VALUE__ = 287;
-    public static final int __GO_UI_VALUE_SIZE__ = 288;
-    public static final int __GO_UI_VERTICALALIGNMENT__ = 289;
-    public static final int __GO_UIPARENTMENU__ = 290;
-    public static final int __GO_UICHILDMENU__ = 291;
-    public static final int __GO_UICHECKEDMENU__ = 292;
-    public static final int __GO_UI_CHECKED__ = 293;
-    public static final int __GO_UI_LABEL__ = 294;
-    public static final int __GO_UI_MNEMONIC__ = 295;
-    public static final int __GO_UI_ACCELERATOR__ = 296;
-    public static final int __GO_UI_SEPARATOR__ = 297;
-    public static final int __GO_UI_ICON__ = 298;
-    public static final int __GO_CONSOLE__ = 299;
-    public static final int __GO_SHOWHIDDENHANDLES__ = 300;
-    public static final int __GO_WAITBAR__ = 301;
-    public static final int __GO_PROGRESSIONBAR__ = 302;
-    public static final int __GO_UI_MESSAGE__ = 303;
-    public static final int __GO_UI_MESSAGE_SIZE__ = 304;
-    public static final int __GO_DATATIP__ = 305;
-    public static final int __GO_DATATIP_DATA__ = 306;
-    public static final int __GO_DATATIP_ORIENTATION__ = 307;
-    public static final int __GO_DATATIP_3COMPONENT__ = 308;
-    public static final int __GO_DATATIP_AUTOORIENTATION__ = 309;
-    public static final int __GO_DATATIP_INTERP_MODE__ = 310;
-    public static final int __GO_DATATIP_DISPLAY_FNC__ = 311;
-    public static final int __GO_DATATIP_BOX_MODE__ = 312;
-    public static final int __GO_DATATIP_LABEL_MODE__ = 313;
-    public static final int __GO_AMBIENTCOLOR__ = 314;
-    public static final int __GO_DIFFUSECOLOR__ = 315;
-    public static final int __GO_SPECULARCOLOR__ = 316;
-    public static final int __GO_COLOR_MATERIAL__ = 317;
-    public static final int __GO_MATERIAL_SHININESS__ = 318;
-    public static final int __GO_LIGHT__ = 319;
-    public static final int __GO_LIGHT_TYPE__ = 320;
-    public static final int __GO_DATATIPS__ = 321;
-    public static final int __GO_DATATIPS_COUNT__ = 322;
-    public static final int __GO_DATATIP_INDEXES__ = 323;
-    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION__ = 324;
-    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ = 325;
-    public static final int __GO_RESIZE__ = 326;
-    public static final int __GO_TOOLBAR__ = 327;
-    public static final int __GO_TOOLBAR_VISIBLE__ = 328;
-    public static final int __GO_MENUBAR__ = 329;
-    public static final int __GO_MENUBAR_VISIBLE__ = 330;
-    public static final int __GO_INFOBAR_VISIBLE__ = 331;
-    public static final int __GO_DOCKABLE__ = 332;
-    public static final int __GO_LAYOUT__ = 333;
-    public static final int __GO_LAYOUT_SET__ = 334;
-    public static final int __GO_UI_BORDER_CONSTRAINTS__ = 335;
-    public static final int __GO_UI_GRID_CONSTRAINTS__ = 336;
-    public static final int __GO_UI_TABGROUP__ = 337;
-    public static final int __GO_UI_TAB__ = 338;
+    public static final int __GO_X_AXIS_GRID_THICKNESS__ = 113;
+    public static final int __GO_X_AXIS_GRID_STYLE__ = 114;
+    public static final int __GO_X_AXIS_LABEL__ = 115;
+    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_AXES_BOUNDS__ = 173;
+    public static final int __GO_CLIP_PROPERTY__ = 174;
+    public static final int __GO_CLIP_STATE__ = 175;
+    public static final int __GO_CLIP_BOX__ = 176;
+    public static final int __GO_CLIP_BOX_SET__ = 177;
+    public static final int __GO_LINE__ = 178;
+    public static final int __GO_LINE_MODE__ = 179;
+    public static final int __GO_LINE_STYLE__ = 180;
+    public static final int __GO_LINE_THICKNESS__ = 181;
+    public static final int __GO_LINE_COLOR__ = 182;
+    public static final int __GO_FILL_MODE__ = 183;
+    public static final int __GO_MARK__ = 184;
+    public static final int __GO_MARK_MODE__ = 185;
+    public static final int __GO_MARK_STYLE__ = 186;
+    public static final int __GO_MARK_SIZE_UNIT__ = 187;
+    public static final int __GO_MARK_SIZE__ = 188;
+    public static final int __GO_MARK_FOREGROUND__ = 189;
+    public static final int __GO_MARK_BACKGROUND__ = 190;
+    public static final int __GO_MARK_OFFSET__ = 191;
+    public static final int __GO_MARK_STRIDE__ = 192;
+    public static final int __GO_TICKS_DIRECTION__ = 193;
+    public static final int __GO_X_NUMBER_TICKS__ = 194;
+    public static final int __GO_Y_NUMBER_TICKS__ = 195;
+    public static final int __GO_X_TICKS_COORDS__ = 196;
+    public static final int __GO_Y_TICKS_COORDS__ = 197;
+    public static final int __GO_TICKS_COLOR__ = 198;
+    public static final int __GO_TICKS_SEGMENT__ = 199;
+    public static final int __GO_TICKS_STYLE__ = 200;
+    public static final int __GO_SUBTICKS__ = 201;
+    public static final int __GO_NUMBER_TICKS_LABELS__ = 202;
+    public static final int __GO_TICKS_LABELS__ = 203;
+    public static final int __GO_FORMATN__ = 204;
+    public static final int __GO_FONT__ = 205;
+    public static final int __GO_FONT_STYLE__ = 206;
+    public static final int __GO_FONT_SIZE__ = 207;
+    public static final int __GO_FONT_COLOR__ = 208;
+    public static final int __GO_FONT_FRACTIONAL__ = 209;
+    public static final int __GO_Z_BOUNDS__ = 210;
+    public static final int __GO_OUTSIDE_COLOR__ = 211;
+    public static final int __GO_COLOR_RANGE__ = 212;
+    public static final int __GO_DATA_MAPPING__ = 213;
+    public static final int __GO_FONT_ANGLE__ = 214;
+    public static final int __GO_AUTO_POSITION__ = 215;
+    public static final int __GO_CORNERS__ = 216;
+    public static final int __GO_AUTO_ROTATION__ = 217;
+    public static final int __GO_LINKS__ = 218;
+    public static final int __GO_LINKS_COUNT__ = 219;
+    public static final int __GO_LEGEND_LOCATION__ = 220;
+    public static final int __GO_CLOSED__ = 221;
+    public static final int __GO_ARROW_SIZE_FACTOR__ = 222;
+    public static final int __GO_POLYLINE_STYLE__ = 223;
+    public static final int __GO_INTERP_COLOR_VECTOR__ = 224;
+    public static final int __GO_INTERP_COLOR_VECTOR_SET__ = 225;
+    public static final int __GO_INTERP_COLOR_MODE__ = 226;
+    public static final int __GO_X_SHIFT__ = 227;
+    public static final int __GO_Y_SHIFT__ = 228;
+    public static final int __GO_Z_SHIFT__ = 229;
+    public static final int __GO_BAR_WIDTH__ = 230;
+    public static final int __GO_SURFACE_MODE__ = 231;
+    public static final int __GO_COLOR_MODE__ = 232;
+    public static final int __GO_COLOR_FLAG__ = 233;
+    public static final int __GO_ALIGNMENT__ = 234;
+    public static final int __GO_BOX__ = 235;
+    public static final int __GO_TEXT_BOX__ = 236;
+    public static final int __GO_TEXT_BOX_MODE__ = 237;
+    public static final int __GO_AUTO_DIMENSIONING__ = 238;
+    public static final int __GO_FORMATTED_TEXT__ = 239;
+    public static final int __GO_TEXT_ARRAY_DIMENSIONS__ = 240;
+    public static final int __GO_TEXT_STRINGS__ = 241;
+    public static final int __GO_BASE__ = 242;
+    public static final int __GO_BASE_X__ = 243;
+    public static final int __GO_BASE_Y__ = 244;
+    public static final int __GO_BASE_Z__ = 245;
+    public static final int __GO_DIRECTION__ = 246;
+    public static final int __GO_DIRECTION_X__ = 247;
+    public static final int __GO_DIRECTION_Y__ = 248;
+    public static final int __GO_DIRECTION_Z__ = 249;
+    public static final int __GO_ARROW_SIZE__ = 250;
+    public static final int __GO_SEGS_COLORS__ = 251;
+    public static final int __GO_COLORED__ = 252;
+    public static final int __GO_ARROWS__ = 253;
+    public static final int __GO_NUMBER_ARROWS__ = 254;
+    public static final int __GO_CHAMP_DIMENSIONS__ = 255;
+    public static final int __GO_BOUNDING_BOX__ = 256;
+    public static final int __GO_MAX_LENGTH__ = 257;
+    public static final int __GO_MAX_USABLE_LENGTH__ = 258;
+    public static final int __GO_HIDDEN_COLOR__ = 259;
+    public static final int __GO_STYLE__ = 260;
+    public static final int __GO_UI_CHECKBOX__ = 261;
+    public static final int __GO_UI_EDIT__ = 262;
+    public static final int __GO_UI_FRAME__ = 263;
+    public static final int __GO_UI_IMAGE__ = 264;
+    public static final int __GO_UI_LISTBOX__ = 265;
+    public static final int __GO_UI_POPUPMENU__ = 266;
+    public static final int __GO_UI_PUSHBUTTON__ = 267;
+    public static final int __GO_UI_RADIOBUTTON__ = 268;
+    public static final int __GO_UI_SLIDER__ = 269;
+    public static final int __GO_UI_TABLE__ = 270;
+    public static final int __GO_UI_TEXT__ = 271;
+    public static final int __GO_UI_BACKGROUNDCOLOR__ = 272;
+    public static final int __GO_UI_ENABLE__ = 273;
+    public static final int __GO_UI_FONTANGLE__ = 274;
+    public static final int __GO_UI_FONTNAME__ = 275;
+    public static final int __GO_UI_FONTSIZE__ = 276;
+    public static final int __GO_UI_FONTUNITS__ = 277;
+    public static final int __GO_UI_FONTWEIGHT__ = 278;
+    public static final int __GO_UI_FOREGROUNDCOLOR__ = 279;
+    public static final int __GO_UI_HORIZONTALALIGNMENT__ = 280;
+    public static final int __GO_UI_LISTBOXTOP__ = 281;
+    public static final int __GO_UI_LISTBOXTOP_SIZE__ = 282;
+    public static final int __GO_UI_MAX__ = 283;
+    public static final int __GO_UI_MIN__ = 284;
+    public static final int __GO_UI_RELIEF__ = 285;
+    public static final int __GO_UI_STRING__ = 286;
+    public static final int __GO_UI_STRING_SIZE__ = 287;
+    public static final int __GO_UI_STRING_COLNB__ = 288;
+    public static final int __GO_UI_TOOLTIPSTRING__ = 289;
+    public static final int __GO_UI_TOOLTIPSTRING_SIZE__ = 290;
+    public static final int __GO_UI_SLIDERSTEP__ = 291;
+    public static final int __GO_UI_UNITS__ = 292;
+    public static final int __GO_UI_VALUE__ = 293;
+    public static final int __GO_UI_VALUE_SIZE__ = 294;
+    public static final int __GO_UI_VERTICALALIGNMENT__ = 295;
+    public static final int __GO_UIPARENTMENU__ = 296;
+    public static final int __GO_UICHILDMENU__ = 297;
+    public static final int __GO_UICHECKEDMENU__ = 298;
+    public static final int __GO_UI_CHECKED__ = 299;
+    public static final int __GO_UI_LABEL__ = 300;
+    public static final int __GO_UI_MNEMONIC__ = 301;
+    public static final int __GO_UI_ACCELERATOR__ = 302;
+    public static final int __GO_UI_SEPARATOR__ = 303;
+    public static final int __GO_UI_ICON__ = 304;
+    public static final int __GO_CONSOLE__ = 305;
+    public static final int __GO_SHOWHIDDENHANDLES__ = 306;
+    public static final int __GO_WAITBAR__ = 307;
+    public static final int __GO_PROGRESSIONBAR__ = 308;
+    public static final int __GO_UI_MESSAGE__ = 309;
+    public static final int __GO_UI_MESSAGE_SIZE__ = 310;
+    public static final int __GO_DATATIP__ = 311;
+    public static final int __GO_DATATIP_DATA__ = 312;
+    public static final int __GO_DATATIP_ORIENTATION__ = 313;
+    public static final int __GO_DATATIP_3COMPONENT__ = 314;
+    public static final int __GO_DATATIP_AUTOORIENTATION__ = 315;
+    public static final int __GO_DATATIP_INTERP_MODE__ = 316;
+    public static final int __GO_DATATIP_DISPLAY_FNC__ = 317;
+    public static final int __GO_DATATIP_BOX_MODE__ = 318;
+    public static final int __GO_DATATIP_LABEL_MODE__ = 319;
+    public static final int __GO_AMBIENTCOLOR__ = 320;
+    public static final int __GO_DIFFUSECOLOR__ = 321;
+    public static final int __GO_SPECULARCOLOR__ = 322;
+    public static final int __GO_COLOR_MATERIAL__ = 323;
+    public static final int __GO_MATERIAL_SHININESS__ = 324;
+    public static final int __GO_LIGHT__ = 325;
+    public static final int __GO_LIGHT_TYPE__ = 326;
+    public static final int __GO_DATATIPS__ = 327;
+    public static final int __GO_DATATIPS_COUNT__ = 328;
+    public static final int __GO_DATATIP_INDEXES__ = 329;
+    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION__ = 330;
+    public static final int __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ = 331;
+    public static final int __GO_RESIZE__ = 332;
+    public static final int __GO_TOOLBAR__ = 333;
+    public static final int __GO_TOOLBAR_VISIBLE__ = 334;
+    public static final int __GO_MENUBAR__ = 335;
+    public static final int __GO_MENUBAR_VISIBLE__ = 336;
+    public static final int __GO_INFOBAR_VISIBLE__ = 337;
+    public static final int __GO_DOCKABLE__ = 338;
+    public static final int __GO_LAYOUT__ = 339;
+    public static final int __GO_LAYOUT_SET__ = 340;
+    public static final int __GO_UI_BORDER_CONSTRAINTS__ = 341;
+    public static final int __GO_UI_GRID_CONSTRAINTS__ = 342;
+    public static final int __GO_UI_TABGROUP__ = 343;
+    public static final int __GO_UI_TAB__ = 344;
 
 }
index facb449..0f545b7 100755 (executable)
@@ -126,6 +126,8 @@ __GO_ARC_DRAWING_METHOD__
 __GO_X_AXIS_VISIBLE__
 __GO_X_AXIS_REVERSE__
 __GO_X_AXIS_GRID_COLOR__
+__GO_X_AXIS_GRID_THICKNESS__
+__GO_X_AXIS_GRID_STYLE__
 __GO_X_AXIS_LABEL__
 __GO_X_AXIS_LOCATION__
 __GO_X_AXIS_LOG_FLAG__
@@ -139,6 +141,8 @@ __GO_X_AXIS_SUBTICKS__
 __GO_Y_AXIS_VISIBLE__
 __GO_Y_AXIS_REVERSE__
 __GO_Y_AXIS_GRID_COLOR__
+__GO_Y_AXIS_GRID_THICKNESS__
+__GO_Y_AXIS_GRID_STYLE__
 __GO_Y_AXIS_LABEL__
 __GO_Y_AXIS_LOCATION__
 __GO_Y_AXIS_LOG_FLAG__
@@ -152,6 +156,8 @@ __GO_Y_AXIS_SUBTICKS__
 __GO_Z_AXIS_VISIBLE__
 __GO_Z_AXIS_REVERSE__
 __GO_Z_AXIS_GRID_COLOR__
+__GO_Z_AXIS_GRID_THICKNESS__
+__GO_Z_AXIS_GRID_STYLE__
 __GO_Z_AXIS_LABEL__
 __GO_Z_AXIS_LOCATION__
 __GO_Z_AXIS_LOG_FLAG__
index b240a16..c110a36 100644 (file)
@@ -130,6 +130,8 @@ src/c/getHandleProperty/get_ytics_coord_property.c \
 src/c/getHandleProperty/get_labels_font_size_property.c \
 src/c/getHandleProperty/get_isoview_property.c \
 src/c/getHandleProperty/get_grid_property.c \
+src/c/getHandleProperty/get_grid_thickness_property.c \
+src/c/getHandleProperty/get_grid_style_property.c \
 src/c/getHandleProperty/get_box_property.c \
 src/c/getHandleProperty/get_hidden_color_property.c \
 src/c/getHandleProperty/get_handle_visible_property.c \
@@ -269,6 +271,8 @@ src/c/getHandleProperty/set_arrow_size_property.c \
 src/c/getHandleProperty/set_children_property.c \
 src/c/getHandleProperty/set_axes_reverse_property.c \
 src/c/getHandleProperty/set_grid_property.c \
+src/c/getHandleProperty/set_grid_thickness_property.c \
+src/c/getHandleProperty/set_grid_style_property.c \
 src/c/getHandleProperty/set_log_flags_property.c \
 src/c/getHandleProperty/set_cube_scaling_property.c \
 src/c/getHandleProperty/set_colored_property.c \
index bd8afc0..fccf85c 100644 (file)
@@ -277,6 +277,8 @@ am__objects_1 = src/c/libscigraphics_algo_la-GetCommandArg.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_labels_font_size_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_isoview_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_grid_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-get_grid_thickness_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-get_grid_style_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_box_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_hidden_color_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_handle_visible_property.lo \
@@ -416,6 +418,8 @@ am__objects_1 = src/c/libscigraphics_algo_la-GetCommandArg.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_children_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_axes_reverse_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_grid_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-set_grid_thickness_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-set_grid_style_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_log_flags_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_cube_scaling_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_colored_property.lo \
@@ -1053,6 +1057,8 @@ src/c/getHandleProperty/get_ytics_coord_property.c \
 src/c/getHandleProperty/get_labels_font_size_property.c \
 src/c/getHandleProperty/get_isoview_property.c \
 src/c/getHandleProperty/get_grid_property.c \
+src/c/getHandleProperty/get_grid_thickness_property.c \
+src/c/getHandleProperty/get_grid_style_property.c \
 src/c/getHandleProperty/get_box_property.c \
 src/c/getHandleProperty/get_hidden_color_property.c \
 src/c/getHandleProperty/get_handle_visible_property.c \
@@ -1192,6 +1198,8 @@ src/c/getHandleProperty/set_arrow_size_property.c \
 src/c/getHandleProperty/set_children_property.c \
 src/c/getHandleProperty/set_axes_reverse_property.c \
 src/c/getHandleProperty/set_grid_property.c \
+src/c/getHandleProperty/set_grid_thickness_property.c \
+src/c/getHandleProperty/set_grid_style_property.c \
 src/c/getHandleProperty/set_log_flags_property.c \
 src/c/getHandleProperty/set_cube_scaling_property.c \
 src/c/getHandleProperty/set_colored_property.c \
@@ -1925,6 +1933,12 @@ src/c/getHandleProperty/libscigraphics_algo_la-get_isoview_property.lo:  \
 src/c/getHandleProperty/libscigraphics_algo_la-get_grid_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-get_grid_thickness_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-get_grid_style_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
 src/c/getHandleProperty/libscigraphics_algo_la-get_box_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
@@ -2341,6 +2355,12 @@ src/c/getHandleProperty/libscigraphics_algo_la-set_axes_reverse_property.lo:  \
 src/c/getHandleProperty/libscigraphics_algo_la-set_grid_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-set_grid_thickness_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-set_grid_style_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
 src/c/getHandleProperty/libscigraphics_algo_la-set_log_flags_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
@@ -3010,6 +3030,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_fractional_font_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_position_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_style_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_thickness_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_handle_visible_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_hidden_axis_color_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_hidden_color_property.Plo@am__quote@
@@ -3164,6 +3186,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_fractional_font_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_position_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_style_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_thickness_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_handle_visible_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_hidden_axis_color_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_hidden_color_property.Plo@am__quote@
@@ -4008,6 +4032,20 @@ src/c/getHandleProperty/libscigraphics_algo_la-get_grid_property.lo: src/c/getHa
 @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_grid_property.lo `test -f 'src/c/getHandleProperty/get_grid_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_grid_property.c
 
+src/c/getHandleProperty/libscigraphics_algo_la-get_grid_thickness_property.lo: src/c/getHandleProperty/get_grid_thickness_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_grid_thickness_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_thickness_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_grid_thickness_property.lo `test -f 'src/c/getHandleProperty/get_grid_thickness_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_grid_thickness_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_thickness_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_thickness_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_grid_thickness_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_grid_thickness_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_grid_thickness_property.lo `test -f 'src/c/getHandleProperty/get_grid_thickness_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_grid_thickness_property.c
+
+src/c/getHandleProperty/libscigraphics_algo_la-get_grid_style_property.lo: src/c/getHandleProperty/get_grid_style_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_grid_style_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_style_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_grid_style_property.lo `test -f 'src/c/getHandleProperty/get_grid_style_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_grid_style_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_style_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_grid_style_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_grid_style_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_grid_style_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_grid_style_property.lo `test -f 'src/c/getHandleProperty/get_grid_style_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_grid_style_property.c
+
 src/c/getHandleProperty/libscigraphics_algo_la-get_box_property.lo: src/c/getHandleProperty/get_box_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_box_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_box_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_box_property.lo `test -f 'src/c/getHandleProperty/get_box_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_box_property.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_box_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_box_property.Plo
@@ -4981,6 +5019,20 @@ src/c/getHandleProperty/libscigraphics_algo_la-set_grid_property.lo: src/c/getHa
 @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_grid_property.lo `test -f 'src/c/getHandleProperty/set_grid_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_grid_property.c
 
+src/c/getHandleProperty/libscigraphics_algo_la-set_grid_thickness_property.lo: src/c/getHandleProperty/set_grid_thickness_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_grid_thickness_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_thickness_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_grid_thickness_property.lo `test -f 'src/c/getHandleProperty/set_grid_thickness_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_grid_thickness_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_thickness_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_thickness_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_grid_thickness_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_grid_thickness_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_grid_thickness_property.lo `test -f 'src/c/getHandleProperty/set_grid_thickness_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_grid_thickness_property.c
+
+src/c/getHandleProperty/libscigraphics_algo_la-set_grid_style_property.lo: src/c/getHandleProperty/set_grid_style_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_grid_style_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_style_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_grid_style_property.lo `test -f 'src/c/getHandleProperty/set_grid_style_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_grid_style_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_style_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_grid_style_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_grid_style_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_grid_style_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_grid_style_property.lo `test -f 'src/c/getHandleProperty/set_grid_style_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_grid_style_property.c
+
 src/c/getHandleProperty/libscigraphics_algo_la-set_log_flags_property.lo: src/c/getHandleProperty/set_log_flags_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_log_flags_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_log_flags_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_log_flags_property.lo `test -f 'src/c/getHandleProperty/set_log_flags_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_log_flags_property.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_log_flags_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_log_flags_property.Plo
index 37269df..3c45e3b 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
+ * 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
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="xgrid">
     <refnamediv>
         <refname>xgrid</refname>
-        <refpurpose>add a grid on a 2D plot</refpurpose>
+        <refpurpose>add a grid on a 2D or 3D plot</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Calling Sequence</title>
-        <synopsis>xgrid([style])</synopsis>
+        <synopsis>xgrid([color] [, thickness] [, style])</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
+                <term>color</term>
+                <listitem>
+                    <para>an integer or a row matrix.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>thickness</term>
+                <listitem>
+                    <para>a real or a row matrix.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>style</term>
                 <listitem>
-                    <para>an integer.</para>
+                    <para>an integer or a row matrix.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Description</title>
         <para>
-            <function>xgrid</function> adds a grid on a 2D plot.
-            <varname>style</varname> is the dash id or the color id to use for
-            the grid plotting. Use <code>xset()</code> for the meaning of id.
+            <function>xgrid</function> adds a grid on a 2D or 3D plot.
+            d for each axis).
+        </para>
+        <para>
+            <literal>color</literal> is the colors id to use for the grid plotting (if <literal>color</literal> is a scalar then the same color is used for each axis).
+        </para>
+        <para>
+            <literal>thickness</literal> is the thickness to use for the grid plotting (if <literal>thickness</literal> is a scalar then the same thickness is used for each axis).
+        </para>
+        <para>
+            <literal>style</literal> is the style to use for the grid plotting (if <literal>style</literal> is a scalar then the same style is used for each axis). Available styles are the same as for <literal>line_style</literal> property (see <link linkend="axes_properties">axes_properties</link>).
         </para>
     </refsection>
     <refsection>
         <programlisting role="example"><![CDATA[ 
 x=[0:0.1:2*%pi]';
 plot2d(sin(x))
-xgrid(5)
+xgrid(5, 1, 7)
  ]]></programlisting>
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(sin(x))
-            xgrid(5)
+            xgrid(5, 1, 7)
         </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="xset">xset</link>
+                <link linkend="axes_properties">axes_properties</link>
             </member>
             <member>
                 <link linkend="plot2d">plot2d</link>
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Arguments <literal>thickness</literal> and <literal>style</literal> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 1a58b8d..c697c66 100644 (file)
@@ -2,19 +2,33 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="xgrid">
     <refnamediv>
         <refname>xgrid</refname>
-        <refpurpose>ajoute une grille sur un dessin 2D  </refpurpose>
+        <refpurpose>ajoute une grille sur un dessin 2D ou 3D</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>xgrid([style])</synopsis>
+        <synopsis>xgrid([color] [, thickness [, style]])</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
-                <term>style  </term>
+                <term>color</term>
                 <listitem>
-                    <para>entier 
+                    <para>entier ou vecteur. 
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>thickness</term>
+                <listitem>
+                    <para>réel ou vecteur. 
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>style</term>
+                <listitem>
+                    <para>entier ou vecteur. 
                     </para>
                 </listitem>
             </varlistentry>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>xgrid</literal>  ajoute une grille sur un dessin 2D. <literal>style</literal> est le numéro de couleur de la grille. Utiliser <literal>xset()</literal> pour voir les numéros de couleurs.
+            <literal>xgrid</literal> ajoute une grille sur un dessin 2D ou 3D.
+        </para>
+        <para>
+            <literal>color</literal> sont les numéros de couleur de la grille (si <literal>color</literal> est un scalaire, alors la même couleur est utilisée pour chaque axe).
+        </para>
+        <para>
+            <literal>thickness</literal> sont les épaisseurs de lignes de la grille (si <literal>thickness</literal> est un scalaire, alors la même épaisseur de ligne est utilisée pour chaque axe).
+        </para>
+        <para>
+            <literal>style</literal> sont les numéros de style de la grille (si <literal>styl</literal>e est un scalaire, alors le même style est utilisé pour chaque axe). Les styles disponibles sont les mêmes que ceux de la propriété <literal>line_style</literal> (voir <link linkend="axes_properties">axes_properties</link>).
         </para>
     </refsection>
     <refsection>
         <programlisting role="example"><![CDATA[ 
 x=[0:0.1:2*%pi]';
 plot2d(sin(x))
-xgrid(5)
+xgrid(5, 1, 7)
  ]]></programlisting>
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(sin(x))
-            xgrid(5)
+            xgrid(5, 1, 7)
         </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
-                <link linkend="xset">xset</link>
+                <link linkend="axes_properties">axes_properties</link>
             </member>
             <member>
                 <link linkend="plot2d">plot2d</link>
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>Historique</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Arguments <literal>thickness</literal> et <literal>style</literal> ajoutés.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 61f7bb8..aaee06d 100644 (file)
@@ -44,7 +44,7 @@
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(sin(x))
-            xgrid(5)
+            xgrid(5, 1, 7)
         </scilab:image>
     </refsection>
     <refsection>
@@ -52,7 +52,7 @@
         <programlisting role="example"><![CDATA[ 
 x=[0:0.1:2*%pi]';
 plot2d(sin(x))
-xgrid(2)
+xgrid(5, 1, 7)
  ]]></programlisting>
     </refsection>
     <refsection>
index 45654de..66eefa6 100755 (executable)
@@ -158,6 +158,8 @@ function %h_p(h)
             "axes_reverse = "+sci2exp(h.axes_reverse)
             "grid = "+sci2exp(h.grid,0)
             "grid_position = "+sci2exp(h.grid_position)
+            "grid_thickness = "+sci2exp(h.grid_thickness,0)
+            "grid_style = "+sci2exp(h.grid_style,0)
             "x_location = "+sci2exp(h.x_location)
             "y_location = "+sci2exp(h.y_location)
             "title: "+fmtchildren(h.title)
index 0c05349..4266a79 100644 (file)
@@ -3,6 +3,7 @@
  * Copyright (C) 2006 - INRIA - Fabrice Leray
  * Copyright (C) 2006 - INRIA - Jean-Baptiste Silvy
  * Copyright (C) 2011 - DIGITEO - Vincent COUVERT
+ * 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
@@ -33,18 +34,21 @@ int sci_xgrid(char *fname, unsigned long fname_len)
 {
     SciErr sciErr;
 
-    int* piAddrl1 = NULL;
-    double* l1 = NULL;
+    int* piAddrl = NULL;
+    double* l = NULL;
 
-    int style = 0;              /* Default style */
-    int m1 = 0, n1 = 0;
+    int color[] = {0, 0, 0};              /* Default color */
+    double thickness[] = { -1, -1, -1};
+    int style[] = {3, 3, 3};
+    int m = 0, n = 0, mn = 0;
+    int i;
     int iObjUID = 0;
 
-    CheckInputArgument(pvApiCtx, 0, 1);
+    CheckInputArgument(pvApiCtx, 0, 3);
 
-    if (nbInputArgument(pvApiCtx) == 1)
+    if (nbInputArgument(pvApiCtx) >= 1)
     {
-        sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddrl1);
+        sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddrl);
         if (sciErr.iErr)
         {
             printError(&sciErr, 0);
@@ -52,7 +56,7 @@ int sci_xgrid(char *fname, unsigned long fname_len)
         }
 
         // Retrieve a matrix of double at position 1.
-        sciErr = getMatrixOfDouble(pvApiCtx, piAddrl1, &m1, &n1, &l1);
+        sciErr = getMatrixOfDouble(pvApiCtx, piAddrl, &m, &n, &l);
         if (sciErr.iErr)
         {
             printError(&sciErr, 0);
@@ -60,26 +64,128 @@ int sci_xgrid(char *fname, unsigned long fname_len)
             return 1;
         }
 
-        //CheckScalar
-        if (m1 != 1 || n1 != 1)
+        mn = m * n;
+
+        if (mn == 0 || mn > 3)
         {
-            Scierror(999, _("%s: Wrong size for input argument #%d: A real scalar expected.\n"), fname, 1);
+            Scierror(999, _("%s: Wrong size for input argument #%d: A real scalar or row expected.\n"), fname, 1);
             return 1;
         }
 
-        style = (int)l1[0];
+        if (mn == 1)
+        {
+            color[0] = (int) l[0];
+            color[1] = color[0];
+            color[2] = color[0];
+        }
+        else
+        {
+            for (i = 0; i < mn; i++)
+            {
+                color[i] = (int) l[i];
+            }
+        }
     }
 
     iObjUID = getOrCreateDefaultSubwin();
 
-    setGraphicObjectProperty(iObjUID, __GO_X_AXIS_GRID_COLOR__, &style, jni_int, 1);
-    setGraphicObjectProperty(iObjUID, __GO_Y_AXIS_GRID_COLOR__, &style, jni_int, 1);
-    setGraphicObjectProperty(iObjUID, __GO_Z_AXIS_GRID_COLOR__, &style, jni_int, 1);
+    setGraphicObjectProperty(iObjUID, __GO_X_AXIS_GRID_COLOR__, color, jni_int, 1);
+    setGraphicObjectProperty(iObjUID, __GO_Y_AXIS_GRID_COLOR__, color + 1, jni_int, 1);
+    setGraphicObjectProperty(iObjUID, __GO_Z_AXIS_GRID_COLOR__, color + 2, jni_int, 1);
+
+    if (nbInputArgument(pvApiCtx) >= 2)
+    {
+        sciErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddrl);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            return 1;
+        }
+
+        // Retrieve a matrix of double at position 2.
+        sciErr = getMatrixOfDouble(pvApiCtx, piAddrl, &m, &n, &l);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            Scierror(202, _("%s: Wrong type for argument %d: A real expected.\n"), fname, 2);
+            return 1;
+        }
+
+        mn = m * n;
+
+        if (mn == 0 || mn > 3)
+        {
+            Scierror(999, _("%s: Wrong size for input argument #%d: A real scalar or row expected.\n"), fname, 2);
+            return 1;
+        }
+
+        if (mn == 1)
+        {
+            thickness[0] = l[0];
+            thickness[1] = l[0];
+            thickness[2] = l[0];
+        }
+        else
+        {
+            for (i = 0; i < mn; i++)
+            {
+                thickness[i] = l[i];
+            }
+        }
+
+        setGraphicObjectProperty(iObjUID, __GO_X_AXIS_GRID_THICKNESS__, thickness, jni_double, 1);
+        setGraphicObjectProperty(iObjUID, __GO_Y_AXIS_GRID_THICKNESS__, thickness + 1, jni_double, 1);
+        setGraphicObjectProperty(iObjUID, __GO_Z_AXIS_GRID_THICKNESS__, thickness + 2, jni_double, 1);
+    }
+
+    if (nbInputArgument(pvApiCtx) == 3)
+    {
+        sciErr = getVarAddressFromPosition(pvApiCtx, 3, &piAddrl);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            return 1;
+        }
+
+        // Retrieve a matrix of double at position 1.
+        sciErr = getMatrixOfDouble(pvApiCtx, piAddrl, &m, &n, &l);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            Scierror(202, _("%s: Wrong type for argument %d: A real expected.\n"), fname, 3);
+            return 1;
+        }
+
+        mn = m * n;
+
+        if (mn == 0 || mn > 3)
+        {
+            Scierror(999, _("%s: Wrong size for input argument #%d: A real scalar or row expected.\n"), fname, 3);
+            return 1;
+        }
+
+        if (mn == 1)
+        {
+            style[0] = (int) l[0];
+            style[1] = style[0];
+            style[2] = style[0];
+        }
+        else
+        {
+            for (i = 0; i < mn; i++)
+            {
+                style[i] = (int) l[i];
+            }
+        }
+
+        setGraphicObjectProperty(iObjUID, __GO_X_AXIS_GRID_STYLE__, style, jni_int, 1);
+        setGraphicObjectProperty(iObjUID, __GO_Y_AXIS_GRID_STYLE__, style + 1, jni_int, 1);
+        setGraphicObjectProperty(iObjUID, __GO_Z_AXIS_GRID_STYLE__, style + 2, jni_int, 1);
+    }
 
     AssignOutputVariable(pvApiCtx, 1) = 0;
     ReturnArguments(pvApiCtx);
 
     return 0;
 }
-
 /*--------------------------------------------------------------------------*/
index 2eae196..ff02c18 100755 (executable)
@@ -148,6 +148,8 @@ static getHashTableCouple propertyGetTable[] =
     {"tics_labels", get_tics_labels_property},
     {"box", get_box_property},
     {"grid", get_grid_property},
+    {"grid_thickness", get_grid_thickness_property},
+    {"grid_style", get_grid_style_property},
     {"axes_visible", get_axes_visible_property},
     {"hiddencolor", get_hidden_color_property},
     {"isoview", get_isoview_property},
index 22e5dff..7438a87 100755 (executable)
@@ -151,6 +151,8 @@ static setHashTableCouple propertySetTable[] =
     {"tics_labels", set_tics_labels_property},
     {"box", set_box_property},
     {"grid", set_grid_property},
+    {"grid_thickness", set_grid_thickness_property},
+    {"grid_style", set_grid_style_property},
     {"axes_visible", set_axes_visible_property},
     {"hiddencolor", set_hidden_color_property},
     {"isoview", set_isoview_property},
index b6a4c42..06dae28 100755 (executable)
@@ -144,6 +144,8 @@ int get_ytics_coord_property(void* _pvCtx, int iObjUID);
 int get_tics_labels_property(void* _pvCtx, int iObjUID);
 int get_box_property(void* _pvCtx, int iObjUID);
 int get_grid_property(void* _pvCtx, int iObjUID);
+int get_grid_thickness_property(void* _pvCtx, int iObjUID);
+int get_grid_style_property(void* _pvCtx, int iObjUID);
 int get_axes_visible_property(void* _pvCtx, int iObjUID);
 int get_hidden_color_property(void* _pvCtx, int iObjUID);
 int get_isoview_property(void* _pvCtx, int iObjUID);
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_grid_style_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_grid_style_property.c
new file mode 100644 (file)
index 0000000..9bd49b5
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ * 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_grid_style_property.c                                        */
+/* desc : function to retrieve in Scilab the grid style field of          */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "getHandleProperty.h"
+#include "GetProperty.h"
+#include "returnProperty.h"
+#include "Scierror.h"
+#include "localization.h"
+
+#include "getGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int get_grid_style_property(void* _pvCtx, int iObjUID)
+{
+    double grid[3];
+    int iGridStyle = 0;
+    int* piGridStyle = &iGridStyle;
+    int iView = 0;
+    int* piView = &iView;
+
+    /* need conversion for display in double */
+    getGraphicObjectProperty(iObjUID, __GO_X_AXIS_GRID_STYLE__, jni_int, (void **)&piGridStyle);
+
+    if (piGridStyle == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid_style");
+        return -1;
+    }
+
+    grid[0] = (double) iGridStyle;
+
+    getGraphicObjectProperty(iObjUID, __GO_Y_AXIS_GRID_STYLE__, jni_int, (void **)&piGridStyle);
+    if (piGridStyle == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid_style");
+        return -1;
+    }
+
+    grid[1] = (double) iGridStyle;
+
+    getGraphicObjectProperty(iObjUID, __GO_Z_AXIS_GRID_STYLE__, jni_int, (void **)&piGridStyle);
+    if (piGridStyle == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid_style");
+        return -1;
+    }
+
+    grid[2] = (double) iGridStyle;
+
+    getGraphicObjectProperty(iObjUID, __GO_VIEW__, jni_int, (void **)&piView);
+
+    if (iView)
+    {
+        return sciReturnRowVector(_pvCtx, grid, 3);
+    }
+    else
+    {
+        return sciReturnRowVector(_pvCtx, grid, 2);
+    }
+
+}
+/*------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_grid_thickness_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_grid_thickness_property.c
new file mode 100644 (file)
index 0000000..75d2e6d
--- /dev/null
@@ -0,0 +1,77 @@
+/*
+ * 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_grid_thickness_property.c                                    */
+/* desc : function to retrieve in Scilab the grid thickness field of      */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "getHandleProperty.h"
+#include "GetProperty.h"
+#include "returnProperty.h"
+#include "Scierror.h"
+#include "localization.h"
+
+#include "getGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int get_grid_thickness_property(void* _pvCtx, int iObjUID)
+{
+    double grid[3];
+    double dGridThickness = 0;
+    double * pdGridThickness = &dGridThickness;
+    int iView = 0;
+    int* piView = &iView;
+
+    /* need conversion for display in double */
+    getGraphicObjectProperty(iObjUID, __GO_X_AXIS_GRID_THICKNESS__, jni_double, (void **)&pdGridThickness);
+
+    if (pdGridThickness == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid_thickness");
+        return -1;
+    }
+
+    grid[0] = dGridThickness;
+
+    getGraphicObjectProperty(iObjUID, __GO_Y_AXIS_GRID_THICKNESS__, jni_double, (void **)&pdGridThickness);
+    if (pdGridThickness == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid");
+        return -1;
+    }
+
+    grid[1] = dGridThickness;
+
+    getGraphicObjectProperty(iObjUID, __GO_Z_AXIS_GRID_THICKNESS__, jni_double, (void **)&pdGridThickness);
+    if (pdGridThickness == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid");
+        return -1;
+    }
+
+    grid[2] = dGridThickness;
+
+    getGraphicObjectProperty(iObjUID, __GO_VIEW__, jni_int, (void **)&piView);
+
+    if (iView)
+    {
+        return sciReturnRowVector(_pvCtx, grid, 3);
+    }
+    else
+    {
+        return sciReturnRowVector(_pvCtx, grid, 2);
+    }
+}
+/*------------------------------------------------------------------------*/
index e9c1c77..a8442fe 100755 (executable)
@@ -143,6 +143,8 @@ int set_xtics_coord_property(void* _pvCtx, int iObj, void* _pvData, int valueTyp
 int set_ytics_coord_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_box_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_grid_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
+int set_grid_thickness_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
+int set_grid_style_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_axes_visible_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_hidden_color_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_isoview_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_grid_style_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_grid_style_property.c
new file mode 100644 (file)
index 0000000..c2aa76e
--- /dev/null
@@ -0,0 +1,91 @@
+/*
+ * 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_grid_style_property.c                                        */
+/* desc : function to modify in Scilab the grid style field of            */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "setHandleProperty.h"
+#include "SetProperty.h"
+#include "getPropertyAssignedValue.h"
+#include "SetPropertyStatus.h"
+#include "GetProperty.h"
+#include "Scierror.h"
+#include "localization.h"
+
+#include "getGraphicObjectProperty.h"
+#include "setGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int set_grid_style_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+{
+    BOOL status[3];
+    int i = 0;
+    int iGridStyle = 0;
+    int* piGridStyle = &iGridStyle;
+    int gridStyles[3];
+    int const gridStylePropertiesNames[3] = {__GO_X_AXIS_GRID_STYLE__, __GO_Y_AXIS_GRID_STYLE__, __GO_Z_AXIS_GRID_STYLE__};
+
+    double* values = (double*)_pvData;
+
+    if (valueType != sci_matrix)
+    {
+        Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "grid_style");
+        return SET_PROPERTY_ERROR;
+    }
+
+    if (nbRow != 1 || nbCol > 3)
+    {
+        Scierror(999, _("Wrong size for '%s' property: Must be in the set {%s}.\n"), "grid_style", "1x2, 1x3");
+        return SET_PROPERTY_ERROR;
+    }
+
+    getGraphicObjectProperty(iObjUID, gridStylePropertiesNames[0], jni_int, (void**)&piGridStyle);
+
+    if (piGridStyle == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid_style");
+        return SET_PROPERTY_ERROR;
+    }
+
+    gridStyles[0] = iGridStyle;
+
+    getGraphicObjectProperty(iObjUID, gridStylePropertiesNames[1], jni_int, (void**)&piGridStyle);
+    gridStyles[1] = iGridStyle;
+
+    getGraphicObjectProperty(iObjUID, gridStylePropertiesNames[2], jni_int, (void**)&piGridStyle);
+    gridStyles[2] = iGridStyle;
+
+    for ( i = 0 ; i < nbCol ; i++)
+    {
+        gridStyles[i] = (int) values[i];
+    }
+
+    status[0] = setGraphicObjectProperty(iObjUID, gridStylePropertiesNames[0], &gridStyles[0], jni_int, 1);
+    status[1] = setGraphicObjectProperty(iObjUID, gridStylePropertiesNames[1], &gridStyles[1], jni_int, 1);
+    status[2] = setGraphicObjectProperty(iObjUID, gridStylePropertiesNames[2], &gridStyles[2], jni_int, 1);
+
+    if (status[0] == TRUE && status[1] == TRUE && status[2] == TRUE)
+    {
+        return SET_PROPERTY_SUCCEED;
+    }
+    else
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid_style");
+        return SET_PROPERTY_ERROR;
+    }
+
+}
+/*------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_grid_thickness_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_grid_thickness_property.c
new file mode 100644 (file)
index 0000000..ff05644
--- /dev/null
@@ -0,0 +1,91 @@
+/*
+ * 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_grid_thickness_property.c                                    */
+/* desc : function to modify in Scilab the grid thickness field of        */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "setHandleProperty.h"
+#include "SetProperty.h"
+#include "getPropertyAssignedValue.h"
+#include "SetPropertyStatus.h"
+#include "GetProperty.h"
+#include "Scierror.h"
+#include "localization.h"
+
+#include "getGraphicObjectProperty.h"
+#include "setGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int set_grid_thickness_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+{
+    BOOL status[3];
+    int i = 0;
+    double dGridThickness = 0;
+    double* pdGridThickness = &dGridThickness;
+    double gridStyles[3];
+    int const gridThicknessPropertiesNames[3] = {__GO_X_AXIS_GRID_THICKNESS__, __GO_Y_AXIS_GRID_THICKNESS__, __GO_Z_AXIS_GRID_THICKNESS__};
+
+    double* values = (double*)_pvData;
+
+    if (valueType != sci_matrix)
+    {
+        Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "grid_thickness");
+        return SET_PROPERTY_ERROR;
+    }
+
+    if (nbRow != 1 || nbCol > 3)
+    {
+        Scierror(999, _("Wrong size for '%s' property: Must be in the set {%s}.\n"), "grid_thickness", "1x2, 1x3");
+        return SET_PROPERTY_ERROR;
+    }
+
+    getGraphicObjectProperty(iObjUID, gridThicknessPropertiesNames[0], jni_double, (void**)&pdGridThickness);
+
+    if (pdGridThickness == NULL)
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid_thickness");
+        return SET_PROPERTY_ERROR;
+    }
+
+    gridStyles[0] = dGridThickness;
+
+    getGraphicObjectProperty(iObjUID, gridThicknessPropertiesNames[1], jni_double, (void**)&pdGridThickness);
+    gridStyles[1] = dGridThickness;
+
+    getGraphicObjectProperty(iObjUID, gridThicknessPropertiesNames[2], jni_double, (void**)&pdGridThickness);
+    gridStyles[2] = dGridThickness;
+
+    for ( i = 0 ; i < nbCol ; i++)
+    {
+        gridStyles[i] = values[i];
+    }
+
+    status[0] = setGraphicObjectProperty(iObjUID, gridThicknessPropertiesNames[0], &gridStyles[0], jni_double, 1);
+    status[1] = setGraphicObjectProperty(iObjUID, gridThicknessPropertiesNames[1], &gridStyles[1], jni_double, 1);
+    status[2] = setGraphicObjectProperty(iObjUID, gridThicknessPropertiesNames[2], &gridStyles[2], jni_double, 1);
+
+    if (status[0] == TRUE && status[1] == TRUE && status[2] == TRUE)
+    {
+        return SET_PROPERTY_SUCCEED;
+    }
+    else
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "grid_thickness");
+        return SET_PROPERTY_ERROR;
+    }
+
+}
+/*------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_6191.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_6191.dia.ref
new file mode 100644 (file)
index 0000000..c89607e
--- /dev/null
@@ -0,0 +1,21 @@
+// =============================================================================
+// 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 -->
+// <-- Non-regression test for bug 6191 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/6191
+//
+// <-- Short Description -->
+// It was not possible to set thickness and line_style properties for a grid
+clf();
+x = [0:0.05*%pi:2*%pi]';
+plot2d(x, sin(x))
+xgrid(5, 1, 7);
+a = gca();
+a.grid_thickness = [2 2];
+a.grid_style = [1 5];
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_6191.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_6191.tst
new file mode 100644 (file)
index 0000000..8a584c6
--- /dev/null
@@ -0,0 +1,24 @@
+// =============================================================================
+// 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 -->
+
+// <-- Non-regression test for bug 6191 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/6191
+//
+// <-- Short Description -->
+// It was not possible to set thickness and line_style properties for a grid
+
+clf();
+x = [0:0.05*%pi:2*%pi]';
+plot2d(x, sin(x))
+xgrid(5, 1, 7);
+a = gca();
+a.grid_thickness = [2 2];
+a.grid_style = [1 5];
index d61776f..9c51cdd 100644 (file)
@@ -265,6 +265,8 @@ function [] = %_save(%__filename__, varargin)
         "axes_reverse", ...
         "grid", ...
         "grid_position", ...
+        "grid_thickness", ...
+        "grid_style", ...
         "x_location", ...
         "y_location", ...
         "view", ...
index b98da53..1f82c53 100644 (file)
@@ -31,6 +31,7 @@ import org.scilab.forge.scirenderer.tranformations.Vector3d;
 import org.scilab.modules.graphic_objects.axes.Axes;
 import org.scilab.modules.graphic_objects.axes.AxisProperty;
 import org.scilab.modules.graphic_objects.axes.Camera;
+import org.scilab.modules.graphic_objects.contouredObject.Line;
 import org.scilab.modules.graphic_objects.figure.ColorMap;
 import org.scilab.modules.graphic_objects.graphicController.GraphicController;
 import org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties;
@@ -50,11 +51,6 @@ import java.util.List;
  */
 public class AxesRulerDrawer {
 
-    /**
-     * Grid pattern.
-     */
-    private static final short GRID_LINE_PATTERN = (short) 0xF0F0;
-
     private static final double LINEAR_MINIMAL_SUB_TICKS_DISTANCE = 8;
     private static final double LOG_MINIMAL_SUB_TICKS_DISTANCE = 2;
 
@@ -321,8 +317,6 @@ public class AxesRulerDrawer {
      */
     public void drawRuler(Axes axes, AxesDrawer axesDrawer, ColorMap colorMap, DrawingTools drawingTools) throws SciRendererException {
         Appearance gridAppearance = new Appearance();
-        gridAppearance.setLinePattern(GRID_LINE_PATTERN);
-        gridAppearance.setLineWidth(axes.getLineThickness().floatValue());
 
         Double[] bounds = axes.getDisplayedBounds();
         double[] matrix = drawingTools.getTransformationManager().getModelViewStack().peek().getMatrix();
@@ -373,6 +367,8 @@ public class AxesRulerDrawer {
                 }
 
                 gridAppearance.setLineColor(ColorFactory.createColor(colorMap, axes.getXAxisGridColor()));
+                gridAppearance.setLineWidth(axes.getXAxisGridThickness().floatValue());
+                gridAppearance.setLinePattern(Line.LineType.fromScilabIndex(axes.getXAxisGridStyle()).asPattern());
                 drawingTools.getTransformationManager().getModelViewStack().pushRightMultiply(mirror);
                 DefaultGeometry gridGeometry = new DefaultGeometry();
                 gridGeometry.setFillDrawingMode(Geometry.FillDrawingMode.NONE);
@@ -414,6 +410,8 @@ public class AxesRulerDrawer {
                 }
 
                 gridAppearance.setLineColor(ColorFactory.createColor(colorMap, axes.getYAxisGridColor()));
+                gridAppearance.setLineWidth(axes.getYAxisGridThickness().floatValue());
+                gridAppearance.setLinePattern(Line.LineType.fromScilabIndex(axes.getYAxisGridStyle()).asPattern());
                 drawingTools.getTransformationManager().getModelViewStack().pushRightMultiply(mirror);
                 DefaultGeometry gridGeometry = new DefaultGeometry();
                 gridGeometry.setFillDrawingMode(Geometry.FillDrawingMode.NONE);
@@ -456,6 +454,8 @@ public class AxesRulerDrawer {
                     }
 
                     gridAppearance.setLineColor(ColorFactory.createColor(colorMap, axes.getZAxisGridColor()));
+                    gridAppearance.setLineWidth(axes.getZAxisGridThickness().floatValue());
+                    gridAppearance.setLinePattern(Line.LineType.fromScilabIndex(axes.getZAxisGridStyle()).asPattern());
                     drawingTools.getTransformationManager().getModelViewStack().pushRightMultiply(mirror);
                     DefaultGeometry gridGeometry = new DefaultGeometry();
                     gridGeometry.setFillDrawingMode(Geometry.FillDrawingMode.NONE);