Skip to content

GitLab

Commit 33b98e58 authored by pfreon's avatar pfreon
Browse files

Minor cosmetic changes 

Cosmetic changes in the About sub-menu files and others. Addition of .CLI files
parent 1250b47b
Hide whitespace changes
Inline Side-by-side
example_data/A Trial TXT file 1 data.CLI 0 → 100644
View file @ 33b98e58
Years;Production;Effort;Environment
1;9;2;5
2;12;1;4
\ No newline at end of file
example_data/A Trial TXT file 1 data.csv 0 → 100644
View file @ 33b98e58
Years;Production;Effort;Environment
1;9;2;5
2;12;1;4
example_data/A Trial TXT file 1 data.txt 0 → 100644
View file @ 33b98e58
Years;Production;Effort;Environment
1;9;2;5
2;12;1;4
example_data/EXAMPLE1 2020.CLI 0 → 100644
View file @ 33b98e58
Years;Production;Effort;Environment
1969; 332.4; 146.5; 4.40
1970; 285.5; 127.6; 4.32
1971; 306.7; 130.34; 4.70
2006; 537.2; 208.06; 5.63
2007; 599.4; 243.66; 5.53
2008; 692.5; 386.44; 5.76
2009; 612.9; 320.22; 5.66
2010; 809.4; 413.17; 5.79
1977; 776.0; 430.39; 5.72
2011; 764.0; 509.67; 5.21
2012; 694.7; 461.9; 4.68
2013; 702.4; 398.41; 4.98
2014; 788.7; 535.44; 5.09
2015; 688.0; 551.61; 4.86
2016; 719.7; 720.42; 4.60
2017; 677.3; 631.72; 4.67
2018; 845.03; 807.1; 5.38
2019; 958.43; 760.06; 5.44
2020; 1203.9; 1100.92; 4.92
nbproject/private/private.xml
View file @ 33b98e58
......@@ -8,8 +8,10 @@
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/CadreMain.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/Modele.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/Global.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/CadreMain_HowToBox.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/Validation.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/TexteRegles.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/CadreMain_ReferencesBox.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/QuestionReponse.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/Plot.java</file>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/UtilCadre.java</file>
......
src/fr/ird/climprod/CadreMain.java
View file @ 33b98e58
......@@ -147,7 +147,7 @@ public class CadreMain extends JFrame {
this.setIconImage(Toolkit.getDefaultToolkit().createImage(CadreMain.class.getResource("resources/images/Climprod.jpg")));
contentPane = (JPanel) this.getContentPane();
contentPane.setLayout(new GridLayout(1, 2));
this.setTitle("Climprod 5.0 beta");
this.setTitle("Climprod 5.0"); // beta version ici
this.addWindowListener(new java.awt.event.WindowAdapter() {
public void windowActivated(WindowEvent e) {
......
src/fr/ird/climprod/CadreMain_AboutBox.java
View file @ 33b98e58
......@@ -16,7 +16,7 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
JButton cmdOK = new JButton();
JLabel imageIcone = new JLabel();
ImageIcon imageIcon;
JTextArea jTextAreaCopyRight = new JTextArea();
......@@ -27,8 +27,7 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
GridLayout gridLayout1 = new GridLayout();
// String product = "Climprod";
// String version = "1.0";
JTextArea jTextAreaCopyRight = new JTextArea();
public CadreMain_AboutBox(Frame parent) {
super(parent);
enableEvents(AWTEvent.WINDOW_EVENT_MASK);
......@@ -51,7 +50,7 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
jPanCmd.setLayout(flowLayout1);
jPanImage.setLayout(flowLayout1);
jPanImage.setBorder(new EmptyBorder(10, 10, 10, 10));
jPanText.add(jTextAreaCopyRight, null);
jPanText.add(jTextAreaCopyRight, null); // Utile? Effet non visible.
gridLayout1.setRows(4);
gridLayout1.setColumns(1);
......@@ -69,7 +68,7 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
public void actionPerformed(ActionEvent arg0) {
cmdOK.doClick();
}
});
});
jTextAreaCopyRight.setPreferredSize(new Dimension(450, 600));
jTextAreaCopyRight.setWrapStyleWord(true);
jTextAreaCopyRight.setRows(20);
......@@ -109,7 +108,8 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
"of links to non-FAO and non-IRD sites is to indicate further information " +
"available on related topics.");
jTextAreaCopyRight.setAutoscrolls(false);
jTextAreaCopyRight.setAutoscrolls(true);
setResizable(false);
jTextAreaCopyRight.setEditable(false);
jTextAreaCopyRight.setMargin(new Insets(5, 5, 5, 5));
jTextAreaCopyRight.setFont(new java.awt.Font("Serif", 0, 13)); // Fenetre Help ->About du menu principal. Avant 0, 11. Modif 2020.
......@@ -127,7 +127,6 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
panel1.add(jPanAbout, BorderLayout.NORTH);
borderLayout2.setHgap(5);
borderLayout2.setVgap(5);
this.getContentPane().add(jPanAbout, null);
}
protected void processWindowEvent(WindowEvent e) {
......
src/fr/ird/climprod/CadreMain_HowToBox.java
View file @ 33b98e58
......@@ -59,7 +59,8 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
"You need first open a data file containing your data in four columns in a csv format " +
"using semicolons as separators. The heading of the columns are: Years;Catches;Effort;Environment. " +
"Historical files of CLIMPROD had the extension .CLI and the name of the second column was " +
"'Production'. You can still use directly those old files. If you need to create a new data " +
"'Production'. You can still use directly those old files including the EXAMPLE.CLI file available " +
"in your CLIMPROD folder. If you need to create a new data " +
"file you can either do it by using the sub-menu 'Create a new CLIMPROD data file' in the " +
"main menu 'File', or create it using a spreadsheet software (e.g. Excel, OpenOffice Calc) " +
"and save it under the .csv format. You will be able to import directly this .csv file in " +
......@@ -82,7 +83,7 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
"history html & graphs folder by using the corresponding sub-menu in the 'Files' main menu.\n\n");
jTextAreaCopyRight.setLineWrap(true);
jTextAreaCopyRight.setWrapStyleWord(true);
jTextAreaCopyRight.setPreferredSize(new Dimension(600, 600));
jTextAreaCopyRight.setPreferredSize(new Dimension(610, 610));
jTextAreaCopyRight.setEditable(false);
jTextAreaCopyRight.setMargin(new Insets(5, 5, 5, 5));
jTextAreaCopyRight.setFont(new java.awt.Font("Serif", 0, 14)); // Fenetre Help ->"How to get started" du menu principal. Avant 0, 11. Modif 2020.
......
src/fr/ird/climprod/CadreMain_ReferencesBox.java
View file @ 33b98e58
......@@ -11,22 +11,16 @@ public class CadreMain_ReferencesBox extends JDialog implements ActionListener {
JPanel jPanReferences = new JPanel();
JPanel jPanCmd = new JPanel();
// JPanel jPanImage = new JPanel();
JPanel jPanText = new JPanel();
JScrollPane jScrollPanText = new JScrollPane();
JButton cmdOK = new JButton();
// JLabel imageIcone = new JLabel();
//ImageIcon imageIcon;
JTextArea jTextAreaCopyRight = new JTextArea();
JTextArea jTextAreaReferences = new JTextArea();
BorderLayout borderLayout1 = new BorderLayout();
//BorderLayout borderLayout2 = new BorderLayout();
FlowLayout flowLayout1 = new FlowLayout();
FlowLayout flowLayout2 = new FlowLayout();
GridLayout gridLayout1 = new GridLayout();
// String product = "Climprod";
// String version = "1.0";
public CadreMain_ReferencesBox(Frame parent) {
......@@ -54,16 +48,16 @@ public class CadreMain_ReferencesBox extends JDialog implements ActionListener {
// gridLayout1.setRows(4);
// gridLayout1.setColumns(1);
jTextAreaCopyRight.setText(
jTextAreaReferences.setText(
"HOW TO CITE THIS SOFTWARE, ITS EQUATIONS & AND THE PAST-ENVIRONMENT-AVERAGING APPROCH:\n\n" +
"The software itselfs and the all the equations of the mixed models where CPUE = f(E,V) " +
"The software itself and the all the equations of the mixed models where CPUE = f(E,V) " +
"can be cited as follows:\n" +
"Fréon, P., Mullon, C. and Pichon, G. 1993. CLIMPROD: experimental interactive software " +
"for choosing and fitting surplus production models including environmental variables. " +
"FAO Computerized Information Series Fisheries, 5. 76p.\n" +
"Regarding equations of the mixed models # 13, 21, 26 and 31 the following text must be " +
"added to the previous reference: 'Model(s) available from version 5.0 of the CLIMPROD software'.\n\n" +
"OTHER USEFUL REFERENCES ABOUT THE CLIMPROD APPROACH::\n\n" +
"OTHER USEFUL REFERENCES ABOUT THE CLIMPROD APPROACH:\n\n" +
"Fréon, P. 1988. Introduction of climatic variables into global production models. in: " +
"International Symposium on Long Term Changes in Marine Fish Populations, Vigo (Espange) 1986. " +
"Larrañeta, M.G. and Wyatt, T. (Eds). Consejo Superior de Investigaciones Cientificas: 481-528.\n" +
......@@ -80,15 +74,21 @@ public class CadreMain_ReferencesBox extends JDialog implements ActionListener {
"la connaissance du déterminisme du recrutement. Ann. Inst. Océanogr., 68: 193-210.\n" +
"Fréon, P. and Yáñez, E. 1995. Influencia del medio ambiente en evaluación de stock: " +
"una aproximación con modelos de producción. Invest. Mar., Chili 23: 25-47.");
jTextAreaCopyRight.setLineWrap(true);
jTextAreaCopyRight.setWrapStyleWord(true);
jTextAreaCopyRight.setPreferredSize(new Dimension(600, 600));
jTextAreaCopyRight.setEditable(false);
jTextAreaCopyRight.setMargin(new Insets(5, 5, 5, 5));
jTextAreaCopyRight.setFont(new java.awt.Font("Serif", 0, 14)); // Fenetre Help ->References du menu principal. Avant 0, 11. Modif 2020.
jPanText.setLayout(flowLayout1);
jPanText.setBorder(new EmptyBorder(10, 10, 10, 10));
jPanText.add(jTextAreaCopyRight, null);
jTextAreaReferences.setLineWrap(true);
jTextAreaReferences.setWrapStyleWord(true);
jTextAreaReferences.setPreferredSize(new Dimension(550, 600));
jTextAreaReferences.setEditable(false);
jTextAreaReferences.setMargin(new Insets(5, 5, 5, 5));
jTextAreaReferences.setFont(new java.awt.Font("Serif", 0, 14)); // Fenetre Help ->References du menu principal. Avant 0, 11. Modif 2020.
// jPanText.setLayout(flowLayout1);
// jPanText.setBorder(new EmptyBorder(10, 10, 10, 10));
// jPanText.add(jTextAreaReferences, null);
jScrollPanText.setBorder(new EmptyBorder(10, 10, 10, 10));
jScrollPanText.add(jTextAreaReferences, null);
jScrollPanText.getViewport().add(jTextAreaReferences, null);
cmdOK.setText("Ok");
int condition = JComponent.WHEN_IN_FOCUSED_WINDOW;
......@@ -105,7 +105,7 @@ public class CadreMain_ReferencesBox extends JDialog implements ActionListener {
cmdOK.addActionListener(this);
jPanCmd.add(cmdOK, null);
jPanReferences.add(jPanText, BorderLayout.CENTER);
jPanReferences.add(jScrollPanText, BorderLayout.CENTER);
jPanReferences.add(jPanCmd, BorderLayout.SOUTH);
this.getContentPane().add(jPanReferences, null);
......
src/fr/ird/climprod/Cadre_Prediction.java
View file @ 33b98e58
......@@ -227,7 +227,7 @@ public class Cadre_Prediction extends JDialog implements DocumentListener {
private doubleTextField editorComponent = new doubleTextField();
private void initWindow() throws Exception {
lblInfo.setText("You can change the latest 2 years value for prediction");
lblInfo.setText("Please change the latest 2 years values in red characters and click on 'Compute prediction'");
lblInfo.setForeground(Color.red);
cmdPredict.setText("Compute prediction");
jPanCmd.setLayout(new GridLayout(1, 3, 5, 0));
......
src/fr/ird/climprod/TexteRegles.java
View file @ 33b98e58
......@@ -181,13 +181,13 @@ public static boolean isTrue(){
case 46:
result = (Global.stock_unique!=1 && Global.metapopulation!=1); // Changement de nom variable. Modif. 2020
if(!result){
commentaireEnCours="Metapopulations are special cases that difficult the application of any kind of population dynamics model.\nAccording to the level connectivity between sub-stocks, modelization might be borderline\nor not recommended as you will see after answering the next question.";
commentaireEnCours="Metapopulations are special cases that difficult the application of any kind of population dynamics model.\nAccording to the level connectivity between sub-stocks, modelization might be borderline or not recommended as you will see after answering the next question.";
}
break;
case 45:
result = (Global.stock_unique!=1 && Global.metapopulation==1 && Global.sous_stock_isole!=1); // Global.metapopulation==1
if(!result){
commentaireEnCours="Your case is a borderline one either because you deal only with a sub-stock or with a full metapopulation\n(and the lower is the connectivity between sub-stocks, the more borderline you are).\nYou must not extrapolate your results beyond the interval of observation of the\ndifferent variables (effort and/orenvironment) when using the model for predictions.\nMoreover, any surplus production model using effort will implicitly make the assumption that \nno variation in recruitment due to other sub-stocks will occur.";
commentaireEnCours="Your case is a borderline one either because you deal only with a sub-stock or with a full metapopulation (and the lower is the connectivity between sub-stocks, the more borderline you are).\nYou must not extrapolate your results beyond the interval of observation of the different variables (effort and/orenvironment) when using the model for predictions.\nMoreover, any surplus production model using effort will implicitly make the assumption that no variation in recruitment due to other sub-stocks will occur.";
}
break;
case 35:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment