* Bug 15476 fixed: Resistor Inductor Capacitor ConstantVoltage icons improved 29/19829/6
Samuel GOUGEON [Wed, 7 Mar 2018 11:40:17 +0000 (12:40 +0100)]
  http://bugzilla.scilab.org/15476

  * icons improved
  * Initial and set parameters value now displayed on the icons.
  * Icons and values are zoomed together (=> OK)
  * Icons are now square => ports now OK with 90° rotation.

  This shall improve the ergonomics of diagrams.

Change-Id: I7a1432245e5191b8aa03dff5e8666e113e12e221

19 files changed:
scilab/CHANGES.md
scilab/modules/helptools/images/Capacitor.png
scilab/modules/helptools/images/ConstantVoltage.png
scilab/modules/helptools/images/Inductor.png
scilab/modules/helptools/images/Resistor.png
scilab/modules/scicos_blocks/macros/Electrical/Capacitor.sci
scilab/modules/scicos_blocks/macros/Electrical/ConstantVoltage.sci
scilab/modules/scicos_blocks/macros/Electrical/Inductor.sci
scilab/modules/scicos_blocks/macros/Electrical/Resistor.sci
scilab/modules/scicos_blocks/macros/Hydraulics/SourceP.sci
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/images/blocks/Capacitor.svg
scilab/modules/xcos/images/blocks/ConstantVoltage.svg
scilab/modules/xcos/images/blocks/Inductor.svg
scilab/modules/xcos/images/blocks/Resistor.svg
scilab/modules/xcos/images/palettes/Capacitor.png
scilab/modules/xcos/images/palettes/ConstantVoltage.png
scilab/modules/xcos/images/palettes/Inductor.png
scilab/modules/xcos/images/palettes/Resistor.png

index 0a1d5c1..e65140e 100644 (file)
@@ -311,7 +311,7 @@ Scilab 5.5.2 is able to open the newly saved files, but the ports have to be rep
 Added to the CVode package, it also benefits from the CVode root finding feature.
 * Added a new link style (`Optimal`) for automatically finding the optimal route.
 * Automatically reposition split blocks for better-looking layout.
-* `EXPBLK_m (a^u)` and `POWBLK_f (u^a)` icons now show the value of the `a` parameter. The `AUTOMAT` icon now shows `Nmodes` and `Nstates` values. The `SineVoltage` icon now shows the frequency value.
+* `EXPBLK_m (a^u)` and `POWBLK_f (u^a)` icons now show the value of the `a` parameter. The `AUTOMAT` icon now shows `Nmodes` and `Nstates` values. The `SineVoltage` icon now shows the frequency value. In the Electrical palette, the Resistor, Inductor, Capacitor, and ConstantVoltage icons now show the actual value of the parameter.
 * Block modifications:
   - `INVBLK`: add a divide by zero parameter to ignore the error
   - `PRODUCT`: add a divide by zero parameter to ignore the error
