MAJ V4.3.2 (Amélioration de la bascule entre les deux fenêtres de
l'application)
This commit is contained in:
parent
ddeb694da3
commit
1bacd768db
@ -12,6 +12,6 @@
|
||||
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
|
||||
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
48
bin/.gitignore
vendored
48
bin/.gitignore
vendored
@ -3,51 +3,3 @@
|
||||
/evaluer/
|
||||
/fenetres/
|
||||
/list/
|
||||
/textclean.svg
|
||||
/textcleanmini.png
|
||||
/titre.svg
|
||||
/titremini.png
|
||||
/totalpoint.png
|
||||
/totalpoint.svg
|
||||
/totalpointmini.png
|
||||
/totalpointnode.png
|
||||
/totalpointnode.svg
|
||||
/totalpointnodemini.png
|
||||
/touslesnodes.png
|
||||
/touslesnodes.svg
|
||||
/touslesnodesmini.png
|
||||
/toutext.png
|
||||
/toutext.svg
|
||||
/toutextmini.png
|
||||
/traduction.png
|
||||
/traduction.svg
|
||||
/traductionmini.png
|
||||
/treeClose.png
|
||||
/treeClose.svg
|
||||
/treeLeaf.png
|
||||
/treeLeaf.svg
|
||||
/treeOpen.png
|
||||
/treeOpen.svg
|
||||
/triche.png
|
||||
/triche.svg
|
||||
/trichemini.png
|
||||
/tutoriel.png
|
||||
/tutoriel.svg
|
||||
/tutorielmini.png
|
||||
/undo.png
|
||||
/upnode.png
|
||||
/upnode.svg
|
||||
/upnodemini.png
|
||||
/verifhistorique.png
|
||||
/verifhistoriquemax.png
|
||||
/verifhistoriquemini.png
|
||||
/versevaluate.png
|
||||
/versevaluate.svg
|
||||
/versevaluatemini.png
|
||||
/voir.svg
|
||||
/voirmini.png
|
||||
/what.svg
|
||||
/whatmini.png
|
||||
/zip.png
|
||||
/zip.svg
|
||||
/zipmini.png
|
||||
|
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.
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.
BIN
bin/versevaluate.png
Normal file
BIN
bin/versevaluate.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.0 KiB |
215
bin/versevaluate.svg
Normal file
215
bin/versevaluate.svg
Normal file
@ -0,0 +1,215 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
inkscape:export-ydpi="48"
|
||||
inkscape:export-xdpi="48"
|
||||
inkscape:export-filename="versevaluatemini.png"
|
||||
sodipodi:docname="versevaluate.svg"
|
||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||
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
|
||||
inkscape:collect="always"
|
||||
style="color-interpolation-filters:sRGB"
|
||||
id="filter1106"
|
||||
x="-0.042718512"
|
||||
y="-0.043064639"
|
||||
width="1.0856075"
|
||||
height="1.0863057">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.19783806"
|
||||
id="feGaussianBlur1108" />
|
||||
</filter>
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
style="color-interpolation-filters:sRGB"
|
||||
id="filter1182"
|
||||
x="-0.04599562"
|
||||
y="-0.060862163"
|
||||
width="1.0919912"
|
||||
height="1.1217243">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.15263707"
|
||||
id="feGaussianBlur1184" />
|
||||
</filter>
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-height="1009"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:guide-bbox="true"
|
||||
showguides="true"
|
||||
units="px"
|
||||
showgrid="false"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:cy="23.336669"
|
||||
inkscape:cx="18.211325"
|
||||
inkscape:zoom="13.755177"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base"
|
||||
inkscape:pagecheckerboard="0"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:snap-bbox="true"
|
||||
inkscape:bbox-paths="true"
|
||||
inkscape:bbox-nodes="true"
|
||||
inkscape:snap-midpoints="true"
|
||||
inkscape:object-paths="true"
|
||||
inkscape:snap-global="false"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:deskcolor="#d1d1d1">
|
||||
<sodipodi:guide
|
||||
id="guide14"
|
||||
orientation="1,0"
|
||||
position="-2.471617e-08,4.4381936"
|
||||
inkscape:locked="false" />
|
||||
<sodipodi:guide
|
||||
position="2.1052607,7.3945287"
|
||||
orientation="-0.7110256,0.70316613"
|
||||
id="guide2079"
|
||||
inkscape:locked="false" />
|
||||
</sodipodi:namedview>
|
||||
<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
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Calque 1"
|
||||
transform="translate(-0.92013353,-0.34176359)">
|
||||
<path
|
||||
id="path1180"
|
||||
style="opacity:0.631841;fill:#000000;stroke:none;stroke-width:0.400335;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;filter:url(#filter1182);stop-color:#000000"
|
||||
d="m 10.760379,2.8305838 -4.3415372,2.9842431 4.3116072,3.0347503 0.0083,-1.6070853 h 3.312859 c 0.183882,0 0.331665,-0.1448865 0.331665,-0.3251692 V 4.764281 c 0,-0.1802817 -0.147783,-0.3256501 -0.331665,-0.3256501 h -3.299124 z"
|
||||
sodipodi:nodetypes="ccccsssscc"
|
||||
transform="matrix(1.2484307,0,0,1.2494701,-4.0328064,-1.2221505)" />
|
||||
<g
|
||||
id="g1104"
|
||||
transform="matrix(0.91516059,0,0,0.9151569,0.71937649,0.3396516)"
|
||||
style="opacity:0.676617;fill:#000000;stroke-width:1.0927;filter:url(#filter1106)">
|
||||
<g
|
||||
id="g1096"
|
||||
transform="matrix(2.0256057,0,0,2.085527,3.858094,-3.9539377)"
|
||||
style="fill:#000000;stroke:#000000;stroke-width:0.843868;stroke-opacity:1">
|
||||
<rect
|
||||
ry="0.56339979"
|
||||
y="4.3255968"
|
||||
x="0.92013353"
|
||||
height="3.7594025"
|
||||
width="3.8382711"
|
||||
id="rect1090"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0548514;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
rx="0.5800662" />
|
||||
<path
|
||||
style="fill:#000000;stroke:#ffffff;stroke-width:0.476785;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 1.6159,5.0384659 3.9724208,7.4062084"
|
||||
id="path1092" />
|
||||
<path
|
||||
id="path1094"
|
||||
d="M 3.9724208,5.0384659 1.6159,7.4062084"
|
||||
style="fill:#000000;stroke:#ffffff;stroke-width:0.476785;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
</g>
|
||||
<g
|
||||
id="g1102"
|
||||
transform="matrix(1.9487365,0,0,2.0063839,-0.66234441,-0.08147761)"
|
||||
style="fill:#000000;stroke-width:0.843868">
|
||||
<rect
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0548514;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
id="rect1098"
|
||||
width="3.8382711"
|
||||
height="3.7594025"
|
||||
x="0.92013353"
|
||||
y="0.34176376"
|
||||
ry="0.56339979"
|
||||
rx="0.5800662" />
|
||||
<path
|
||||
style="fill:#000000;stroke:none;stroke-width:0.223272px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
|
||||
id="path1100"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
</g>
|
||||
</g>
|
||||
<g
|
||||
id="g854"
|
||||
transform="matrix(0.91516059,0,0,0.9151569,0.27076542,0.66008807)"
|
||||
style="stroke-width:1.0927">
|
||||
<g
|
||||
id="g919"
|
||||
transform="matrix(2.0256057,0,0,2.085527,3.858094,-3.9539377)"
|
||||
style="stroke:#000000;stroke-width:0.843868;stroke-opacity:1">
|
||||
<rect
|
||||
ry="0.56339979"
|
||||
y="4.3255968"
|
||||
x="0.92013353"
|
||||
height="3.7594025"
|
||||
width="3.8382711"
|
||||
id="rect12"
|
||||
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0548514;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
rx="0.5800662" />
|
||||
<path
|
||||
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.476785;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 1.6159,5.0384659 3.9724208,7.4062084"
|
||||
id="path841" />
|
||||
<path
|
||||
id="path843"
|
||||
d="M 3.9724208,5.0384659 1.6159,7.4062084"
|
||||
style="fill:none;stroke:#ffffff;stroke-width:0.476785;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
</g>
|
||||
<g
|
||||
id="g923"
|
||||
transform="matrix(1.9487365,0,0,2.0063839,-0.66234441,-0.08147761)"
|
||||
style="stroke-width:0.843868">
|
||||
<rect
|
||||
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0548514;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
id="rect10"
|
||||
width="3.8382711"
|
||||
height="3.7594025"
|
||||
x="0.92013353"
|
||||
y="0.34176376"
|
||||
ry="0.56339979"
|
||||
rx="0.5800662" />
|
||||
<path
|
||||
style="fill:#ffffff;stroke:none;stroke-width:0.223272px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
|
||||
id="path16"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
</g>
|
||||
</g>
|
||||
<path
|
||||
id="rect383"
|
||||
style="fill:#0000ff;stroke:#000000;stroke-width:0.249999;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
||||
d="M 8.872357,3.0260367 3.4522483,6.7547595 8.834992,10.54659 8.845362,8.5385843 h 4.135875 c 0.229563,0 0.41406,-0.1810313 0.41406,-0.4062892 V 5.4421337 c 0,-0.2252567 -0.184497,-0.4068901 -0.41406,-0.4068901 H 8.862505 Z"
|
||||
sodipodi:nodetypes="ccccsssscc" />
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 8.6 KiB |
BIN
bin/versevaluatemini.png
Normal file
BIN
bin/versevaluatemini.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 965 B |
@ -307,7 +307,7 @@ public class ecritureSujet {
|
||||
if( listeDesNodesAvecEvalNameNode.isEvalNameNode(no.get(k))) no.get(k).getAttributs().put("evalNameNode", "0");
|
||||
if(listeDesNodesSautEtTitre(no.get(k).getNomElt())) {no.get(k).getAttributs().put("saut", "false"); no.get(k).getAttributs().put("titre", "");}
|
||||
if(listeDesNodesRechercheByContenu.isRechercheByContenu(no.get(k))) {no.get(k).getAttributs().put("recherche_index", "false"); no.get(k).getAttributs().put("recherche_contenu_exact", "false");no.get(k).getAttributs().put("recherche_contenu_plus_proche_voisin", "false");no.get(k).getAttributs().put("allContent", "strict0");}
|
||||
if(listeDesNodesEvalPlacement.isPlacement(no.get(k)))no.get(k).getAttributs().put("evalPlacement", "false");
|
||||
if(listeDesNodesEvalPlacement.isPlacement(no.get(k)))no.get(k).getAttributs().put("evalPlacement", "0");
|
||||
if(listeDesNodesAnalyseStyle.isAnalyseStyle(no.get(k))) no.get(k).getAttributs().put("analyseStyle", "false");
|
||||
if(listeRechercheParAnchorPageNumber.isRechercheParAnchorPageNumber(no.get(k))) no.get(k).getAttributs().put("recherche_anchor-page-number", "false");
|
||||
|
||||
|
@ -76,9 +76,9 @@ public class rechercherUnNodeStudent {
|
||||
|
||||
|
||||
|
||||
//**************************************************************************
|
||||
//** Recherche les nodes text:p, text:h, text:span par le contenu textuel **
|
||||
//**************************************************************************
|
||||
//*************************************************************************************
|
||||
//** Recherche les nodes text:p, text:h, text:span, text:list par le contenu textuel **
|
||||
//*************************************************************************************
|
||||
if(nodSujet.getNomElt().contains("text:")) {
|
||||
nodStudent = findNodeByContenuTextuel(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
|
||||
if(nodStudent!=null) return nodStudent;
|
||||
@ -261,22 +261,7 @@ public class rechercherUnNodeStudent {
|
||||
}
|
||||
if(nodStudent!=null) return nodStudent;
|
||||
System.out.println("n'a pas trouvé par la méthode contenu exact sans casse et trim()");
|
||||
nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.95);
|
||||
if(nodStudent!=null) return nodStudent;
|
||||
System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.95");
|
||||
nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.9);
|
||||
if(nodStudent!=null) return nodStudent;
|
||||
System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.9");
|
||||
nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.85);
|
||||
if(nodStudent!=null) return nodStudent;
|
||||
System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.85");
|
||||
nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.8);
|
||||
if(nodStudent!=null) return nodStudent;
|
||||
System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.8");
|
||||
nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.75);
|
||||
if(nodStudent!=null) return nodStudent;
|
||||
System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.75");
|
||||
nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.7);
|
||||
return nodStudent;
|
||||
}
|
||||
|
||||
|
@ -1,27 +1,25 @@
|
||||
package fenetres;
|
||||
|
||||
|
||||
import java.awt.Font;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
|
||||
import javax.swing.DefaultComboBoxModel;
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JComboBox;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JTextField;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.border.EmptyBorder;
|
||||
|
||||
import MEPTL.commandes;
|
||||
import cXML.node;
|
||||
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.awt.event.ActionEvent;
|
||||
|
||||
import javax.swing.JComboBox;
|
||||
import javax.swing.JTextField;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.DefaultComboBoxModel;
|
||||
import javax.swing.ImageIcon;
|
||||
|
||||
import java.awt.event.ActionListener;
|
||||
import list.listeDesNodesAllContent;
|
||||
|
||||
public class allContent extends JFrame {
|
||||
|
||||
@ -32,6 +30,7 @@ public class allContent extends JFrame {
|
||||
private JPanel contentPane;
|
||||
private JTextField textFieldPoint;
|
||||
private JLabel lblExplication;
|
||||
|
||||
node nod;
|
||||
afficheText J;
|
||||
JComboBox<String> comboBoxValeur;
|
||||
@ -42,10 +41,10 @@ public class allContent extends JFrame {
|
||||
/**
|
||||
* Create the frame.
|
||||
*/
|
||||
public allContent(node nod, afficheText J) {
|
||||
public allContent(node nod, afficheText J,boolean Childs) {
|
||||
this.nod=nod;
|
||||
this.J=J;
|
||||
|
||||
|
||||
|
||||
if(nod.getAttributs().get("allContent")!=null) {
|
||||
String value = nod.getAttributs().get("allContent");
|
||||
@ -149,10 +148,20 @@ public class allContent extends JFrame {
|
||||
try {
|
||||
int point = Integer.valueOf(textFieldPoint.getText());
|
||||
if(point<0) point =0;
|
||||
nod.getAttributs().put("allContent", comboBoxValeur.getSelectedItem() + String.valueOf(point));
|
||||
nod.evaluerAllChildTrue();
|
||||
J.refreshAffichage(nod);
|
||||
dispose();
|
||||
if(!Childs) {
|
||||
nod.getAttributs().put("allContent", comboBoxValeur.getSelectedItem() + String.valueOf(point));
|
||||
nod.evaluerAllChildTrue();
|
||||
J.refreshAffichage(nod);
|
||||
}else {
|
||||
for(int i = 0 ; i < nod.getNodes().size(); i++) {
|
||||
if( listeDesNodesAllContent.isAllContent(nod.getNodes().get(i))){
|
||||
nod.getNodes().get(i).getAttributs().put("allContent", comboBoxValeur.getSelectedItem() + String.valueOf(point));
|
||||
nod.getNodes().get(i).evaluerAllChildTrue(); }
|
||||
}
|
||||
J.refreshAffichage(nod);
|
||||
}
|
||||
|
||||
dispose();
|
||||
} catch (Exception e2) {
|
||||
JOptionPane.showMessageDialog(null, "Le nombre de point doit être un entier.");
|
||||
}
|
||||
|
@ -8,6 +8,7 @@ import cXML.node;
|
||||
import fenetres.create_act.actAddMenuFalse;
|
||||
import fenetres.create_act.actAddMenuTrue;
|
||||
import fenetres.create_act.actAllContent;
|
||||
import fenetres.create_act.actAllContentChilds;
|
||||
import fenetres.create_act.actAttribut;
|
||||
import fenetres.create_act.actCoefficient;
|
||||
import fenetres.create_act.actCollapseAll;
|
||||
@ -555,8 +556,13 @@ if(nod!=null) {
|
||||
if(listeDesNodesAllContent.isAllContent(nod) ) {
|
||||
mnGroupeMethodeEvaluer.addSeparator();
|
||||
mnGroupeMethodeEvaluer.add(new actAllContent());
|
||||
if(listeDesNodesPourEvaluerPage.isPage(nod)) {
|
||||
mnGroupeMethodeEvaluer.addSeparator();
|
||||
mnGroupeMethodeEvaluer.add(new actAllContentChilds());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(listeEvalNameNode.isNodeEvalNameNode(nod)) {
|
||||
mnGroupeMethodeEvaluer.addSeparator();
|
||||
mnGroupeMethodeEvaluer.add(mnEvalNameNode());
|
||||
|
@ -25,7 +25,7 @@ public class actAllContent extends AbstractAction{
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
node nod = (node) fenetres.create.getSelectNode().getUserObject();
|
||||
new allContent(nod,fenetres.create.getTextNodeSelect());
|
||||
new allContent(nod,fenetres.create.getTextNodeSelect(),false);
|
||||
}
|
||||
|
||||
}
|
||||
|
30
src/fenetres/create_act/actAllContentChilds.java
Normal file
30
src/fenetres/create_act/actAllContentChilds.java
Normal file
@ -0,0 +1,30 @@
|
||||
package fenetres.create_act;
|
||||
|
||||
import java.awt.event.ActionEvent;
|
||||
|
||||
import javax.swing.AbstractAction;
|
||||
import javax.swing.Action;
|
||||
import javax.swing.ImageIcon;
|
||||
|
||||
import cXML.node;
|
||||
import fenetres.allContent;
|
||||
import fenetres.create;
|
||||
|
||||
public class actAllContentChilds extends AbstractAction{
|
||||
{
|
||||
putValue( Action.NAME, "Evaluer le contenu de tous les nodes enfants" );
|
||||
putValue( Action.SHORT_DESCRIPTION, "Evaluer le contenu de tous les nodes enfants" );
|
||||
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/allcontentmini.png")) );
|
||||
}
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
node nod = (node) fenetres.create.getSelectNode().getUserObject();
|
||||
new allContent(nod,fenetres.create.getTextNodeSelect(),true);
|
||||
}
|
||||
|
||||
}
|
@ -26,7 +26,7 @@ public class actEvaluer extends AbstractAction{
|
||||
}
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
new evaluate();
|
||||
evaluate.getInstance();
|
||||
create.getInstance().dispose();
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ public class actTousLesNodesEvaluer extends AbstractAction{
|
||||
try {
|
||||
|
||||
commandes.sujetSauvegarde = commandes.sujet.clone();
|
||||
commandes.sujet.supprimeTousLesNodesEvaluerFalseOuNull2();
|
||||
commandes.sujet.supprimeTousLesNodesEvaluerFalseOuNull();
|
||||
commandes.fichierAnalyseValide=false;
|
||||
|
||||
fenetres.create.getTextNodeSelect().setContentType("text/html");
|
||||
|
@ -25,6 +25,7 @@ import javax.swing.JScrollPane;
|
||||
import javax.swing.JToolBar;
|
||||
import javax.swing.KeyStroke;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.UnsupportedLookAndFeelException;
|
||||
import javax.swing.border.EmptyBorder;
|
||||
import javax.swing.event.ChangeEvent;
|
||||
import javax.swing.event.ChangeListener;
|
||||
@ -72,17 +73,26 @@ public class evaluate extends JFrame {
|
||||
private JCheckBox chckbxNoDetail;
|
||||
private afficheText txtpnmessages;
|
||||
|
||||
private static evaluate instance;
|
||||
|
||||
/**
|
||||
* Create the frame.
|
||||
*/
|
||||
public evaluate() {
|
||||
public void initialize() throws UnsupportedLookAndFeelException{
|
||||
setSize(1200,800);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") );
|
||||
this.setIconImage(img.getImage());
|
||||
setTitle(commandes.Titre + " " + commandes.version + " " + commandes.branch);
|
||||
|
||||
|
||||
setLocationRelativeTo( null );
|
||||
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
|
||||
setBounds(100, 100, 980, 700);
|
||||
|
||||
// setBounds(100, 100, 980, 700);
|
||||
int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth();
|
||||
int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight();
|
||||
setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2);
|
||||
@ -331,8 +341,27 @@ public class evaluate extends JFrame {
|
||||
});
|
||||
}
|
||||
|
||||
public static evaluate getInstance() {
|
||||
if (instance == null) {
|
||||
instance = new evaluate();
|
||||
}
|
||||
instance.setVisible(true);
|
||||
return instance;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create the application.
|
||||
*/
|
||||
public evaluate() {
|
||||
try {
|
||||
initialize();
|
||||
} catch (UnsupportedLookAndFeelException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
setVisible(true);
|
||||
}
|
||||
|
||||
|
||||
private void createMenu() {
|
||||
JMenuBar menuBar = new JMenuBar();
|
||||
@ -415,6 +444,10 @@ public class evaluate extends JFrame {
|
||||
toolBar.add(btnAfficheCodeFichierAnalyse);
|
||||
|
||||
JButton btnModifierFichierAnalyse = toolBar.add(actModifierFichierAnalyse);
|
||||
btnModifierFichierAnalyse.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
}
|
||||
});
|
||||
btnModifierFichierAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseModif.png")));
|
||||
btnModifierFichierAnalyse.setHideActionText(true);
|
||||
toolBar.add(btnModifierFichierAnalyse);
|
||||
@ -948,7 +981,7 @@ public class evaluate extends JFrame {
|
||||
|
||||
@Override public void actionPerformed( ActionEvent e ) {
|
||||
create.getInstance();
|
||||
dispose();
|
||||
evaluate.getInstance().dispose();
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -134,7 +134,7 @@ public class mainApp extends JFrame implements ActionListener{
|
||||
|
||||
if(e.getSource()==actCharge) {
|
||||
if(!commandes.console) System.out.println( "Début chargement du fichier d'analyse." );
|
||||
new evaluate();
|
||||
evaluate.getInstance();
|
||||
frmEvalwriter.dispose();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user