pablo/analyseWriter
pablo
/
analyseWriter
1
1
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

V4.4.7

This commit is contained in:
pablo rodriguez 2023-04-23 16:12:19 +02:00
parent 518f19f584
commit 9b7bf85f68
12 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
analyseWriter.exe
View File

Binary file not shown.

BIN
analyseWriter.jar
View File

Binary file not shown.

BIN
bin/MEPTL/commandes.class
View File

Binary file not shown.

BIN
bin/accueilanalysecalc.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
bin/fenetres/create$1.class
View File

Binary file not shown.

BIN
bin/fenetres/create$2.class
View File

Binary file not shown.

BIN
bin/fenetres/create$3.class
View File

Binary file not shown.

BIN
bin/fenetres/create.class
View File

Binary file not shown.

BIN
icons/accueilanalysecalc.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

2
src/MEPTL/commandes.java
View File

@ -34,7 +34,7 @@ public class commandes {
public static node nodeCSV = null; public static node nodeCSV = null;
//** Version //** Version
public static String version ="V4.4.6"; // La version actuelle public static String version ="V4.4.7"; // La version actuelle
public static String branch = "Origin"; public static String branch = "Origin";
public static String Annee ="2023"; public static String Annee ="2023";

18
src/fenetres/chargeBaseAuDemarrage.java
View File

@ -25,6 +25,7 @@ import MEPTL.commandes;
import action.actOpenBaseEvaluation; import action.actOpenBaseEvaluation;
import baseEvaluations.chargeEvaluationSelected; import baseEvaluations.chargeEvaluationSelected;
import baseEvaluations.myTableBaseEvaluation; import baseEvaluations.myTableBaseEvaluation;
import net.miginfocom.swing.MigLayout;
public class chargeBaseAuDemarrage extends JFrame { public class chargeBaseAuDemarrage extends JFrame {
@ -40,6 +41,7 @@ public class chargeBaseAuDemarrage extends JFrame {
private final JButton btnCheminVersBaseDonnees = new JButton("<html>Travailler avec une autre base<br>d'évaluation</html>"); private final JButton btnCheminVersBaseDonnees = new JButton("<html>Travailler avec une autre base<br>d'évaluation</html>");
private final JPanel panelGauche = new JPanel(); private final JPanel panelGauche = new JPanel();
private final JPanel panelDroite = new JPanel(); private final JPanel panelDroite = new JPanel();
private final JLabel label = new JLabel(commandes.PathBaseEvaluations);
public chargeBaseAuDemarrage() { public chargeBaseAuDemarrage() {
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
@ -63,19 +65,17 @@ public chargeBaseAuDemarrage() {
//Add the scroll pane to this panel. //Add the scroll pane to this panel.
getContentPane().add(scrollPane,BorderLayout.CENTER); getContentPane().add(scrollPane,BorderLayout.CENTER);
panelBas.setLayout(new MigLayout("", "[394px][394px][]", "[53px]"));
panelBas.add(label, "flowy,cell 0 0,grow");
//*Le bas de la fenêtre contenant les boutons getContentPane().add(panelBas, BorderLayout.SOUTH);
panelBas.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 10));
btnCheminVersBaseDonnees.setForeground(new Color(0, 128, 192)); btnCheminVersBaseDonnees.setForeground(new Color(0, 128, 192));
btnCheminVersBaseDonnees.setFont(new Font("Tahoma", Font.BOLD, 16)); btnCheminVersBaseDonnees.setFont(new Font("Tahoma", Font.BOLD, 16));
btnCheminVersBaseDonnees.setIcon(new ImageIcon(chargeBaseAuDemarrage.class.getResource("/resources/sauvegardehistoriqueevaluation.png"))); btnCheminVersBaseDonnees.setIcon(new ImageIcon(chargeBaseAuDemarrage.class.getResource("/resources/sauvegardehistoriqueevaluation.png")));
btnCheminVersBaseDonnees.setSelectedIcon(new ImageIcon(chargeBaseAuDemarrage.class.getResource("/resources/sauvegardehistoriqueevaluation.png"))); btnCheminVersBaseDonnees.setSelectedIcon(new ImageIcon(chargeBaseAuDemarrage.class.getResource("/resources/sauvegardehistoriqueevaluation.png")));
panelBas.add(btnCheminVersBaseDonnees, "cell 2 0,alignx right,growy");
panelBas.add(btnCheminVersBaseDonnees);
getContentPane().add(panelBas, BorderLayout.SOUTH);
lblInformationBaseEvluation.setIcon(new ImageIcon(chargeBaseAuDemarrage.class.getResource("/resources/accueilChargeEvaluation.png"))); lblInformationBaseEvluation.setIcon(new ImageIcon(chargeBaseAuDemarrage.class.getResource("/resources/accueilChargeEvaluation.png")));
//*Le haut //*Le haut
@ -179,10 +179,12 @@ private void ListenerAction() {
*/ */
btnCheminVersBaseDonnees.addActionListener(new ActionListener() { btnCheminVersBaseDonnees.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
new ChargePathBaseEvaluation(true); new ChargePathBaseEvaluation(false);
new actOpenBaseEvaluation(); new actOpenBaseEvaluation();
label.setText(commandes.PathBaseEvaluations);
model.addOrUpdate(); model.addOrUpdate();
table = new JTable(model); table = new JTable(model);
revalidate();
} }
}); });

17
src/fenetres/create.java
View File

@ -404,15 +404,6 @@ public final class create extends JFrame {
btnChargeEvaluation.setHideActionText(true); btnChargeEvaluation.setHideActionText(true);
toolBarPrincipal.add(btnChargeEvaluation); toolBarPrincipal.add(btnChargeEvaluation);
// JButton btnSaveEvluation = toolBarPrincipal.add( new actSaveHistoriqueEvaluation() );
// btnSaveEvluation.addActionListener(new ActionListener() {
// public void actionPerformed(ActionEvent e) {
// }
// });
// btnSaveEvluation.setIcon(new ImageIcon(create.class.getResource("/resources/sauvegardehistoriqueevaluation.png")));
// btnSaveEvluation.setHideActionText(true);
// toolBarPrincipal.add(btnSaveEvluation);
toolBarPrincipal.addSeparator(); toolBarPrincipal.addSeparator();
JButton btnSaveEvaluation = toolBarPrincipal.add( new actSaveEvaluation() ); JButton btnSaveEvaluation = toolBarPrincipal.add( new actSaveEvaluation() );
@ -499,14 +490,6 @@ public final class create extends JFrame {
btnTotalPointNode.setHideActionText(true); btnTotalPointNode.setHideActionText(true);
toolBarPrincipal.add(btnTotalPointNode); toolBarPrincipal.add(btnTotalPointNode);
// toolBarPrincipal.addSeparator();
// tglbtnTousLesNodes = new JToggleButton("");
// tglbtnTousLesNodes.setAction(new actTousLesNodesEvaluer());
// tglbtnTousLesNodes.setIcon(new ImageIcon(create.class.getResource("/resources/lesnodesevaluer.png")));
// toolBarPrincipal.add(tglbtnTousLesNodes);
toolBarPrincipal.addSeparator(); toolBarPrincipal.addSeparator();
JButton btnAbout = toolBarPrincipal.add( new actAbout() ); JButton btnAbout = toolBarPrincipal.add( new actAbout() );