@@ -512,6 +512,7 @@ Known issues
 * [#15458](http://bugzilla.scilab.org/show_bug.cgi?id=15458): `hist3d` rendering was wrong.
 * [#15464](http://bugzilla.scilab.org/show_bug.cgi?id=15464): Xcos C-blocks could not link dlls on Windows.
 * [#15468](http://bugzilla.scilab.org/show_bug.cgi?id=15468): Xcos saved file used non UTF-8 characters which lead to invalid file loading later.
+* [#15476](http://bugzilla.scilab.org/show_bug.cgi?id=15476): In the Electrical palette, the Resistor, Inductor, Capacitor, and ConstantVoltage icons did not show the parameter's value.
 * [#15484](http://bugzilla.scilab.org/show_bug.cgi?id=15484): On Windows, `isdir("w:")`, `isdir("w:/")`, and `isdir("w:\")` returned %T whenever the W: drive does not exist.
 * [#15489](http://bugzilla.scilab.org/show_bug.cgi?id=15489): Help pages of `covStart`, `covStop`, `covWrite` and `covMerge` were not built for the fr, ja, pt and ru languages, and were unreachable from a session in non `en_US` language.
 * [#15495](http://bugzilla.scilab.org/show_bug.cgi?id=15495): SampleCLK simple demo failed to simulate.
index 2f9a579..cd2ce90 100644 (file)
Binary files a/scilab/modules/helptools/images/Capacitor.png and b/scilab/modules/helptools/images/Capacitor.png differ
index 04d9c41..67cba6a 100644 (file)
Binary files a/scilab/modules/helptools/images/ConstantVoltage.png and b/scilab/modules/helptools/images/ConstantVoltage.png differ
index d98e28b..7c4625e 100644 (file)
Binary files a/scilab/modules/helptools/images/Inductor.png and b/scilab/modules/helptools/images/Inductor.png differ
index b5a36b3..c649d4f 100644 (file)
Binary files a/scilab/modules/helptools/images/Resistor.png and b/scilab/modules/helptools/images/Resistor.png differ
index 3d6a9dc..928bf81 100644 (file)
@@ -1,6 +1,7 @@
 //  Scicos
 //
-//  Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
+// Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
+// Copyright (C) 2018 - Samuel GOUGEON
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -42,7 +43,31 @@ function [x,y,typ]=Capacitor(job,arg1,arg2)
             model.rpar=C
             model.equations.parameters(2)=list(C,v)
             graphics.exprs=exprs
+
+            // Updating the icon according to the Capacity value:
+            v = evstr(exprs(1));
+            if v>=1e-11 & v<1e-8
+                sv = msprintf("%d\\:p\n",v*1e12)
+            elseif v>=1e-8 & v<1e-5
+                sv = msprintf("%d\\:n\n",v*1e9)
+            elseif v>=1e-5 & v<1e-2
+                sv = msprintf("%d\\:\\mu\n",v*1e6)
+            elseif v>=1e-2 & v<10
+                sv = msprintf("%d\\:m\n",v*1000)
+            elseif v>=10 & v<10000
+                sv = msprintf("%d\\:\n",v)
+            elseif v>=1e4 & v<1e7
+                sv = msprintf("%d\\:k\n",v/1000)
+            else
+                p = floor(log10(v));
+                v = v/(10^p);
+                sv = msprintf("%3.1f\\,10^{%d}\\,\n",v,p)
+            end
+            lab = "Capacitor;displayedLabel=" + ..
+            "$\mathsf{\,\\\,\\\,\\\,\\\,\\\,\\\,\,\\\tiny{\!"+sv+"F}}$"
+            graphics.style = lab;
             x.graphics=graphics;
+
             x.model=model
             break
         end
@@ -64,7 +89,7 @@ function [x,y,typ]=Capacitor(job,arg1,arg2)
 
         exprs=string([C;v])
         gr_i=[];
-        x=standard_define([2 1.1],model,exprs,list(gr_i,0))
+        x=standard_define([2 2],model,exprs,list(gr_i,0))
         x.graphics.in_implicit=["I"]
         x.graphics.out_implicit=["I"]
     end
index cff44ef..3eaa34c 100644 (file)
@@ -1,6 +1,7 @@
 //  Scicos
 //
-//  Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
+// Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
+// Copyright (C) 2018 - Samuel GOUGEON
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -38,7 +39,29 @@ function [x,y,typ]=ConstantVoltage(job,arg1,arg2)
             model.rpar=V
             model.equations.parameters(2)=list(V)
             graphics.exprs=exprs
+
+            // Updating the icon according to the Voltage value:
+            v = evstr(exprs(1));
+            if v>=1e-8 & v<1e-5
+                sv = msprintf("%d\\:n\n",v*1e9)
+            elseif v>=1e-5 & v<1e-2
+                sv = msprintf("%d\\:{\\mu}\n",v*1e6)
+            elseif v>=1e-2 & v<10
+                sv = msprintf("%d\\:m\n",v*1000)
+            elseif v>=10 & v<10000
+                sv = msprintf("%d\\:\n",v)
+            elseif v>=1e4 & v<1e7
+                sv = msprintf("%d\\:k\n",v/1000)
+            else
+                p = floor(log10(v));
+                v = v/(10^p);
+                sv = msprintf("%3.1f\\,10^{%d}\\,\n",v,p)
+            end
+            lab = "ConstantVoltage;displayedLabel=" + ..
+            "$\mathsf{\,\\\,\\\,\\\,\,\\\tiny{\!"+sv+"V}}$"
+            graphics.style = lab;
             x.graphics=graphics;
+
             x.model=model
             break
         end
@@ -62,7 +85,7 @@ function [x,y,typ]=ConstantVoltage(job,arg1,arg2)
 
         gr_i=[]
 
-        x=standard_define([1.5 1.1],model,exprs,list(gr_i,0))
+        x=standard_define([2 2],model,exprs,list(gr_i,0))
         x.graphics.in_implicit=["I"]
         x.graphics.out_implicit=["I"]
     end
index 0bd2b7d..46d4acc 100644 (file)
@@ -1,6 +1,7 @@
 //  Scicos
 //
-//  Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
+// Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
+// Copyright (C) 2018 - Samuel GOUGEON
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -39,7 +40,29 @@ function [x,y,typ]=Inductor(job,arg1,arg2)
             model.rpar=L
             model.equations.parameters(2)=list(L)
             graphics.exprs=exprs
+
+            // Updating the icon according to the inductance value:
+            v = evstr(exprs(1));
+            if v>=1e-8 & v<1e-5
+                sv = msprintf("%d\\:n\n",v*1e9)
+            elseif v>=1e-5 & v<1e-2
+                sv = msprintf("%d\\:\\mu\n",v*1e6)
+            elseif v>=1e-2 & v<10
+                sv = msprintf("%d\\:m\n",v*1000)
+            elseif v>=10 & v<10000
+                sv = msprintf("%d\\:\n",v)
+            elseif v>=1e4 & v<1e7
+                sv = msprintf("%d\\:k\n",v/1000)
+            else
+                p = floor(log10(v));
+                v = v/(10^p);
+                sv = msprintf("%3.1f\\,10^{%d}\\,\n",v,p)
+            end
+            lab = "Inductor;displayedLabel=" + ..
+            "$\mathsf{\,\\\,\\\,\\\,\\\,\\\,\\\,\\\,\,\\\tiny{\!"+sv+" H}}$"
+            graphics.style = lab;
             x.graphics=graphics;
+
             x.model=model
             break
         end
@@ -62,7 +85,7 @@ function [x,y,typ]=Inductor(job,arg1,arg2)
 
         gr_i=[]
 
-        x=standard_define([2 0.9],model,exprs,list(gr_i,0))
+        x=standard_define([2 2],model,exprs,list(gr_i,0))
         x.graphics.in_implicit=["I"]
         x.graphics.out_implicit=["I"]
     end
index 8bb798b..7380d6d 100644 (file)
@@ -1,6 +1,7 @@
 //  Scicos
 //
-//  Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
+// Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
+// Copyright (C) 2018 - Samuel GOUGEON
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +19,6 @@
 //
 // See the file ../license.txt
 //
-
 function [x,y,typ]=Resistor(job,arg1,arg2)
     // exemple d'un bloc implicit,
     //   -  sans entree ni sortie de conditionnement
@@ -42,7 +42,28 @@ function [x,y,typ]=Resistor(job,arg1,arg2)
             model.rpar=R
             model.equations.parameters(2)=list(R)
             graphics.exprs=exprs
+            // Updating the icon according to the resistance value:
+            v = evstr(exprs);
+            if v>=1e-5 & v<1e-2
+                sv = msprintf("%d\\:\\mu\n",v*1e6)
+            elseif v>=1e-2 & v<10
+                sv = msprintf("%d\\:m\n",v*1000)
+            elseif v>=10 & v<10000
+                sv = msprintf("%d\\:\n",v)
+            elseif v>=1e4 & v<1e7
+                sv = msprintf("%d\\:k\n",v/1000)
+            elseif v>=1e7 & v<1e10
+                sv = msprintf("%d\\:M\n",v/1e6)
+            else
+                p = floor(log10(v));
+                v = v/10^p;
+                sv = msprintf("%3.1f\\,10^{%d}\\,\n",v,p)
+            end
+            lab = "Resistor;displayedLabel=" + ..
+            "$\mathsf{\,\\\,\\\,\\\,\\\,\\\,\\\,\,\\\,\\\tiny{\!"+sv+"\Omega}}$"
+            graphics.style = lab;
             x.graphics=graphics;
+            //
             x.model=model
             break
         end
@@ -63,7 +84,7 @@ function [x,y,typ]=Resistor(job,arg1,arg2)
         model.out=ones(size(mo.outputs,"*"),1)
         exprs=string(R)
         gr_i=[]
-        x=standard_define([2 1],model,exprs,list(gr_i,0))
+        x=standard_define([2 2],model,exprs,list(gr_i,0))
         x.graphics.in_implicit=["I"]
         x.graphics.out_implicit=["I"]
     end
index 5ba7694..dd812ab 100644 (file)
@@ -35,10 +35,10 @@ function [x,y,typ]=SourceP(job,arg1,arg2)
         exprs=graphics.exprs
         model=arg1.model;
         while %t do
-            [ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",..
-            ["Pression de la source : P0 (Pa)";..
-            "Temperature de la source : T0 (K)";..
-            "Enthalpie spécifique de la source : H0 (J/kg)";..
+            [ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres de la source",..
+            ["Pression : P0 (Pa)";..
+            "Température : T0 (K)";..
+            "Enthalpie spécifique : H0 (J/kg)";..
             "1:température fixée - 2:enthalpie fixée : option_temperature"],..
             list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs)
             if ~ok then
index f5161e0..a91bcd7 100644 (file)
     </add>
     <add as="DSUPER" extend="SUPER_f"/>
     <!-- ELECTRICAL -->
-    <add as="Capacitor" extend="Icon">
+    <add as="Resistor" extend="blockWithLabel">
+        <add as="image" value="$SCILAB/modules/xcos/images/blocks/Resistor.svg"/>
+        <add as="verticalAlign" value="top"/>
+        <add as="verticalLabelPosition" value="top"/>
+        <add as="displayedLabel" value="$\mathsf{\,\\\,\\\,\\\,\\\,\\\,\\\,\,\\\,\\\tiny{\!10\,m\Omega}}$"/>
+    </add>
+    <add as="VariableResistor" extend="Icon">
+        <add as="image" value="$SCILAB/modules/xcos/images/blocks/VariableResistor.svg"/>
+    </add>
+    <add as="Capacitor" extend="blockWithLabel">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/Capacitor.svg"/>
+        <add as="verticalAlign" value="top"/>
+        <add as="verticalLabelPosition" value="top"/>
+        <add as="displayedLabel" value="$\mathsf{\,\\\,\\\,\\\,\\\,\\\,\,\\\,\\\tiny{\!10\,mF}}$"/>
+    </add>
+    <add as="Inductor" extend="blockWithLabel">
+        <add as="image" value="$SCILAB/modules/xcos/images/blocks/Inductor.svg"/>
+        <add as="verticalAlign" value="top"/>
+        <add as="verticalLabelPosition" value="top"/>
+        <add as="displayedLabel" value="$\mathsf{\,\\\,\\\,\\\,\\\,\\\,\\\,\,\\\,\\\tiny{\!10\,\mu H}}$"/>
     </add>
     <add as="Ground" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/Ground.svg"/>
         <add as="perimeter" value="ellipsePerimeter"/>
         <add as="displayedLabel" value="1 V&lt;br/&gt;~ %s"/>
     </add>
-    <add as="ConstantVoltage" extend="Icon">
+    <add as="ConstantVoltage" extend="blockWithLabel">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/ConstantVoltage.svg"/>
-    </add>
-    <add as="Inductor" extend="Icon">
-        <add as="image" value="$SCILAB/modules/xcos/images/blocks/Inductor.svg"/>
+        <add as="verticalAlign" value="top"/>
+        <add as="verticalLabelPosition" value="middle"/>
+        <add as="displayedLabel" value="$\mathsf{\,\\\,\\\,\\\,\,\\\tiny{\!10\,mV}}$"/>
     </add>
     <add as="PotentialSensor" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/PotentialSensor.svg"/>
     </add>
-    <add as="VariableResistor" extend="Icon">
-        <add as="image" value="$SCILAB/modules/xcos/images/blocks/VariableResistor.svg"/>
-    </add>
     <add as="CurrentSensor" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/CurrentSensor.svg"/>
     </add>
-    <add as="Resistor" extend="Icon">
-        <add as="image" value="$SCILAB/modules/xcos/images/blocks/Resistor.svg"/>
-    </add>
     <add as="VoltageSensor" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/VoltageSensor.svg"/>
     </add>
index f39a5c5..426fd02 100644 (file)
@@ -1,10 +1,79 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2" xmlns="http://www.w3.org/2000/svg" height="32" width="35" version="1.0">
- <g id="layer1" stroke-linejoin="miter" stroke="#000" stroke-linecap="butt" fill="none">
-  <path id="path17478" style="stroke-dasharray:none;" d="M16,5.0011v21.999" stroke-miterlimit="4" stroke-width="1.5"/>
-  <path id="path17480" style="stroke-dasharray:none;" d="m19,27,0-21.999" stroke-miterlimit="4" stroke-width="1.5"/>
-  <path id="path17482" d="M16.113,16,0.0000169,16" stroke-width="1px"/>
-  <path id="path17484" d="M18.981,16h16.019" stroke-width="1px"/>
- </g>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   height="32"
+   width="35"
+   version="1.0"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Capacitor.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="30.484105"
+     inkscape:cy="17.112001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <g
+     id="layer1"
+     transform="translate(-0.54237288,0.13559322)"
+     style="fill:none;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter">
+    <path
+       id="path17478"
+       style="stroke-width:1.91452003;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 15.616485,9.799789 V 26.51596"
+       stroke-miterlimit="4"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path17482"
+       d="m 16.106858,17.72582 -16.29245589,0"
+       inkscape:connector-curvature="0"
+       style="stroke-width:1.44187295px" />
+    <path
+       id="path17478-4"
+       style="fill:none;stroke:#000000;stroke-width:1.91452003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 20.485181,9.7956404 V 26.511811"
+       stroke-miterlimit="4"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path17482-0"
+       d="m 36.589356,17.674332 -16.292455,0"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#000000;stroke-width:1.44187295px;stroke-linecap:butt;stroke-linejoin:miter" />
+  </g>
 </svg>
index a7f7cbd..c664320 100644 (file)
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2" xmlns="http://www.w3.org/2000/svg" height="32" width="35" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs id="defs4">
-  <linearGradient id="linearGradient2983" y2="48.548" gradientUnits="userSpaceOnUse" x2="45.919" gradientTransform="matrix(0.3358898,0,0,0.3358898,-29.952657,5.204695)" y1="36.423" x1="34.893">
-   <stop id="stop1324" stop-color="#729fcf" offset="0"/>
-   <stop id="stop1326" stop-color="#5187d6" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2985" y2="34.977" gradientUnits="userSpaceOnUse" x2="27.901" gradientTransform="matrix(0.3358898,0,0,0.3358898,-23.900645,9.763119)" y1="22.852" x1="16.875">
-   <stop id="stop7918" stop-color="#FFF" offset="0"/>
-   <stop id="stop7920" stop-color="#FFF" stop-opacity="0.34020618" offset="1"/>
-  </linearGradient>
- </defs>
- <g id="layer1" stroke-linecap="butt">
-  <path id="path17478" stroke-linejoin="miter" style="stroke-dasharray:none;" d="M16,5.0011v21.999" stroke="#000" stroke-miterlimit="4" stroke-width="1.5" fill="none"/>
-  <path id="path17480" stroke-linejoin="miter" style="stroke-dasharray:none;" d="m19.843,20.681,0-9.3617" stroke="#000" stroke-miterlimit="4" stroke-width="2.12939548" fill="none"/>
-  <path id="path17482" stroke-linejoin="miter" d="M16.113,16,0.0000169,16" stroke="#000" stroke-width="1px" fill="none"/>
-  <path id="path17484" stroke-linejoin="miter" d="M18.981,16h16.019" stroke="#000" stroke-width="1px" fill="none"/>
-  <g id="g10841" stroke-miterlimit="4" transform="matrix(0.44813805,0,0,0.44813805,19.10033,-0.87156096)">
-   <path id="text1314" stroke-linejoin="miter" style="stroke-dasharray:none;text-align:start;" d="m-14.659,22.373,0-3.0321,3.3517-0.0135,0-2.3497-3.3487,0-0.003-3.3455-2.3567,0.0037,0.002,3.3358-3.3554,0.02474-0.01199,2.3407,3.3704-0.0097,0.002,3.0366,2.35,0.009z" stroke="#3465a4" stroke-width="1" fill="#75a1d0"/>
-   <path id="path7076" opacity="0.40860219" stroke-linejoin="round" style="stroke-dasharray:none;text-align:start;" d="M-15,22.034-15,19h3.3598l-0.002-1.6877h-3.3545v-3.3572l-1.6777,0.006,0.003,3.3512-3.3677,0.006-0.009,1.6704,3.3805,0.003-0.005,3.0322,1.6724,0.0105z" stroke="url(#linearGradient2985)" stroke-width="0.336" fill="url(#linearGradient2983)"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   height="32"
+   width="35"
+   version="1.0"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ConstantVoltage.svg">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="17.5"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2983"
+       y2="48.548"
+       gradientUnits="userSpaceOnUse"
+       x2="45.919"
+       gradientTransform="matrix(0.3358898,0,0,0.3358898,-29.952657,5.204695)"
+       y1="36.423"
+       x1="34.893">
+      <stop
+         id="stop1324"
+         stop-color="#729fcf"
+         offset="0" />
+      <stop
+         id="stop1326"
+         stop-color="#5187d6"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2985"
+       y2="34.977"
+       gradientUnits="userSpaceOnUse"
+       x2="27.901"
+       gradientTransform="matrix(0.3358898,0,0,0.3358898,-23.900645,9.763119)"
+       y1="22.852"
+       x1="16.875">
+      <stop
+         id="stop7918"
+         stop-color="#FFF"
+         offset="0" />
+      <stop
+         id="stop7920"
+         stop-color="#FFF"
+         stop-opacity="0.34020618"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="layer1"
+     transform="translate(0,-2.1694915)"
+     style="stroke-linecap:butt">
+    <path
+       id="path17478"
+       style="fill:none;stroke:#000000;stroke-width:1.86288464;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 15.59322,5.0011 v 21.999"
+       stroke-miterlimit="4"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path17480"
+       style="fill:none;stroke:#000000;stroke-width:2.12939548;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 20.927746,21.223373 0,-9.3617"
+       stroke-miterlimit="4"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path17482"
+       d="m 16.053574,16.542373 -18.0280298,0"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#000000;stroke-width:1.05775762px;stroke-linejoin:miter" />
+    <path
+       id="path17484"
+       d="M 20.00458,16.542373 H 38.315402"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#000000;stroke-width:1.06914401px;stroke-linejoin:miter" />
+    <g
+       id="g10841"
+       stroke-miterlimit="4"
+       transform="matrix(0.44813805,0,0,0.44813805,19.10033,-0.87156096)"
+       style="stroke-miterlimit:4">
+      <path
+         id="text1314"
+         style="text-align:start;fill:#75a1d0;stroke:#3465a4;stroke-width:1;stroke-linejoin:miter;stroke-dasharray:none"
+         d="m -14.659,22.373 0,-3.0321 3.3517,-0.0135 0,-2.3497 -3.3487,0 -0.003,-3.3455 -2.3567,0.0037 0.002,3.3358 -3.3554,0.02474 -0.01199,2.3407 3.3704,-0.0097 0.002,3.0366 2.35,0.009 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7076"
+         style="text-align:start;opacity:0.40860219;fill:url(#linearGradient2983);stroke:url(#linearGradient2985);stroke-width:0.336;stroke-linejoin:round;stroke-dasharray:none"
+         d="M -15,22.034 -15,19 h 3.3598 l -0.002,-1.6877 h -3.3545 v -3.3572 l -1.6777,0.006 0.003,3.3512 -3.3677,0.006 -0.009,1.6704 3.3805,0.003 -0.005,3.0322 1.6724,0.0105 z"
+         inkscape:connector-curvature="0" />
+    </g>
   </g>
- </g>
 </svg>
index f4b5168..0b8c413 100644 (file)
@@ -1,14 +1,56 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" sodipodi:docname="Inductor.svg" height="15" sodipodi:version="0.32" width="45" version="1.0" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" sodipodi:docbase="C:\Documents and Settings\Julian\My Documents\My Pictures\Electronics\Vector Illustrations" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd">
- <metadata id="metadata1312">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <sodipodi:namedview id="base" bordercolor="#666666" pagecolor="#ffffff" gridtolerance="1px" borderopacity="1.0" showgrid="true" showguides="true"/>
- <path id="path1318" stroke-linejoin="miter" d="M1,8.5h5.5s0-4,4-4,4,4,4,4,0-4,4-4,4,4,4,4,0-4,4-4,4,4,4,4,0-4,4-4,4,4,4,4h5.5" sodipodi:nodetypes="ccscscscscc" stroke="#000" stroke-linecap="butt" stroke-width="1px" fill="none"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:docname="Inductor.svg"
+   height="15"
+   sodipodi:version="0.32"
+   width="45"
+   version="1.0"
+   inkscape:version="0.48.4 r9939">
+  <defs
+     id="defs6" />
+  <metadata
+     id="metadata1312">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     gridtolerance="1px"
+     borderopacity="1.0"
+     showgrid="true"
+     showguides="true"
+     inkscape:zoom="9.8666667"
+     inkscape:cx="2.1283784"
+     inkscape:cy="7.5"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     id="path1318"
+     d="m -0.41891892,11.641892 6.71621612,0 c 0,0 0.3307196,-6.8834942 4.3040548,-7.3445948 4.712865,-0.5469221 6.302128,10.2258708 3.29054,9.0675678 0,0 -1.781371,-2.114871 -0.09124,-4.9986548 0.526234,-0.8978891 1.733451,-4.1433512 3.989892,-4.1702643 5.496269,-0.065555 6.149731,9.2015391 3.898648,9.3716211 0,0 -1.227427,-2.032732 -1.071016,-3.9663037 C 20.752799,7.9370297 23.233632,4.4526938 26.500003,4.5 c 5.699642,0.082547 5.362411,9.384912 4.101352,9.27027 0,0 -2.439151,-1.46285 -1.57615,-4.2696059 0.356986,-1.1610331 1.315849,-5.2033669 4.663987,-5.2033669 4,0 4.405406,7.3445948 4.405406,7.3445948 l 7.628379,0"
+     sodipodi:nodetypes="ccscsscsscsscc"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
 </svg>
index d471e63..4262296 100644 (file)
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg11300" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="48px" width="48px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <title id="title3289">base scilan</title>
- <defs id="defs3">
-  <linearGradient id="linearGradient12223" y2="23.083" gradientUnits="userSpaceOnUse" x2="14.152" gradientTransform="matrix(2.0651184,0,0,0.92966997,63.912973,20.040373)" y1="23.083" x1="0.94344">
-   <stop id="stop2699" stop-color="#babdb6" offset="0"/>
-   <stop id="stop2701" stop-color="#555753" offset="1"/>
-  </linearGradient>
- </defs>
- <metadata id="metadata4">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:creator>
-     <cc:Agent>
-      <dc:title>Mathieu Drouet / Take a sip</dc:title>
-     </cc:Agent>
-    </dc:creator>
-    <dc:source>http://www.takeasip.net/</dc:source>
-    <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
-    <dc:title>base scilan</dc:title>
-   </cc:Work>
-   <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
-    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
-    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
-    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
-   </cc:License>
-  </rdf:RDF>
- </metadata>
- <g id="layer1">
-  <g id="layer1-0" transform="matrix(0,0.68137179,-0.68137179,0,39.302853,7.826163)">
-   <g id="g9544" transform="translate(-2.0023665,2.2530854)">
-    <g id="g9570" transform="translate(0.34662852,-1.7289484)">
-     <g id="g28489" transform="translate(2.3098495,0.12996954)">
-      <g id="g5362">
-       <g id="layer1-8" transform="matrix(0,-1.4676275,1.4676275,0,-37.823485,137.74736)">
-        <g id="g5857" transform="translate(-0.49999954,-9.6375814e-8)">
-         <path id="path12219" stroke-linejoin="miter" d="M61.811,41.453c35.378,0.047,35.378,0.047,35.378,0.047" stroke="#000" stroke-linecap="butt" stroke-width="1px" fill="none"/>
-         <rect id="rect6286" stroke-linejoin="miter" style="stroke-dasharray:none;" height="10.915" width="24.247" stroke="#000" stroke-linecap="square" stroke-miterlimit="4" y="36.042" x="67.377" stroke-width="1" fill="url(#linearGradient12223)"/>
-         <path id="path6288" opacity="0.5" style="color:#000000;" fill-rule="nonzero" display="block" fill="#f7f7f7" d="m68.124,36.667,0,6.5696,23.499-1.7364,0-4.8882-23.499,0.055z"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg11300"
+   height="48px"
+   width="48px"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Resistor.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="905"
+     inkscape:window-height="661"
+     id="namedview20"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:window-x="223"
+     inkscape:window-y="58"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g5857" />
+  <title
+     id="title3289">base scilan</title>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient12223"
+       y2="23.083"
+       gradientUnits="userSpaceOnUse"
+       x2="14.152"
+       gradientTransform="matrix(2.0651184,0,0,0.92966997,64.783696,20.484941)"
+       y1="23.083"
+       x1="0.94344">
+      <stop
+         id="stop2699"
+         stop-color="#babdb6"
+         offset="0" />
+      <stop
+         id="stop2701"
+         stop-color="#555753"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Mathieu Drouet / Take a sip</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://www.takeasip.net/</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:title>base scilan</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <g
+       id="layer1-0"
+       transform="matrix(0,0.68137179,-0.68137179,0,39.302853,7.826163)">
+      <g
+         id="g9544"
+         transform="translate(-2.0023665,2.2530854)">
+        <g
+           id="g9570"
+           transform="translate(0.34662852,-1.7289484)">
+          <g
+             id="g28489"
+             transform="translate(2.3098495,0.12996954)">
+            <g
+               id="g5362">
+              <g
+                 id="layer1-8"
+                 transform="matrix(0,-1.7140957,1.3428794,0,-31.900249,158.41234)">
+                <g
+                   id="g5857"
+                   transform="translate(-0.49999954,-9.6375814e-8)">
+                  <path
+                     id="path12219"
+                     d="M 58.572196,41.76456 C 102.69168,41.8553 102.69168,41.8553 102.69168,41.8553"
+                     inkscape:connector-curvature="0"
+                     style="fill:none;stroke:#000000;stroke-width:1.55153465px;stroke-linecap:butt;stroke-linejoin:miter" />
+                  <rect
+                     id="rect6286"
+                     style="fill:url(#linearGradient12223);stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+                     height="10.915"
+                     width="24.247"
+                     stroke-miterlimit="4"
+                     y="36.486568"
+                     x="68.247719" />
+                  <path
+                     id="path6288"
+                     style="opacity:0.5;color:#000000;fill:#f7f7f7;fill-rule:nonzero;display:block"
+                     display="block"
+                     d="m 68.124,36.667 0,6.5696 23.499,-1.7364 0,-4.8882 -23.499,0.055 z"
+                     inkscape:connector-curvature="0" />
+                </g>
+              </g>
+            </g>
+          </g>
         </g>
-       </g>
       </g>
-     </g>
     </g>
-   </g>
   </g>
- </g>
 </svg>
index 2f9a579..cd2ce90 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Capacitor.png and b/scilab/modules/xcos/images/palettes/Capacitor.png differ
index 04d9c41..67cba6a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ConstantVoltage.png and b/scilab/modules/xcos/images/palettes/ConstantVoltage.png differ
index d98e28b..7c4625e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Inductor.png and b/scilab/modules/xcos/images/palettes/Inductor.png differ
index b5a36b3..c649d4f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Resistor.png and b/scilab/modules/xcos/images/palettes/Resistor.png differ