Fritzing

js/main.js

@@ -341,7 +341,7 @@ function load_resource(){
 				var data = {};
 				data.url = r.upload.url;
 				data.success = function(useless,r){
-					if(r.errors.length!=0){
+					if(r.errors && r.errors.length!=0){
 						alert('Erreur : '+r.errors.join(','));
 					}else{
 						eval(r.upload.callback);

plugin/fritzing/Fritzing.class.php

@@ -6,7 +6,7 @@ class Fritzing{
 	private $coreIndicator = '/fritzing-parts/';
 	private $minY,$minX;
 	public $ino ;
-	public $comment ;
+	public $debug ;
 	function __construct($file){
 		$this->file = $file;
 
@@ -63,7 +63,7 @@ class Fritzing{
 
 				if(isset($instance->views->breadboardView->geometry->transform)){
 					$part['geometry']['r'] = $instance->views->breadboardView->geometry->transform;
-					$this->comment = json_encode($instance->views->breadboardView->geometry->transform->attributes());
+					$this->debug = json_encode($instance->views->breadboardView->geometry->transform->attributes());
 				}
 
 				if(isset($geometry['wireFlags']))
@@ -96,15 +96,7 @@ class Fritzing{
 		}
 		$this->minY = abs($this->minY);
 		$this->minX = abs($this->minX);
-		$this->comment = '<h1>Composants</h1><ul>';
-		foreach ($this->parts as $part) {
-			if($part['type'] == 'component' && isset($part['component']['name'])){
-				
-				$this->comment .= '<li>'.$part['sigle'].' : '. $part['component']['name'].' ('. $part['component']['description'].')</li>';
-				
-			}
-		}
-		$this->comment .= '</ul>';
+		
 		
 	}
 
@@ -143,13 +135,17 @@ class Fritzing{
 					$x = 0;
 					$y = 0;
 				$html .= '.attr("points","';
+					$points = array();
 					for ($i=0;$i<count($part['geometry']['x']);$i++) {
 						$x += $part['geometry']['x'][$i];
 						$y += $part['geometry']['y'][$i];
 						if($i==0) $y+= $this->minY;
 						if($i==0) $x+= $this->minX;
-						$html .= "$x,$y,";
+						//$html .= "$x,$y,";
+						$points[] = $x;
+						$points[] = $y;
 					}
+					$html .= implode(',', $points);
 					$html .= '");';
 			   } 
 			

plugin/fritzing/FritzingType.class.php

@@ -9,7 +9,7 @@ class FritzingType {
 			'fromExtension' => array('fzz'),
 			'toExtension' => 'fzz',
 			'upload' => array(
-				'url'     => 'action.php?action=upload_resource_file',
+				'url'     => 'action.php?action=fritzing_upload_resource',
 				'element' => '#dropZoneFiles',
 				'callback' => "refresh_fritzing();",
 			)
@@ -57,35 +57,41 @@ class FritzingType {
 		$infos = self::manifest();
 		require_once(__DIR__.SLASH."Fritzing.class.php");
 
-
-		if(!file_exists(SKETCH_PATH.$resource->id)){
-			$content =  '<div id="dropZoneFiles" style="width:100%;height:auto;" class="dropzone">Envoyer un fichier</div>';
+		$file =SKETCH_PATH.$resource->id.'.fzz';
+		if(!file_exists($file)){
+			$content =  '<div id="dropZoneFiles" style="width:100%;height:auto;" class="dropzone"> <img src="plugin/fritzing/img/fritzing.png" /><br>Envoyer un fritzing</div>';
 		}else{
-			
-			$file = glob(SKETCH_PATH.$resource->id.'/*.fzz');
 
+			$breadboard = new Fritzing($file);
 			
-			$breadboard = new Fritzing($file[0]);
-			
-			$content =  '<div id="dropZoneFiles" style="width:100%;height:auto;" class="dropzone"><a href="action.php?action=get_resource&id='.$resource->id.'">Télécharger</a></div>';
+			$content =  '<div id="dropZoneFiles" style="width:100%;height:auto;" class="dropzone"></div>';
 			$content .= '<h1>Schéma</h1>'.$breadboard->toHtml();
-			
-			if($breadboard->ino!=null)$content .= '<h1>Code associé</h1><textarea>'.$breadboard->ino.'</textarea>';
-			if($breadboard->comment!=null)$content .= $breadboard->comment;
-			
-			
+		
+			if($breadboard->ino!=null){
+				$content .= '<h1>Code associé</h1><textarea>'.$breadboard->ino.'</textarea>';
+				$response['codemirror'] = array(
+					'mode'=>'text/x-carduino',
+					'theme'=>'monokai',
+					'lineNumbers' => true,
+					'readOnly' =>  true
+				);
+			}
+			$content .= '<h1>Composants</h1><ul class="list-group">';
+			foreach ($breadboard->parts as $part) {
+				if($part['type'] == 'component' && isset($part['component']['name'])){
+					
+					$content .= '<li  class="list-group-item"><strong>'.$part['sigle'].' :</strong> '. $part['component']['name'].' ('. $part['component']['description'].')</li>';
+					
+				}
+			}
+			$content .= '</ul>';
 		}
 		
 
 	
 		$response['content'] = $content;
 
-		$response['codemirror'] = array(
-				'mode'=>'text/x-carduino',
-				'theme'=>'monokai',
-				'lineNumbers' => true,
-				'readOnly' =>  true
-			);
+		
 
 		if($myUser->id == $sketch->owner)
 			$response['upload'] = $infos['upload'];

plugin/fritzing/action.php

@@ -1,9 +1,30 @@
 <?php
 
 global $_,$conf;
+
 switch($_['action']){
-	case 'test_load':
+	case 'fritzing_upload_resource':
+	
+		Action::write(function($_,&$response){
+			global $myUser;
+			
+			$resource = Resource::getByid($_['id']);
+			$sketch = Sketch::getById($resource->sketch);
+			$ext = getExt($_FILES['file']['name']);
+			if($myUser->id != $sketch->owner) throw new Exception("Seul le propriétaire du sketch peux faire ça");
+			if($ext!='fzz') throw new Exception('Extensions autorisées .fzz');
+			if($_FILES['file']['size']>ALLOWED_RESOURCE_SIZE) throw new Exception('Taille maximum autorisée '.ALLOWED_RESOURCE_SIZE.' o');
+			$name = $resource->id.'.'.$ext;
+			$path = SKETCH_PATH.$name;	
+			move_uploaded_file($_FILES['file']['tmp_name'], $path);
+			
+			$resource->content = $name;
+			$resource->save();
 
+			$response = array_merge(ResourceType::all($resource->type));
+	
+			
+		});
 	break;
 }
 

plugin/fritzing/fritzing.plugin.php

@@ -23,7 +23,7 @@ function fritzing_plugin_uninstall($id){
 
 //cette fonction comprends toutes les actions du plugin qui ne nécessitent pas de vue html
 function fritzing_plugin_action(){
-	require_once('action.php');
+	require_once(__DIR__.SLASH.'action.php');
 }
 
 

plugin/fritzing/main.js

@@ -1,3 +1,3 @@
 function refresh_fritzing(){
-	window.reload();
+	location.reload();
 }