MAJ V4.5.0
dans la fenêtre du gestionnaire de la base, adaptation scroll pour les bouton et la table.
This commit is contained in:
pablo rodriguez
parent
0fa072faee
commit
c811e506cb
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
2
bin/.gitignore
vendored
2
bin/.gitignore
vendored
@ -180,3 +180,5 @@
|
||||
/evaltabstyleleader.svg
|
||||
/evaltabstyleleadermini.png
|
||||
/OnLineVersions/
|
||||
/accueil_new_version.png
|
||||
/accueill new version.svg
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 32 KiB |
@ -34,7 +34,7 @@ public class commandes {
|
||||
public static node nodeCSV = null;
|
||||
|
||||
//** Version
|
||||
public static String version ="V4.5.0"; // La version actuelle
|
||||
public static String version ="V4.3.0"; // La version actuelle
|
||||
public static String versionEvaluation = "";
|
||||
public static String branch = "Origin";
|
||||
public static String Annee ="2024";
|
||||
|
||||
@ -47,6 +47,7 @@ public class myTableBaseEvaluation extends AbstractTableModel{
|
||||
return evaluation[rowIndex][0];
|
||||
}
|
||||
|
||||
|
||||
public void addOrUpdate() {
|
||||
evaluation = new String[commandes.evaluationsBase.getNodes().size()][columNames.size()];
|
||||
for(int i = 0 ; i<commandes.evaluationsBase.getNodes().size();i++) {
|
||||
@ -63,5 +64,4 @@ public class myTableBaseEvaluation extends AbstractTableModel{
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -12,6 +12,7 @@ import javax.swing.JPanel;
|
||||
import javax.swing.SwingConstants;
|
||||
|
||||
import MEPTL.commandes;
|
||||
import java.awt.Color;
|
||||
|
||||
public final class about extends JFrame {
|
||||
|
||||
@ -51,10 +52,14 @@ public final class about extends JFrame {
|
||||
|
||||
JLabel lblNewLabelTitre = new JLabel();
|
||||
ImageIcon img2 = new ImageIcon(getClass().getResource("/accueil.png") );
|
||||
if(commandes.newVersion) {
|
||||
img2 = new ImageIcon(getClass().getResource("/resources/accueil_new_version.png") );
|
||||
}
|
||||
|
||||
lblNewLabelTitre.setIcon(img2);
|
||||
lblNewLabelTitre.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblNewLabelTitre.setFont(new Font("Pacifico", Font.PLAIN, 26));
|
||||
lblNewLabelTitre.setBounds(10, 10, 357, 90);
|
||||
lblNewLabelTitre.setBounds(0, 0, 502, 100);
|
||||
contentPane.add(lblNewLabelTitre);
|
||||
|
||||
JLabel lblNewLabelVersion = new JLabel("<HTML><B><U>Version :</U></B> " + commandes.version + " "+ commandes.nomDeLaBranch + "</HTML>");
|
||||
@ -87,7 +92,7 @@ public final class about extends JFrame {
|
||||
lblCommentaire.setFont(new Font("Tahoma", Font.PLAIN, 14));
|
||||
lblCommentaire.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblCommentaire.setVerticalAlignment(SwingConstants.TOP);
|
||||
lblCommentaire.setBounds(20, 183, 472, 88);
|
||||
lblCommentaire.setBounds(20, 199, 472, 72);
|
||||
getContentPane().add(lblCommentaire);
|
||||
|
||||
JLabel lblLicence = new JLabel("<HTML><B><U>Licence : GNU GLP 3.0</U></B> </HTML>");
|
||||
@ -96,6 +101,9 @@ public final class about extends JFrame {
|
||||
getContentPane().add(lblLicence);
|
||||
|
||||
JButton btnNewButton = new JButton("<html><p {text-align: center;}>Vérifier s'il y a <br>une nouvelle version</p><html>");
|
||||
if(commandes.newVersion) {
|
||||
btnNewButton.setText("<html><p {text-align: center;}>Nouvelle version<br>"+commandes.nameNewVersion +"</p><html>");
|
||||
}
|
||||
btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||
btnNewButton.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
@ -118,6 +126,15 @@ public final class about extends JFrame {
|
||||
lblGPL3.setBounds(315, 283, 139, 70);
|
||||
getContentPane().add(lblGPL3);
|
||||
|
||||
JLabel lblNewVersion = new JLabel("");
|
||||
lblNewVersion.setFont(new Font("Tahoma", Font.BOLD, 12));
|
||||
lblNewVersion.setForeground(new Color(255, 0, 0));
|
||||
if(commandes.newVersion) {
|
||||
lblNewVersion.setText("Nouvelle version : " + commandes.nameNewVersion);
|
||||
}
|
||||
lblNewVersion.setBounds(20, 151, 240, 37);
|
||||
getContentPane().add(lblNewVersion);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -28,6 +28,7 @@ import javax.swing.ListSelectionModel;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.event.ListSelectionEvent;
|
||||
import javax.swing.event.ListSelectionListener;
|
||||
import javax.swing.table.TableColumnModel;
|
||||
|
||||
import MEPTL.commandes;
|
||||
import action.actOpenBaseEvaluation;
|
||||
@ -42,6 +43,7 @@ import cXML.Run;
|
||||
import cXML.node;
|
||||
import net.lingala.zip4j.exception.ZipException;
|
||||
import net.miginfocom.swing.MigLayout;
|
||||
import javax.swing.border.BevelBorder;
|
||||
|
||||
public class baseDonneesEvaluations extends JFrame { /**
|
||||
*
|
||||
@ -61,7 +63,8 @@ public class baseDonneesEvaluations extends JFrame { /**
|
||||
public static boolean isDispose = true;
|
||||
int indexSelect=0;
|
||||
ListSelectionModel lsm = null;
|
||||
JScrollPane scrollPane = new JScrollPane();
|
||||
JScrollPane scrollPaneTable = new JScrollPane();
|
||||
JScrollPane scrollPaneBoutons = new JScrollPane();
|
||||
private final JButton btnChargerNewBase = new JButton("<html>Utiliser une autre<br>base d'évaluation</html>");
|
||||
private final JButton btnFermer = new JButton("<html>Femer</html>");
|
||||
private final JTextPane textPane = new JTextPane();
|
||||
@ -91,12 +94,27 @@ public baseDonneesEvaluations() {
|
||||
|
||||
model.addOrUpdate();
|
||||
table = new JTable(model);
|
||||
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
|
||||
TableColumnModel columnModel = table.getColumnModel();
|
||||
columnModel.getColumn(0).setPreferredWidth(300);
|
||||
columnModel.getColumn(0).setMaxWidth(400);
|
||||
columnModel.getColumn(1).setPreferredWidth(300);
|
||||
columnModel.getColumn(1).setMaxWidth(400);
|
||||
columnModel.getColumn(2).setPreferredWidth(300);
|
||||
columnModel.getColumn(2).setMaxWidth(400);
|
||||
columnModel.getColumn(3).setPreferredWidth(300);
|
||||
columnModel.getColumn(3).setMaxWidth(400);
|
||||
columnModel.getColumn(3).setPreferredWidth(300);
|
||||
columnModel.getColumn(3).setMaxWidth(400);
|
||||
columnModel.getColumn(4).setPreferredWidth(300);
|
||||
columnModel.getColumn(4).setMaxWidth(400);
|
||||
|
||||
table.setFont(new Font("Tahoma", Font.PLAIN, 14));
|
||||
|
||||
scrollPane = new JScrollPane(table);
|
||||
scrollPaneTable = new JScrollPane(table);
|
||||
|
||||
//Add the scroll pane to this panel.
|
||||
getContentPane().add(scrollPane,BorderLayout.CENTER);
|
||||
getContentPane().add(scrollPaneTable,BorderLayout.CENTER);
|
||||
|
||||
getContentPane().add(panelBas, BorderLayout.SOUTH);
|
||||
FlowLayout fl_panelBas = new FlowLayout(FlowLayout.LEADING, 10, 10);
|
||||
@ -119,10 +137,13 @@ public baseDonneesEvaluations() {
|
||||
lblInformationBaseEvluation.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/accueilChargeEvaluation.png")));
|
||||
lblInformationBaseEvluation.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||
panelHaut.add(lblInformationBaseEvluation);
|
||||
panelGauche.setBorder(null);
|
||||
|
||||
|
||||
getContentPane().add(panelGauche, BorderLayout.WEST);
|
||||
panelGauche.setLayout(new MigLayout("", "[247px]", "[53px][][][][][][][][][][][][]"));
|
||||
scrollPaneBoutons = new JScrollPane(panelGauche);
|
||||
|
||||
getContentPane().add(scrollPaneBoutons, BorderLayout.WEST);
|
||||
panelGauche.setLayout(new MigLayout("", "[247px]", "[53px][][][][][][][][30.00][][][][]"));
|
||||
btnChargerNewBase.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
btnChargerNewBase.setForeground(new Color(0, 128, 192));
|
||||
panelGauche.add(btnChargerNewBase, "cell 0 0,growx,aligny top");
|
||||
@ -170,6 +191,7 @@ public baseDonneesEvaluations() {
|
||||
panelGauche.add(btnExtraireFileAnalysis, "cell 0 6,growx,aligny top");
|
||||
btnRenommeFichierAnalyse.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
btnRenommeFichierAnalyse.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/fichierAnalyseRenomme.png")));
|
||||
|
||||
panelGauche.add(btnRenommeFichierAnalyse, "cell 0 7,growx,aligny top");
|
||||
btnRenommeFichierAnalyse.setForeground(new Color(255, 140, 0));
|
||||
|
||||
|
||||
@ -518,6 +518,7 @@ public final class create extends JFrame {
|
||||
|
||||
JButton btnAbout = toolBarPrincipal.add( new actAbout() );
|
||||
btnAbout.setIcon(new ImageIcon(create.class.getResource("/resources/apropos.png")));
|
||||
if(commandes.newVersion) btnAbout.setIcon(new ImageIcon(create.class.getResource("/resources/apropos_new.png")));
|
||||
btnAbout.setHideActionText( true );
|
||||
toolBarPrincipal.add(btnAbout);
|
||||
|
||||
|
||||
@ -688,6 +688,7 @@ public class evaluate extends JFrame {
|
||||
|
||||
JButton btnAbout = toolBar.add(new actAbout());
|
||||
btnAbout.setIcon(new ImageIcon(evaluate.class.getResource("/resources/apropos.png")));
|
||||
if(commandes.newVersion) btnAbout.setIcon(new ImageIcon(evaluate.class.getResource("/resources/apropos_new.png")));
|
||||
btnAbout.setHideActionText(true);
|
||||
toolBar.add(btnAbout);
|
||||
|
||||
|
||||
BIN
src/resources/apropos_new.png
Normal file
BIN
src/resources/apropos_new.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
322
src/resources/apropos_new.svg
Normal file
322
src/resources/apropos_new.svg
Normal file
@ -0,0 +1,322 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
inkscape:export-ydpi="98.357307"
|
||||
inkscape:export-xdpi="98.357307"
|
||||
inkscape:export-filename="apropos_new.png"
|
||||
sodipodi:docname="apropos_new.svg"
|
||||
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
|
||||
id="svg8"
|
||||
version="1.1"
|
||||
viewBox="0 0 12.7 12.7"
|
||||
height="48"
|
||||
width="48"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<defs
|
||||
id="defs2">
|
||||
<filter
|
||||
height="1.0241135"
|
||||
y="-0.012056753"
|
||||
width="1.0238876"
|
||||
x="-0.011943778"
|
||||
id="filter900"
|
||||
style="color-interpolation-filters:sRGB"
|
||||
inkscape:collect="always">
|
||||
<feGaussianBlur
|
||||
id="feGaussianBlur902"
|
||||
stdDeviation="0.33651028"
|
||||
inkscape:collect="always" />
|
||||
</filter>
|
||||
<filter
|
||||
height="1.0349618"
|
||||
y="-0.017480888"
|
||||
width="1.0789646"
|
||||
x="-0.039482275"
|
||||
id="filter1018"
|
||||
style="color-interpolation-filters:sRGB"
|
||||
inkscape:collect="always">
|
||||
<feGaussianBlur
|
||||
id="feGaussianBlur1020"
|
||||
stdDeviation="0.19016387"
|
||||
inkscape:collect="always" />
|
||||
</filter>
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
inkscape:snap-global="false"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-height="1009"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:object-nodes="false"
|
||||
inkscape:bbox-nodes="true"
|
||||
inkscape:bbox-paths="true"
|
||||
inkscape:snap-bbox="true"
|
||||
inkscape:snap-page="true"
|
||||
units="px"
|
||||
showgrid="false"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="g1030"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:cy="18.053125"
|
||||
inkscape:cx="3.9185077"
|
||||
inkscape:zoom="7.1455774"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:deskcolor="#d1d1d1" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<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>
|
||||
<g
|
||||
inkscape:label="Calque 2"
|
||||
id="layer2"
|
||||
inkscape:groupmode="layer">
|
||||
<g
|
||||
transform="matrix(0.12313291,0,0,0.12313291,3.8933229,-12.453772)"
|
||||
id="g862"
|
||||
style="fill:#0000ff">
|
||||
<g
|
||||
id="g1030">
|
||||
<g
|
||||
id="g933"
|
||||
transform="matrix(1.3514497,0,0,1.3514946,-104.10081,-93.737298)"
|
||||
style="stroke-width:0.739934">
|
||||
<path
|
||||
d="M 3.4888109,100.90592 A 33.81118,33.492559 0 0 0 -30.152746,134.3964 33.81118,33.492559 0 0 0 3.6566829,167.89107 33.81118,33.492559 0 0 0 37.466112,134.3964 33.81118,33.492559 0 0 0 3.6566829,100.90592 a 33.81118,33.492559 0 0 0 -0.167872,0 z m 0.167872,3.03429 A 30.454897,30.454897 0 0 1 34.112867,134.3964 30.454897,30.454897 0 0 1 3.6566829,164.85258 30.454897,30.454897 0 0 1 -26.799502,134.3964 30.454897,30.454897 0 0 1 3.6566829,103.94021 Z"
|
||||
style="fill:#b3b3b3;fill-opacity:0.576433;fill-rule:evenodd;stroke:none;stroke-width:0.842163;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter900)"
|
||||
id="path19"
|
||||
transform="matrix(0.99070113,0,0,0.99070113,0.03400303,1.249753)" />
|
||||
<g
|
||||
transform="matrix(0.92159474,0,0,0.92159474,0.29152559,10.550702)"
|
||||
id="g1038"
|
||||
style="stroke-width:0.739934">
|
||||
<g
|
||||
style="fill:#b3b3b3;fill-opacity:0.576471;stroke-width:0.739934;filter:url(#filter1018)"
|
||||
id="g908"
|
||||
transform="matrix(2.1077061,0,0,2.1077061,-0.86641942,-150.48426)">
|
||||
<path
|
||||
style="fill:#b3b3b3;fill-opacity:0.576471;stroke:none;stroke-width:0.739934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m -3.1073783,132.12572 -0.4971804,1.49154 c 4.01707299,-1.34867 4.47435491,0.36301 3.98475557,1.79863 -0.48959933,1.43561 -2.18480447,7.64534 -2.29580417,9.48299 -0.1109998,1.83765 2.11214326,3.22993 4.525805,3.38521 2.4136617,0.15528 4.5989199,-1.24295 4.5989199,-1.24295 l 0.7457709,-1.69627 c -1.2357175,0.60442 -2.1544693,1.11545 -3.1073785,0.8262 -0.9529092,-0.28925 -1.6157491,-1.49912 -1.3672462,-2.98308 0.2485029,-1.48396 1.4931646,-4.73206 2.3616073,-7.7063 0.8684427,-2.97424 -1.9935919,-4.57168 -3.8458376,-4.54774 -1.85224566,0.0239 -5.1034118,1.19177 -5.1034118,1.19177 z"
|
||||
id="path904"
|
||||
sodipodi:nodetypes="cczzzcczzzzc" />
|
||||
<ellipse
|
||||
style="fill:#b3b3b3;fill-opacity:0.576471;fill-rule:evenodd;stroke:none;stroke-width:0.739934;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
id="ellipse906"
|
||||
cx="4.7876372"
|
||||
cy="125.15446"
|
||||
rx="3.0603328"
|
||||
ry="2.9664576" />
|
||||
</g>
|
||||
<g
|
||||
transform="matrix(2.1077061,0,0,2.1077061,-1.8232797,-149.84635)"
|
||||
id="g17"
|
||||
style="stroke-width:0.739934">
|
||||
<path
|
||||
sodipodi:nodetypes="cczzzcczzzzc"
|
||||
id="path25"
|
||||
d="m -3.1073783,132.12572 -0.4971804,1.49154 c 4.01707299,-1.34867 4.47435491,0.36301 3.98475557,1.79863 -0.48959933,1.43561 -2.18480447,7.64534 -2.29580417,9.48299 -0.1109998,1.83765 2.11214326,3.22993 4.525805,3.38521 2.4136617,0.15528 4.5989199,-1.24295 4.5989199,-1.24295 l 0.7457709,-1.69627 c -1.2357175,0.60442 -2.1544693,1.11545 -3.1073785,0.8262 -0.9529092,-0.28925 -1.6157491,-1.49912 -1.3672462,-2.98308 0.2485029,-1.48396 1.4931646,-4.73206 2.3616073,-7.7063 0.8684427,-2.97424 -1.9935919,-4.57168 -3.8458376,-4.54774 -1.85224566,0.0239 -5.1034118,1.19177 -5.1034118,1.19177 z"
|
||||
style="fill:#0000ff;stroke:none;stroke-width:0.739934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
<ellipse
|
||||
ry="2.9664576"
|
||||
rx="3.0603328"
|
||||
cy="125.15446"
|
||||
cx="4.7876372"
|
||||
id="path27"
|
||||
style="fill:#0000ff;fill-rule:evenodd;stroke:none;stroke-width:0.739934;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
|
||||
</g>
|
||||
</g>
|
||||
<path
|
||||
id="path852"
|
||||
style="fill:#0000ff;fill-rule:evenodd;stroke:none;stroke-width:0.39193;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 15.921875,0.265625 A 15.73519,15.586909 0 0 0 0.265625,15.851562 15.73519,15.586909 0 0 0 16,31.439453 15.73519,15.586909 0 0 0 31.734375,15.851562 15.73519,15.586909 0 0 0 16,0.265625 a 15.73519,15.586909 0 0 0 -0.07813,0 z M 16,1.6777344 A 14.173229,14.173229 0 0 1 30.173828,15.851562 14.173229,14.173229 0 0 1 16,30.025391 14.173229,14.173229 0 0 1 1.8261719,15.851562 14.173229,14.173229 0 0 1 16,1.6777344 Z"
|
||||
transform="matrix(2.1487621,0,0,2.1487621,-31.618865,101.14089)" />
|
||||
</g>
|
||||
<g
|
||||
id="g14"
|
||||
transform="matrix(6.0021254,0,0,6.0021254,-210.14512,-179.14476)">
|
||||
<g
|
||||
id="g1624"
|
||||
transform="matrix(0.03295155,0,0,0.03295155,35.124105,52.219689)">
|
||||
<g
|
||||
transform="matrix(3.4017825,0,0,3.4017825,-95.08183,-189.09441)"
|
||||
id="g884"
|
||||
style="stroke-width:1.4046;stroke-miterlimit:4;stroke-dasharray:none">
|
||||
<rect
|
||||
style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:1.4046;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
id="rect880"
|
||||
width="38.433739"
|
||||
height="35.890331"
|
||||
x="37.868542"
|
||||
y="83.64991"
|
||||
ry="2.5985754"
|
||||
rx="2.5985754" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.61829;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
|
||||
d="M 71.512572,88.41099 60.11298,113.78783 43.185151,105.76978 55.59032,107.11953 Z"
|
||||
id="path882"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
</g>
|
||||
<path
|
||||
style="fill:#ffaaaa;stroke:#ffaaaa;stroke-width:3.21677px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 62.421182,83.450948 53.247834,73.396095 c -3.269201,-0.03495 -6.108773,-0.739553 -11.152516,1.99147 -5.59384,4.292817 -8.281453,7.910846 -10.664708,11.458206 -2.148177,4.173122 -1.698608,7.124368 -1.216677,10.060391 l 9.74404,9.259068 z"
|
||||
id="path1605"
|
||||
sodipodi:nodetypes="ccccccc" />
|
||||
<path
|
||||
transform="matrix(1.315503,-0.76811157,0.73918702,1.366979,-196.76404,56.095615)"
|
||||
id="path903"
|
||||
d="m 142.61305,103.6418 9.43978,-0.5287 c 1.19321,12.05269 -3.29434,12.95393 3.79047,36.57198"
|
||||
style="fill:none;stroke:#686868;stroke-width:3.90457;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
sodipodi:nodetypes="ccc" />
|
||||
<g
|
||||
id="g901"
|
||||
style="stroke-width:1.20245;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
transform="matrix(1.3484552,-0.70866904,0.67747724,1.3985899,-192.46008,42.858566)">
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.20245;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z"
|
||||
id="path886" />
|
||||
<path
|
||||
style="fill:#ffcc00;stroke:#000000;stroke-width:1.20245;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 148.93075,195.27732 -29.6731,-89.58453 19.78207,-6.217222 29.3905,89.301932 z"
|
||||
id="path888"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
<path
|
||||
style="fill:#cccccc;stroke:#000000;stroke-width:1.20245;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 119.25765,105.69279 19.78206,-6.217223 5.18467,15.184943 -20.19347,6.3466 z"
|
||||
id="path896"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
<path
|
||||
style="fill:#000000;stroke:none;stroke-width:1.20245;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 165.60421,210.25518 1.82913,-13.90142 c -1.86721,0.41019 -1.24071,5.14178 -2.26609,5.73964 -0.90416,0.52717 -2.9307,-2.35026 -4.06786,-2.12548 -1.70014,0.33605 2.39156,6.64425 -1.96215,4.47795 z"
|
||||
id="path1247"
|
||||
sodipodi:nodetypes="ccsscc" />
|
||||
</g>
|
||||
</g>
|
||||
<g
|
||||
id="g2"
|
||||
transform="matrix(0.38175439,0.06726674,-0.06726674,0.38175439,39.83151,35.167891)">
|
||||
<path
|
||||
id="path140"
|
||||
d="m -2.4285916,53.618899 c 1.4111023,-3.280834 4.6654772,-5.573887 8.4574855,-5.573887 2.0817417,0 3.9955791,0.696735 5.5386291,1.870075 l 7.364571,-1.94945 c -2.883959,-4.00403 -7.585075,-6.614584 -12.9032001,-6.614584 -8.2105499,0 -14.975046,6.235346 -15.8129021,14.225762 l 7.3554166,-1.957916"
|
||||
style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path141"
|
||||
d="m 14.487094,60.868482 c -1.402636,3.280481 -4.6654774,5.582708 -8.4582001,5.582708 -2.0806833,0 -4.0033045,-0.705554 -5.54706887,-1.86972 l -7.36388323,1.949095 c 2.8836143,4.004035 7.5931976,6.614573 12.9024854,6.614573 8.2197308,0 14.9754168,-6.234983 15.8132728,-14.225751 l -7.346606,1.949095"
|
||||
style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path142"
|
||||
d="m 2.8366167,43.423622 0.9348522,0.978958 1.349375,-0.0088 -0.635,1.190625 0.4145227,1.278466 L 3.57745,46.62544 2.4926583,47.418838 2.30745,46.086748 1.2141917,45.293353 2.430931,44.71127 2.8366167,43.42363"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path143"
|
||||
d="m 13.411139,48.680012 -0.511545,-0.855488 -0.961655,-0.220485 0.653336,-0.741186 -0.08856,-0.996598 0.90842,0.397227 0.917205,-0.397227 -0.09737,0.996598 0.652992,0.741186 -0.961311,0.220485 -0.511519,0.855488"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path144"
|
||||
d="m -5.8152582,53.557163 -0.511175,-0.855839 -0.9704917,-0.220486 0.6614584,-0.740481 -0.097023,-0.99695 0.9172311,0.39723 0.90805,-0.39723 -0.087842,0.99695 0.6526477,0.740481 -0.9613371,0.220486 -0.5115189,0.855839"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path145"
|
||||
d="m 9.8480749,38.123137 c -0.026458,0.02646 -0.070564,-0.0088 -0.052917,-0.0441 1.7374401,-2.769307 3.4395841,-5.55625 5.8120231,-8.39611 l 0.881935,0.705201 c -2.037635,2.884313 -4.418541,5.371394 -6.6410414,7.735007"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path146"
|
||||
d="m 18.81745,40.160428 -0.19439,-0.873125 c -0.943319,0.0088 -1.895819,0.308679 -2.795402,0.519994 -1.464019,0.353131 -2.972144,0.644173 -4.392083,1.17334 -0.02646,0.0088 -0.01773,0.05292 0.0093,0.05292 1.516592,0.01799 3.042338,-0.220487 4.550463,-0.388056 0.934879,-0.105833 1.922648,-0.149577 2.822231,-0.485069"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path147"
|
||||
d="m 9.3185643,29.630012 -0.8463227,-0.15875 c -0.352769,0.837848 -0.440981,1.799167 -0.590894,2.68111 -0.238125,1.437571 -0.5556249,2.883958 -0.6173787,4.347985 0,0.02646 0.035295,0.02646 0.052917,0.0088 0.5909204,-1.340557 0.9528704,-2.786946 1.3670227,-4.189235 0.2557727,-0.864307 0.5908939,-1.772709 0.634656,-2.689932"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path148"
|
||||
d="m 14.196052,45.33744 c 0.529167,-0.485068 0.573617,-1.305276 0.09702,-1.834443 L 5.2175227,33.457297 C 4.732806,32.928485 3.9125977,32.884387 3.383431,33.360637 2.898344,33.801607 2.818969,34.524803 3.180575,35.05397 l -3.615981,7.373054 -3.0603295,2.769306 c -0.4233334,0.379235 -0.6438371,0.917223 -0.6085417,1.481667 l 0.04408,0.908402 -0.4850606,0.440973 c -0.705194,0.643818 -0.7672917,1.737431 -0.1234811,2.442985 l 1.0495227,1.155348 c 0.6438106,0.705202 1.7374394,0.767292 2.4426333,0.123473 l 0.48543105,-0.440973 0.89958332,0.14111 c 0.24693562,0.03528 0.50270833,0.02646 0.74117729,-0.03528 l 4.78861434,5.291667 c 0.4233333,0.467432 1.1553295,0.511527 1.6227689,0.07937 l 0.635,-0.573617 C 8.4810522,55.770845 8.5075106,55.012372 8.0400976,54.54494 7.1232106,53.62772 6.399681,52.595845 5.878981,51.458137 l 0.67945,-0.608542 C 6.9817643,50.461539 7.0170333,49.808899 6.628969,49.376395 6.240931,48.953414 5.5882833,48.918489 5.1561393,49.30619 h -0.00873 C 5.0592225,48.935422 4.9971248,48.548072 4.9445785,48.159312 l 7.4171435,-2.910065 c 0.485061,0.529167 1.305269,0.564798 1.834436,0.08819"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path149"
|
||||
d="m 0.27896899,50.92897 -1.01422728,-0.15875 c -0.079375,-0.0088 -0.15875,0.0088 -0.21166666,0.06173 l -0.58208335,0.520348 c -0.4938977,0.449792 -1.2611893,0.405694 -1.710981,-0.0882 l -1.0494962,-1.155345 c -0.4494477,-0.49389 -0.4057121,-1.261182 0.087842,-1.710973 l 0.5824273,-0.520349 c 0.061727,-0.05292 0.088186,-0.132291 0.088186,-0.202845 l -0.052917,-1.03223 c -0.017727,-0.405341 0.1414727,-0.793395 0.440981,-1.0668 l 2.91041664,-2.628193 4.54202266,5.018265 -2.9104166,2.628193 c -0.088212,0.07938 -0.1940455,0.149577 -0.2995084,0.202848 L -2.181656,47.163065 c -0.096996,-0.105833 -0.2642129,-0.114651 -0.3704166,-0.01765 -0.1058334,0.09701 -0.1143,0.264583 -0.017727,0.370416 l 3.09562494,3.421944 c -0.0878417,0.0092 -0.16758709,0.0092 -0.24696208,-0.0088"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path150"
|
||||
d="M 1.7430144,50.981887 4.4770333,48.51244 c 0.2293144,1.569863 0.758481,3.077988 1.6495977,4.471459 L 4.450575,54.500845 1.4607833,51.193553 c 0.088186,-0.05292 0.1852084,-0.123473 0.2822311,-0.211666"
|
||||
style="fill:#ed1c24;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path151"
|
||||
d="M 5.48245,55.665012 4.7857227,54.888899 6.4084916,53.424872 c 0.2028561,0.282223 0.4145227,0.555625 0.6438106,0.820208 L 5.48245,55.665012"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path152"
|
||||
d="M 0.09376066,42.541324 3.542181,35.48577 11.9912,44.83438 4.7416166,47.683414 0.09376066,42.541324"
|
||||
style="fill:#ed1c24;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path153"
|
||||
d="M -1.6965689,49.879455 -2.657906,50.75258 c -0.1061773,0.09701 -0.1146439,0.264583 -0.017727,0.370417 0.096996,0.105833 0.2645834,0.114652 0.3704167,0.01765 l 0.9613106,-0.873125 c 0.1058333,-0.09701 0.114644,-0.264584 0.017727,-0.370417 -0.097023,-0.105833 -0.2645833,-0.114655 -0.3704167,-0.01765"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path154"
|
||||
d="m -2.3936666,49.103345 -0.9609667,0.873125 c -0.1058333,0.09701 -0.1146439,0.264583 -0.017198,0.370417 0.096652,0.105833 0.2642129,0.114652 0.3704167,0.01765 l 0.9609666,-0.873125 c 0.1058334,-0.09701 0.114644,-0.264583 0.017727,-0.370416 -0.096996,-0.105834 -0.2645833,-0.114652 -0.3707606,-0.01765"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path155"
|
||||
d="m -3.0900499,48.336053 -0.9613106,0.873125 c -0.1058334,0.09701 -0.1146705,0.264936 -0.017727,0.370769 0.097023,0.105481 0.2645833,0.114652 0.3704166,0.01693 l 0.9613107,-0.872773 c 0.1058333,-0.09701 0.1146704,-0.264583 0.017727,-0.370417 -0.097023,-0.105833 -0.2649273,-0.114651 -0.3704166,-0.01765"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path156"
|
||||
d="m 3.7273894,33.748691 c 0.3175,-0.291394 0.8117416,-0.264581 1.1027833,0.05292 L 13.90501,43.846955 c 0.291042,0.3175 0.264584,0.81139 -0.05292,1.102432 -0.3175,0.291041 -0.811371,0.264583 -1.102413,-0.05292 C 12.352806,44.455497 4.0360523,35.256816 3.6744727,34.859941 3.383431,34.533622 3.4098894,34.039732 3.7273894,33.748691"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path157"
|
||||
d="m 7.6432226,55.824113 -0.634656,0.572911 C 6.7524499,56.62633 6.3471083,56.60869 6.11745,56.352928 l -0.273394,-0.299863 1.5610416,-1.41111 c 0.08853,0.08819 0.1763713,0.18556 0.2645834,0.273402 0.2469356,0.255765 0.238125,0.67028 -0.026458,0.908756"
|
||||
style="fill:#ed1c24;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path158"
|
||||
d="m 5.5000977,49.694599 c 0.2116666,-0.194379 0.5467879,-0.176742 0.7319962,0.03493 0.1940454,0.211666 0.1763977,0.546806 -0.034925,0.732015 L 5.6500106,50.955428 C 5.5089083,50.602649 5.3854273,50.249872 5.288431,49.879455 l 0.2116667,-0.184856"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path159"
|
||||
d="m 4.4329273,38.026122 c -0.1058334,0.09701 -0.114644,0.264583 -0.017727,0.370417 l 4.8863249,5.406318 c 0.096652,0.105482 0.2642129,0.114655 0.3700463,0.01765 0.1058333,-0.09701 0.1146704,-0.264583 0.017727,-0.370065 L 4.8033175,38.04377 C 4.7063212,37.937936 4.5391046,37.929115 4.4329008,38.026122"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path160"
|
||||
d="m 4.8650977,40.442649 c -0.1054894,0.09701 -0.1146704,0.264583 -0.017727,0.370417 l 2.0902083,2.319162 c 0.097023,0.106186 0.2645833,0.114652 0.3704167,0.01799 0.1058333,-0.09701 0.1146439,-0.264583 0.017727,-0.370417 L 5.2266773,40.460289 C 5.129681,40.354455 4.970931,40.345989 4.8650977,40.442641"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path161"
|
||||
d="m 4.4241166,41.897857 c -0.1058333,0.09701 -0.1146439,0.264584 -0.017727,0.370417 l 1.0495227,1.155348 c 0.097023,0.105833 0.2645833,0.114652 0.3704166,0.01765 0.1058334,-0.09702 0.114644,-0.264584 0.017727,-0.370417 L 4.7945333,41.915505 C 4.6887,41.809672 4.52995,41.800853 4.4241166,41.897857"
|
||||
style="fill:#14253b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path162"
|
||||
d="m 8.3925226,67.809032 1.2086167,0.608896 1.2699997,-0.449792 -0.211666,1.331733 0.820208,1.067144 -1.331754,0.220504 -0.7584544,1.11125 -0.6173787,-1.199462 -1.2964583,-0.388038 0.9525,-0.952156 -0.035613,-1.350079"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path163"
|
||||
d="m 17.0712,65.331122 -0.890773,-0.449792 -0.934852,0.33514 0.149939,-0.98778 -0.599731,-0.784929 0.978959,-0.15875 0.564435,-0.820208 0.449792,0.890762 0.952156,0.281871 -0.696384,0.697088 0.02646,0.996598"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
<path
|
||||
id="path164"
|
||||
d="m 0.82578336,68.920636 -0.88193562,-0.449791 -0.93487874,0.326318 0.14993938,-0.978958 -0.59973108,-0.785283 0.97895836,-0.158398 0.56446208,-0.820209 0.44979166,0.881946 0.9525,0.282221 -0.70556438,0.705556 0.0264583,0.996598"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352777" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 23 KiB |
Loading…
Reference in New Issue
Block a user