Changeset 336 for cleversvg/trunk/elements/csGroup.class.php

Timestamp:

03/07/08 08:33:04 (4 years ago)

Author:

nperriault

Message:

Clever Svg:

• refs #40: more elements tests
• Removed depth management, as svg handle it natively

Warning: breaks BC from 0.5.

Files:

• cleversvg/trunk/elements/csGroup.class.php (modified) (3 diffs)

cleversvg/trunk/elements/csGroup.class.php

@@ -2 +2 @@
 /**
  * SVG Group class
- * 
+ *
  * @author     Nicolas Perriault <nperriault@gmail.com>
  * @package    cleversvg
  * @subpackage elements
  */
-class csGroup extends csBaseElement
+class csGroup extends csElementsContainer
 {
 
-  protected 
-    $elements         = array(),
-    $used_definitions = array(),
-    $xml_node_name    = 'g';
+  /**
+   * Definitions and elements container
+   * @var csElementsContainer
+   */
+  protected $container = null;
+
+  /**
+   * SVG XML node name
+   * @var string
+   */
+  protected $xml_node_name = 'g';
 
   /**
    * Class constructor
-   * 
+   *
    * @param  mixed  $id     The DOM id of the element
    * @param  array  $attrs  More attributes to affect
    */
-  public function __construct($id=null, $attrs=array())
+  public function __construct($id = null, $attrs = array())
   {
     $this->setId($id);
     $this->attributes = array_merge($attrs, $this->attributes);
+    $this->container = new csElementsContainer();
   }
-  
+
   /**
    * Computes DOMXML Node
-   * 
+   *
    * @param  boolean  $embedded  Is SVG element embedded ?
    * @return DOMElement
    */
-  public function compile($embedded=false)
+  public function compile($embedded = false)
   {
     $group_node = parent::compile($embedded);
     $dom = $this->getDomDocument();
-    
+
     # Prefix
     $prefix = $embedded === true ? 'svg:' : '';
-    
+
     // Add elements to current group node
     foreach ($this->getElements() as $element)
@@ -47 +55 @@
       $group_node->appendChild($node_element);
     }
-    
+
     // Add used definitions
     foreach ($this->used_definitions as $used_definition)
@@ -65 +73 @@
       $group_node->appendChild($use_node);
     }
-    
+
     return $group_node;
   }
-  
+
   /**
-   * Adds a SVG element to current group
-   * 
-   * @param  mixed  $element  SVG element to add
+   * Adds a SVG shape or group to current SVG Document at a certain depth
+   *
+   * @param  mixed    $element  SVG element to add
+   * @throws csException
    */
   public function addElement($element)
   {
-    $this->elements[] = $element;
+    return $this->container->addElement($element);
   }
-  
+
+  /**
+   * Retrieve an contained element instance by its DOM id
+   *
+   * @param  string  $id
+   * @return csBaseElement
+   * @throw  csException
+   */
+  public function getElementById($id)
+  {
+    return $this->container->getElementById($id);
+  }
+
   /**
    * Returns an array containing current group elements
-   * 
-   * @return array 
+   *
+   * @return array
    */
-  protected function getElements()
+  public function getElements()
   {
-    return $this->elements;
+    return $this->container->getElements();
   }
-  
+
+  /**
+   * Checks if a DOM id already exists in current SVG Document
+   *
+   * @param  string  $id
+   * @return boolean
+   */
+  public function hasId($id)
+  {
+    return $this->container->hasId($id);
+  }
+
   /**
    * Uses a definition in current group
-   * 
+   *
    * @param  mixed  $element
    * @param  array  $attrs    More atributes to add to &lt;use/&gt; tag
    */
-  public function useDefinition($definition, $attrs=array())
+  public function useDefinition($definition, $attrs = array())
   {
-    $this->used_definitions[] = array($definition, $attrs);
+    return $this->container->useDefinition($definition, $attrs);
   }
-  
+
 }