diff --git a/Project/Sources/Methods/Compiler_SVG_Public.4dm b/Project/Sources/Methods/Compiler_SVG_Public.4dm index 4b3ccaa..75c06a5 100644 --- a/Project/Sources/Methods/Compiler_SVG_Public.4dm +++ b/Project/Sources/Methods/Compiler_SVG_Public.4dm @@ -9,51 +9,6 @@ //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: If (False:C215) - //SVG_ADD_NAME_SPACE - //_O_C_TEXT(SVG_ADD_NAMESPACE; $1) - //_O_C_TEXT(SVG_ADD_NAMESPACE; $2) - //_O_C_TEXT(SVG_ADD_NAMESPACE; $3) - - //SVG_Define_clip_Path - //_O_C_TEXT(SVG_Define_clip_Path; $0) - //_O_C_TEXT(SVG_Define_clip_Path; $1) - //_O_C_TEXT(SVG_Define_clip_Path; $2) - - //SVG_Define_solidColor - //_O_C_TEXT(SVG_Define_solidColor; $0) - //_O_C_TEXT(SVG_Define_solidColor; $1) - //_O_C_TEXT(SVG_Define_solidColor; $2) - //_O_C_TEXT(SVG_Define_solidColor; $3) - //_O_C_LONGINT(SVG_Define_solidColor; $4) - - //SVG_Define_filter - //_O_C_TEXT(SVG_Define_filter; $0) - //_O_C_TEXT(SVG_Define_filter; $1) - //_O_C_TEXT(SVG_Define_filter; $2) - //_O_C_REAL(SVG_Define_filter; $3) - //_O_C_REAL(SVG_Define_filter; $4) - //_O_C_REAL(SVG_Define_filter; $5) - //_O_C_REAL(SVG_Define_filter; $6) - //_O_C_TEXT(SVG_Define_filter; $7) - //_O_C_TEXT(SVG_Define_filter; $8) - - //SVG_Define_shadow - //_O_C_TEXT(SVG_Define_shadow; $0) - //_O_C_TEXT(SVG_Define_shadow; $1) - //_O_C_TEXT(SVG_Define_shadow; $2) - //_O_C_LONGINT(SVG_Define_shadow; $3) - //_O_C_LONGINT(SVG_Define_shadow; $4) - //_O_C_LONGINT(SVG_Define_shadow; $5) - - //SVG_Define_gradient_l_by_arrays - _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; $1) - _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; $2) - _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $3) - _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $4) - _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $5) - _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $6) - _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; ${7}) - //SVG_Define_gradient_r_by_arrays _O_C_TEXT:C284(SVG_Define_gradient_r_by_arrays; $1) _O_C_TEXT:C284(SVG_Define_gradient_r_by_arrays; $2) @@ -64,13 +19,6 @@ If (False:C215) _O_C_LONGINT:C283(SVG_Define_gradient_r_by_arrays; $7) _O_C_TEXT:C284(SVG_Define_gradient_r_by_arrays; ${8}) - //SVG_Define_image - _O_C_TEXT:C284(SVG_Define_image; $0) - _O_C_TEXT:C284(SVG_Define_image; $1) - _O_C_TEXT:C284(SVG_Define_image; $2) - _O_C_PICTURE:C286(SVG_Define_image; $3) - _O_C_TEXT:C284(SVG_Define_image; $4) - //SVG_Define_linear_gradient _O_C_TEXT:C284(SVG_Define_linear_gradient; $0) _O_C_TEXT:C284(SVG_Define_linear_gradient; $1) @@ -155,13 +103,6 @@ If (False:C215) _O_C_REAL:C285(SVG_Define_symbol_from_file; $7) _O_C_TEXT:C284(SVG_Define_symbol_from_file; $8) - //SVG_DELETE_OBJECT - _O_C_TEXT:C284(SVG_DELETE_OBJECT; $1) - - //SVG_Get_root_reference - _O_C_TEXT:C284(SVG_Get_root_reference; $0) - _O_C_TEXT:C284(SVG_Get_root_reference; $1) - //SVG_New_group _O_C_TEXT:C284(SVG_New_group; $0) _O_C_TEXT:C284(SVG_New_group; $1) @@ -183,15 +124,6 @@ If (False:C215) _O_C_TEXT:C284(SVG_SET_PATTERN_CONTENT_UNITS; $1) _O_C_TEXT:C284(SVG_SET_PATTERN_CONTENT_UNITS; $2) - //SVG_SET_PATTERN_UNITS - _O_C_TEXT:C284(SVG_SET_PATTERN_UNITS; $1) - _O_C_TEXT:C284(SVG_SET_PATTERN_UNITS; $2) - - //SVG_Set_title - _O_C_TEXT:C284(SVG_Set_title; $0) - _O_C_TEXT:C284(SVG_Set_title; $1) - _O_C_TEXT:C284(SVG_Set_title; $2) - //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: End if diff --git a/Project/Sources/Methods/SVG_CLEAR.4dm b/Project/Sources/Methods/SVG_CLEAR.4dm index f32177b..7bdb920 100644 --- a/Project/Sources/Methods/SVG_CLEAR.4dm +++ b/Project/Sources/Methods/SVG_CLEAR.4dm @@ -23,7 +23,7 @@ var $Lon_x : Integer Compiler_SVG -$kTxt_currentMethod:="SVG_CLEAR" // Nom methode courante +$kTxt_currentMethod:="SVG_CLEAR" If (Count parameters:C259>=1) diff --git a/Project/Sources/Methods/SVG_DELETE_OBJECT.4dm b/Project/Sources/Methods/SVG_DELETE_OBJECT.4dm index b5e7d5b..933f8ab 100644 --- a/Project/Sources/Methods/SVG_DELETE_OBJECT.4dm +++ b/Project/Sources/Methods/SVG_DELETE_OBJECT.4dm @@ -1,59 +1,41 @@ //%attributes = {"invisible":true,"shared":true,"preemptive":"capable"} - // ---------------------------------------------------- - // Method : SVG_DELETE_OBJECT - // Created 16/04/10 by Vincent de Lachaux - // ---------------------------------------------------- - // Description - // - // ---------------------------------------------------- - // Declarations -C_TEXT:C284($1) +// ---------------------------------------------------- +// Method : SVG_DELETE_OBJECT +// Created 16/04/10 by Vincent de Lachaux +// ---------------------------------------------------- +#DECLARE($svgObject : Text) -C_LONGINT:C283($Lon_parameters) -C_TEXT:C284($Dom_root;$kTxt_currentMethod;$Txt_svgObject) +var $CURRENT_METHOD; $root : Text -If (False:C215) - C_TEXT:C284(SVG_DELETE_OBJECT ;$1) -End if - - // ---------------------------------------------------- - // Initialisations - -Compiler_SVG +Compiler_SVG -$Lon_parameters:=Count parameters:C259 +$CURRENT_METHOD:="SVG_DELETE_OBJECT" -$kTxt_currentMethod:="SVG_DELETE_OBJECT" //Nom methode courante - - // ---------------------------------------------------- +If (Count parameters:C259<1) + + ASSERT:C1129(Component_putError(8850; $CURRENT_METHOD)) // Parameters Missing + + return + +End if -If ($Lon_parameters>=1) +If (Asserted:C1132(xml_referenceValid($svgObject); Localized string:C991("error_badReference"))) - $Txt_svgObject:=$1 + Component_errorHandler("init"; $CURRENT_METHOD) - If (Asserted:C1132(xml_referenceValid ($Txt_svgObject);Get localized string:C991("error_badReference"))) - - Component_errorHandler ("init";$kTxt_currentMethod) + $root:=DOM Get root XML element:C1053($svgObject) + + If (Bool:C1537(OK))\ + && (xml_referenceValid($root)) - $Dom_root:=DOM Get root XML element:C1053($Txt_svgObject) + DOM REMOVE XML ELEMENT:C869($svgObject) - If (OK=1)\ - & ($Dom_root#"0000000000000000") - - DOM REMOVE XML ELEMENT:C869($Txt_svgObject) - - Else - - ASSERT:C1129(Component_putError (8852;$kTxt_currentMethod)) //The reference is not a svg object - - End if + Else - ASSERT:C1129(Component_errorHandler ("deinit")) + ASSERT:C1129(Component_putError(8852; $CURRENT_METHOD)) // The reference is not a svg object End if -Else - - ASSERT:C1129(Component_putError (8850;$kTxt_currentMethod)) //Parameters Missing + ASSERT:C1129(Component_errorHandler("deinit")) End if \ No newline at end of file diff --git a/Project/Sources/Methods/SVG_Define_gradient_l_by_arrays.4dm b/Project/Sources/Methods/SVG_Define_gradient_l_by_arrays.4dm index e63f642..a3257f7 100644 --- a/Project/Sources/Methods/SVG_Define_gradient_l_by_arrays.4dm +++ b/Project/Sources/Methods/SVG_Define_gradient_l_by_arrays.4dm @@ -4,124 +4,96 @@ // Framework SVgg // Author : Gérald Czwiklinski //----------------------------------------------------------------------------------------------------- -_O_C_TEXT:C284($1) -_O_C_TEXT:C284($2) -_O_C_LONGINT:C283($3) -_O_C_LONGINT:C283($4) -_O_C_LONGINT:C283($5) -_O_C_LONGINT:C283($6) -_O_C_TEXT:C284(${7}) +#DECLARE($svgObject : Text; $id : Text; $x1 : Integer; $y1 : Integer; $x2 : Integer; $y2 : Integer; ... : Text) -_O_C_LONGINT:C283($Lon_i; $Lon_offset; $Lon_opacity; $Lon_parameters; $Lon_step; $Lon_x) -_O_C_LONGINT:C283($Lon_x1; $Lon_x2; $Lon_y1; $Lon_y2) -_O_C_TEXT:C284($kTxt_currentMethod; $Txt_color; $Txt_colorName; $Txt_defsID; $Txt_gradientID; $Txt_gradientName) -_O_C_TEXT:C284($Txt_rootReference; $Txt_Stop; $Txt_svgObject) - -If (False:C215) - _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; $1) - _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; $2) - _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $3) - _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $4) - _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $5) - _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $6) - _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; ${7}) -End if +var $color; $colorName; $CURRENT_METHOD; $defs; $node; $stop : Text +var $countParamaters; $i; $offset; $opacity; $pos; $step : Integer Compiler_SVG -$Lon_parameters:=Count parameters:C259 -$kTxt_currentMethod:=Current method name:C684 +$CURRENT_METHOD:="SVG_Define_gradient_l_by_arrays" +$countParamaters:=Count parameters:C259 -If ($Lon_parameters>=6) +If ($countParamaters<6) - $Txt_svgObject:=$1 - $Txt_gradientName:=$2 - $Lon_x1:=$3 - $Lon_y1:=$4 - $Lon_x2:=$5 - $Lon_y2:=$6 + ASSERT:C1129(Component_putError(8850; $CURRENT_METHOD)) // Parameters Missing - Component_errorHandler("init"; $kTxt_currentMethod) + return - $Txt_defsID:=getDefs($Txt_svgObject) +End if + +Component_errorHandler("init"; $CURRENT_METHOD) + +$defs:=getDefs($svgObject) + +If (Bool:C1537(OK)) - If (OK=1) - - $Txt_gradientID:=DOM Find XML element by ID:C1010($Txt_defsID; $Txt_gradientName) - - If (OK=1) //Delete the existing gradient - - DOM REMOVE XML ELEMENT:C869($Txt_gradientID) - - End if + $node:=DOM Find XML element by ID:C1010($defs; $id) + + If (Bool:C1537(OK)) // Delete the existing gradient - //Create the gradient { - $Txt_gradientID:=DOM Create XML element:C865($Txt_defsID; "linearGradient"; \ - "id"; $Txt_gradientName; \ - "gradientUnits"; "userSpaceOnUse") - DOM SET XML ATTRIBUTE:C866($Txt_gradientID; \ - "x1"; $Lon_x1; \ - "y1"; $Lon_y1; \ - "x2"; $Lon_x2; \ - "y2"; $Lon_y2) - //} + DOM REMOVE XML ELEMENT:C869($node) End if - $Lon_step:=100\($Lon_parameters-7) + // Create the gradient + $node:=DOM Create XML element:C865($defs; "linearGradient"; \ + "id"; $id; \ + "gradientUnits"; "userSpaceOnUse") - For ($Lon_i; 7; $Lon_parameters; 1) - - $Txt_color:="" - $Lon_opacity:=-1 + DOM SET XML ATTRIBUTE:C866($node; \ + "x1"; $x1; \ + "y1"; $y1; \ + "x2"; $x2; \ + "y2"; $y2) + +End if + +$step:=100\($countParamaters-7) + +For ($i; 7; $countParamaters; 1) + + $color:=${$i} + $opacity:=-1 + + $pos:=Position:C15(":"; $color) + + If ($pos>0) - $Txt_color:=${$Lon_i} + $opacity:=Num:C11(Substring:C12($color; $pos+1)) + $color:=Lowercase:C14(Substring:C12($color; 1; $pos-1)) - $Lon_x:=Position:C15(":"; $Txt_color) + End if + + If (Length:C16($color)>0) - If ($Lon_x>0) + If ($colorName#"url(@") - $Lon_opacity:=Num:C11(Substring:C12($Txt_color; $Lon_x+1)) - $Txt_color:=Lowercase:C14(Substring:C12($Txt_color; 1; $Lon_x-1)) + $colorName:=Lowercase:C14($colorName) End if - If (Length:C16($Txt_color)>0) - - If ($Txt_colorName#"url(@") - - $Txt_colorName:=Lowercase:C14($Txt_colorName) - - End if - - $Txt_Stop:=DOM Create XML element:C865($Txt_gradientID; "stop"; \ - "offset"; String:C10($Lon_offset)+"%"; \ - "stop-color"; $Txt_color) - - If ($Lon_opacity#-1)\ - & (OK=1) - - DOM SET XML ATTRIBUTE:C866($Txt_Stop; \ - "stop-opacity"; $Lon_opacity) - - End if - End if + $stop:=DOM Create XML element:C865($node; "stop"; \ + "offset"; String:C10($offset)+"%"; \ + "stop-color"; $color) - If (OK=1) - - $Lon_offset:=$Lon_offset+$Lon_step + If (Bool:C1537(OK)) && ($opacity#-1) - Else - - $Lon_i:=MAXLONG:K35:2-1 + DOM SET XML ATTRIBUTE:C866($stop; \ + "stop-opacity"; $opacity) End if - End for - - ASSERT:C1129(Component_errorHandler("deinit")) - -Else - - ASSERT:C1129(Component_putError(8850; $kTxt_currentMethod)) //Parameters Missing + End if -End if \ No newline at end of file + If (Bool:C1537(OK)) + + $offset+=$step + + Else + + break + + End if +End for + +ASSERT:C1129(Component_errorHandler("deinit")) \ No newline at end of file diff --git a/Project/Sources/Methods/SVG_Define_image.4dm b/Project/Sources/Methods/SVG_Define_image.4dm index 518cb5d..c963a1c 100644 --- a/Project/Sources/Methods/SVG_Define_image.4dm +++ b/Project/Sources/Methods/SVG_Define_image.4dm @@ -10,107 +10,81 @@ // Modified by Vincent de Lachaux (16/06/08) // 2004 -> v11 // ---------------------------------------------------- -_O_C_TEXT:C284($0) -_O_C_TEXT:C284($1) -_O_C_TEXT:C284($2) -_O_C_PICTURE:C286($3) -_O_C_TEXT:C284($4) +#DECLARE($svgObject : Text; $ID : Text; $image : Picture; $codec : Text) : Text -_O_C_BLOB:C604($Blb_Buffer) -_O_C_LONGINT:C283($Lon_parameters) -_O_C_PICTURE:C286($Pic_image) -_O_C_REAL:C285($Num_height; $Num_left; $Num_top; $Num_width) -_O_C_TEXT:C284($kTxt_currentMethod; $Txt_codec; $Txt_defsID; $Txt_ID; $Txt_image; $Txt_nodeReference) -_O_C_TEXT:C284($Txt_rootReference; $Txt_svgObject) - -If (False:C215) - _O_C_TEXT:C284(SVG_Define_image; $0) - _O_C_TEXT:C284(SVG_Define_image; $1) - _O_C_TEXT:C284(SVG_Define_image; $2) - _O_C_PICTURE:C286(SVG_Define_image; $3) - _O_C_TEXT:C284(SVG_Define_image; $4) -End if +var $height; $left; $top; $width : Real +var $CURRENT_METHOD; $defs; $encoded; $node; $Txt_rootReference : Text +var $blb : Blob Compiler_SVG -$Lon_parameters:=Count parameters:C259 -$kTxt_currentMethod:=Current method name:C684 +$CURRENT_METHOD:="SVG_Define_image" -If ($Lon_parameters>=3) +If (Count parameters:C259<3) + + ASSERT:C1129(Component_putError(8850; $CURRENT_METHOD)) // Parameters Missing + + return - $Txt_svgObject:=$1 - $Txt_ID:=$2 - $Pic_image:=$3 +End if + +$codec:=$codec || ".png" + +Component_errorHandler("init"; $CURRENT_METHOD) + +$defs:=getDefs($svgObject) + +If (OK=1) - $Txt_codec:=".png" + $node:=DOM Find XML element by ID:C1010($defs; $ID) - If ($Lon_parameters>=4) + If (Bool:C1537(OK)) // Delete the existing image - $Txt_codec:=$4 //default is .png + DOM REMOVE XML ELEMENT:C869($node) End if - Component_errorHandler("init"; $kTxt_currentMethod) + // Create the image { - $Txt_defsID:=getDefs($Txt_svgObject) - - If (OK=1) + If (Picture size:C356($image)>0) - $Txt_nodeReference:=DOM Find XML element by ID:C1010($Txt_defsID; $Txt_ID) + PICTURE PROPERTIES:C457($image; $width; $height) - If (OK=1) //Delete the existing image - - DOM REMOVE XML ELEMENT:C869($Txt_nodeReference) - - End if + // Encode in base64 + PICTURE TO BLOB:C692($image; $blb; $codec) - //Create the image { - If (Picture size:C356($Pic_image)>0) + If (Bool:C1537(OK)) - PICTURE PROPERTIES:C457($Pic_image; $Num_width; $Num_height) + BASE64 ENCODE:C895($blb; $encoded) + SET BLOB SIZE:C606($blb; 0) - //Encode in base64 - PICTURE TO BLOB:C692($Pic_image; $Blb_Buffer; $Txt_codec) + $encoded:="data:;base64,"+$encoded - If (OK=1) - - BASE64 ENCODE:C895($Blb_Buffer; $Txt_image) - SET BLOB SIZE:C606($Blb_Buffer; 0) - - $Txt_image:="data:;base64,"+$Txt_image - - End if End if + End if + + If (Bool:C1537(OK)) - If (OK=1) - - //Add the xmlns:link - DOM SET XML ATTRIBUTE:C866($Txt_rootReference; \ - "xmlns:xlink"; "http://www.w3.org/1999/xlink") - - //Put the encoded image - $Txt_nodeReference:=DOM Create XML element:C865($Txt_defsID; "image"; \ - "xlink:href"; $Txt_image; \ - "x"; $Num_left; \ - "y"; $Num_top; \ - "width"; $Num_width; \ - "height"; $Num_height; \ - "id"; $Txt_ID) - - End if - //} + // Add the xmlns:link + DOM SET XML ATTRIBUTE:C866($Txt_rootReference; \ + "xmlns:xlink"; "http://www.w3.org/1999/xlink") + + // Put the encoded image + $node:=DOM Create XML element:C865($defs; "image"; \ + "xlink:href"; $encoded; \ + "x"; $left; \ + "y"; $top; \ + "width"; $width; \ + "height"; $height; \ + "id"; $ID) - If (OK=1) - - $0:=$Txt_nodeReference - - End if End if +End if + +ASSERT:C1129(Component_errorHandler("deinit")) + +If (Bool:C1537(OK)) - ASSERT:C1129(Component_errorHandler("deinit")) - -Else - - ASSERT:C1129(Component_putError(8850; $kTxt_currentMethod)) //Parameters Missing + return $node End if \ No newline at end of file diff --git a/Project/Sources/Methods/SVG_Get_root_reference.4dm b/Project/Sources/Methods/SVG_Get_root_reference.4dm index 773016a..d126ce3 100644 --- a/Project/Sources/Methods/SVG_Get_root_reference.4dm +++ b/Project/Sources/Methods/SVG_Get_root_reference.4dm @@ -1,50 +1,33 @@ //%attributes = {"invisible":true,"shared":true,"preemptive":"capable"} - // ---------------------------------------------------- - // Project method : SVG_Get_root_reference - // ID[76048F80C779454DB25CFCDC833CF59E] - // Created 04/07/11 by Vincent de Lachaux - // ---------------------------------------------------- - // Description: - // SVG_Get_root_reference (svg_ref) -> svg_ref - // Retrieves the root SVG element - // ---------------------------------------------------- - // Declarations -C_TEXT:C284($0) -C_TEXT:C284($1) +// ---------------------------------------------------- +// Project method : SVG_Get_root_reference +// ID[76048F80C779454DB25CFCDC833CF59E] +// Created 04/07/11 by Vincent de Lachaux +// ---------------------------------------------------- +// Description: +// SVG_Get_root_reference (svg_ref) -> svg_ref +// Retrieves the root SVG element +// ---------------------------------------------------- +#DECLARE($svgObject : Text) : Text -C_LONGINT:C283($Lon_parameters) -C_TEXT:C284($Dom_svgObject;$kTxt_currentMethod) +var $CURRENT_METHOD : Text -If (False:C215) - C_TEXT:C284(SVG_Get_root_reference ;$0) - C_TEXT:C284(SVG_Get_root_reference ;$1) -End if - - // ---------------------------------------------------- - // Initialisations -$Lon_parameters:=Count parameters:C259 -$kTxt_currentMethod:="SVG_Get_root_reference" //Nom methode courante +$CURRENT_METHOD:="SVG_Get_root_reference" -If (Asserted:C1132($Lon_parameters>=1;Get localized string:C991("error_missingParameter"))) - - $Dom_svgObject:=$1 +If (Count parameters:C259<1) -Else + ASSERT:C1129(Component_putError(8850; $CURRENT_METHOD)) // Parameters Missing - ASSERT:C1129(Component_putError (8850;$kTxt_currentMethod)) //Parameters Missing + return End if - // ---------------------------------------------------- -If (Asserted:C1132(xml_referenceValid ($Dom_svgObject);Get localized string:C991("error_badReference"))) +If (Asserted:C1132(xml_referenceValid($svgObject); Localized string:C991("error_badReference"))) - $0:=DOM Get root XML element:C1053($Dom_svgObject) + return DOM Get root XML element:C1053($svgObject) Else - ASSERT:C1129(Component_putError (8852;$kTxt_currentMethod)) //The reference is not a svg object + ASSERT:C1129(Component_putError(8852; $CURRENT_METHOD)) // The reference is not a svg object -End if - - // ---------------------------------------------------- - // End \ No newline at end of file +End if \ No newline at end of file diff --git a/Project/Sources/Methods/SVG_SET_PATTERN_UNITS.4dm b/Project/Sources/Methods/SVG_SET_PATTERN_UNITS.4dm index a181a86..c8ec50b 100644 --- a/Project/Sources/Methods/SVG_SET_PATTERN_UNITS.4dm +++ b/Project/Sources/Methods/SVG_SET_PATTERN_UNITS.4dm @@ -1,77 +1,59 @@ //%attributes = {"invisible":true,"shared":true,"preemptive":"capable"} - // ---------------------------------------------------- - // Method : SVG_SET_PATTERN_UNITS - // Created 07/04/10 by Vincent de Lachaux - // ---------------------------------------------------- - // Description - // - // ---------------------------------------------------- - // Declarations -C_TEXT:C284($1) -C_TEXT:C284($2) +// ---------------------------------------------------- +// Method : SVG_SET_PATTERN_UNITS +// Created 07/04/10 by Vincent de Lachaux +// ---------------------------------------------------- +#DECLARE($svgObject : Text; $patternUnit : Text) -C_LONGINT:C283($Lon_parameters) -C_TEXT:C284($Dom_svgObject;$kTxt_currentMethod;$Txt_name;$Txt_patternUnit) +var $CURRENT_METHOD; $name : Text -If (False:C215) - C_TEXT:C284(SVG_SET_PATTERN_UNITS ;$1) - C_TEXT:C284(SVG_SET_PATTERN_UNITS ;$2) -End if +Compiler_SVG - // ---------------------------------------------------- - // Initialisations -Compiler_SVG +$CURRENT_METHOD:="SVG_SET_PATTERN_UNITS" -$Lon_parameters:=Count parameters:C259 -$kTxt_currentMethod:=Current method name:C684 +If (Count parameters:C259<2) + + ASSERT:C1129(Component_putError(8850; $CURRENT_METHOD)) // Parameters Missing + + return + +End if - // ---------------------------------------------------- -If ($Lon_parameters>=2) +If (Asserted:C1132(xml_referenceValid($svgObject); Localized string:C991("error_badReference"))) - $Dom_svgObject:=$1 - $Txt_patternUnit:=$2 + Component_errorHandler("init"; $CURRENT_METHOD) - If (Asserted:C1132(xml_referenceValid ($Dom_svgObject);Get localized string:C991("error_badReference"))) - - Component_errorHandler ("init";$kTxt_currentMethod) + DOM GET XML ELEMENT NAME:C730($svgObject; $name) + + If ($name="pattern") - DOM GET XML ELEMENT NAME:C730($Dom_svgObject;$Txt_name) + ARRAY TEXT:C222($_patternUnits; 0x0000) + COLLECTION TO ARRAY:C1562(Storage:C1525.svg["patternUnits"]; $_patternUnits) - If ($Txt_name="pattern") - - ARRAY TEXT:C222($tTxt_patternUnits;0x0000) - COLLECTION TO ARRAY:C1562(Storage:C1525.svg["patternUnits"];$tTxt_patternUnits) + If (Find in array:C230($_patternUnits; $patternUnit)>0) - If (Find in array:C230($tTxt_patternUnits;$Txt_patternUnit)>0) - - DOM SET XML ATTRIBUTE:C866($Dom_svgObject;\ - "patternUnits";$Txt_patternUnit) - - Else - - ASSERT:C1129(Component_putError (8853;$kTxt_currentMethod)) //Invalid Value for an Attribute - - End if - - //#ACI0091143 - CLEAR VARIABLE:C89($tTxt_patternUnits) + DOM SET XML ATTRIBUTE:C866($svgObject; \ + "patternUnits"; $patternUnit) Else - ASSERT:C1129(Component_putError (8854)) //Impossible to apply this Command for this Node + ASSERT:C1129(Component_putError(8853; $CURRENT_METHOD)) // Invalid Value for an Attribute End if - ASSERT:C1129(Component_errorHandler ("deinit")) + // #ACI0091143 + CLEAR VARIABLE:C89($_patternUnits) Else - ASSERT:C1129(Component_putError (8852;$kTxt_currentMethod)) //The reference is not a svg object + ASSERT:C1129(Component_putError(8854)) // Impossible to apply this Command for this Node End if + ASSERT:C1129(Component_errorHandler("deinit")) + Else - ASSERT:C1129(Component_putError (8850;$kTxt_currentMethod)) //Parameters Missing + ASSERT:C1129(Component_putError(8852; $CURRENT_METHOD)) // The reference is not a svg object End if \ No newline at end of file diff --git a/Project/Sources/Methods/SVG_Set_title.4dm b/Project/Sources/Methods/SVG_Set_title.4dm index 24e1ec7..d358a33 100644 --- a/Project/Sources/Methods/SVG_Set_title.4dm +++ b/Project/Sources/Methods/SVG_Set_title.4dm @@ -1,90 +1,72 @@ //%attributes = {"invisible":true,"shared":true,"preemptive":"capable"} - // ---------------------------------------------------- - // Method : SVG_Set_title - // Created 21/07/08 by Vincent de Lachaux - // ---------------------------------------------------- - // Description - // - // ---------------------------------------------------- -C_TEXT:C284($0) -C_TEXT:C284($1) -C_TEXT:C284($2) +// ---------------------------------------------------- +// Method : SVG_Set_title +// Created 21/07/08 by Vincent de Lachaux +// ---------------------------------------------------- +#DECLARE($svgObject : Text; $value : Text) : Text -C_LONGINT:C283($Lon_parameters) -C_TEXT:C284($Dom_node;$Dom_svgObject;$kTxt_currentMethod;$Txt_name;$Txt_value) +var $CURRENT_METHOD; $name; $node : Text -If (False:C215) - C_TEXT:C284(SVG_Set_title ;$0) - C_TEXT:C284(SVG_Set_title ;$1) - C_TEXT:C284(SVG_Set_title ;$2) -End if +Compiler_SVG -Compiler_SVG +$CURRENT_METHOD:="SVG_Set_title" -$Lon_parameters:=Count parameters:C259 -$kTxt_currentMethod:="SVG_Set_title" //Nom methode courante +If (Count parameters:C259<2) + + ASSERT:C1129(Component_putError(8850; $CURRENT_METHOD)) // Parameters Missing + + return + +End if -If ($Lon_parameters>=2) +If (Asserted:C1132(xml_referenceValid($svgObject); Localized string:C991("error_badReference"))) - $Dom_svgObject:=$1 - $Txt_value:=$2 + Component_errorHandler("init"; $CURRENT_METHOD) - If (Asserted:C1132(xml_referenceValid ($Dom_svgObject);Get localized string:C991("error_badReference"))) - - Component_errorHandler ("init";$kTxt_currentMethod) - - DOM GET XML ELEMENT NAME:C730($Dom_svgObject;$Txt_name) + DOM GET XML ELEMENT NAME:C730($svgObject; $name) + + ARRAY TEXT:C222($_objects; 0x0000) + COLLECTION TO ARRAY:C1562(Storage:C1525.svg["Containers_or_Graphics"]; $_objects) + + If (Find in array:C230($_objects; $name)>0) - ARRAY TEXT:C222($tTxt_objects;0x0000) - COLLECTION TO ARRAY:C1562(Storage:C1525.svg["Containers_or_Graphics"];$tTxt_objects) + $node:=DOM Create XML element:C865($svgObject; "title") - If (Find in array:C230($tTxt_objects;$Txt_name)>0) + If (Bool:C1537(OK)) - $Dom_node:=DOM Create XML element:C865($Dom_svgObject;"title") + DOM SET XML ELEMENT VALUE:C868($node; $value) - If (OK=1) - - DOM SET XML ELEMENT VALUE:C868($Dom_node;$Txt_value) + If (Bool:C1537(OK)) - If (OK=1) + // Set the id + If (Storage:C1525.svg.options ?? 1) - //Set the id - //{ - If (Storage:C1525.svg.options ?? 1) - - DOM SET XML ATTRIBUTE:C866($Dom_node;\ - "id";$Dom_node) - - End if - //} + DOM SET XML ATTRIBUTE:C866($node; \ + "id"; $node) - If (OK=1) - - $0:=$Dom_node - - End if End if End if - - Else - - ASSERT:C1129(Component_putError (8854)) //Impossible to apply this Command for this Node - End if - //#ACI0091143 - CLEAR VARIABLE:C89($tTxt_objects) + Else - ASSERT:C1129(Component_errorHandler ("deinit")) + ASSERT:C1129(Component_putError(8854)) // Impossible to apply this Command for this Node - Else + End if + + // #ACI0091143 + CLEAR VARIABLE:C89($_objects) + + ASSERT:C1129(Component_errorHandler("deinit")) + + If (Bool:C1537(OK)) - ASSERT:C1129(Component_putError (8852;$kTxt_currentMethod)) //The reference is not a svg object + return $node End if Else - ASSERT:C1129(Component_putError (8850;$kTxt_currentMethod)) //Parameters Missing + ASSERT:C1129(Component_putError(8852; $CURRENT_METHOD)) // The reference is not a svg object End if \ No newline at end of file diff --git a/Project/Sources/filters.json b/Project/Sources/filters.json index 0cceca8..9e26dfe 100644 --- a/Project/Sources/filters.json +++ b/Project/Sources/filters.json @@ -1,3 +1 @@ -{ - "Filtre": "&”Z-A”" -} \ No newline at end of file +{} \ No newline at end of file