Commit 771b393a authored by pfreon's avatar pfreon
Browse files

Cosmetic changes

Change of the name of the icon file.
Addition of transparency in the Getting started menu.
parent 65888413
Years;Production;Effort;Environment
1969; 332.4; 146.5; 4.40
1969.5; 285.5; 127.6; 4.32
1970; 306.7; 130.34; 4.70
1970.5; 537.2; 208.06; 5.63
1971; 599.4; 243.66; 5.53
1971.5; 692.5; 386.44; 5.76
1972; 612.9; 320.22; 5.66
1972.5; 809.4; 413.17; 5.79
1973; 776.0; 430.39; 5.72
1974; 764.0; 509.67; 5.21
1974.5; 694.7; 461.9; 4.68
1975; 702.4; 398.41; 4.98
1975.5; 788.7; 535.44; 5.09
1976; 688.0; 551.61; 4.86
1976.5; 719.7; 720.42; 4.60
1977; 677.3; 631.72; 4.67
1977.5; 845.03; 807.1; 5.38
1978; 958.43; 760.06; 5.44
1978.5; 1203.9; 1100.92; 4.92
......@@ -19,7 +19,7 @@ is divided into following sections:
- cleanup
-->
<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="Climprod 5.0-impl">
<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="Climprod2.0-impl">
<fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
......@@ -609,7 +609,7 @@ is divided into following sections:
</condition>
<union id="test.set"/>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Climprod 5.0" testname="TestNG tests" workingDir="${work.dir}">
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Climprod2.0" testname="TestNG tests" workingDir="${work.dir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
......@@ -706,7 +706,7 @@ is divided into following sections:
<condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
<isset property="test.method"/>
</condition>
<condition else="-suitename Climprod 5.0 -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
<condition else="-suitename Climprod2.0 -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
<matches pattern=".*\.xml" string="@{testClass}"/>
</condition>
<delete dir="${build.test.results.dir}" quiet="true"/>
......@@ -1047,7 +1047,7 @@ is divided into following sections:
<delete file="${built-jar.properties}" quiet="true"/>
</target>
<target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
<echo level="warn" message="Cycle detected: Climprod 5.0 was already built"/>
<echo level="warn" message="Cycle detected: Climprod2.0 was already built"/>
</target>
<target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
<mkdir dir="${build.dir}"/>
......@@ -1672,6 +1672,7 @@ is divided into following sections:
</target>
<target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
<target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
<target depends="debug-test-method" name="debug-single-method"/>
<target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
<j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
</target>
......@@ -1713,7 +1714,7 @@ is divided into following sections:
<delete file="${built-clean.properties}" quiet="true"/>
</target>
<target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
<echo level="warn" message="Cycle detected: Climprod 5.0 was already built"/>
<echo level="warn" message="Cycle detected: Climprod2.0 was already built"/>
</target>
<target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
<mkdir dir="${build.dir}"/>
......
This diff is collapsed.
......@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=f85dc8f2@1.94.0.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=1a05adef
nbproject/build-impl.xml.script.CRC32=35acbde1
nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.96.0.48
nbproject/build-impl.xml.script.CRC32=39d567e5
nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.98.0.48
......@@ -5,4 +5,4 @@ do.jlink=false
javac.debug=true
javadoc.preview=true
jlink.strip=false
user.properties.file=C:\\Users\\pfreon\\AppData\\Roaming\\NetBeans\\12.1\\build.properties
user.properties.file=C:\\Users\\pfreon\\AppData\\Roaming\\NetBeans\\12.3\\build.properties
......@@ -3,19 +3,6 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/Data.java</file>
<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>
<file>file:/E:/CLIMPROD_Git2/climprod/src/fr/ird/climprod/Cadre_ModeleDirect.java</file>
</group>
<group/>
</open-files>
</project-private>
......@@ -44,8 +44,8 @@ javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=15
javac.target=15
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
......
......@@ -42,7 +42,7 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
}
private void jbInit() throws Exception {
imageIcon = new ImageIcon(getClass().getResource("resources/images/Climprod.jpg"));
imageIcon = new ImageIcon(getClass().getResource("resources/images/Climprod.ico"));
this.setTitle("About");
setResizable(false);
panel1.setLayout(borderLayout1);
......
......@@ -43,7 +43,7 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
}
private void jbInit() throws Exception {
//imageIcon = new ImageIcon(getClass().getResource("Climprod.jpg"));
//imageIcon = new ImageIcon(getClass().getResource("Climprod.ico"));
this.setTitle("How to get started");
setResizable(false);
......@@ -71,9 +71,9 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
"the 'Modelization' main menu. This is the recommended option. The expert system will ask you a " +
"number of questions, some them based on graphics or statistical results, in order to select " +
"the most appropriate model and try to validate it. You can activate the 'Trace all the procedure' " +
"facility in the main menu 'Option' although this talkative option is not recommended for a first " +
"use of CLIMPROD. \n\n2) You can decide to select yourself a model by using the sub-menu 'Fit a model " +
"directly' in the menu 'Modelization', which supposes that you are familiar with surplus production " +
"facility in the main menu 'Option' although this talkative option (full transparency of the expert-system) " +
"is not recommended for a first use of CLIMPROD. \n\n2) You can decide to select yourself a model by using the sub-menu " +
"'Fit a model directly' in the menu 'Modelization', which supposes that you are familiar with surplus production " +
"models including an environmental variable. Before doing this you can explore yourself your data " +
"set using the first three sub-menus of the 'Plots & graphs' main menu. After fitting a model, you " +
"will be able to display additional graphs related to the validation of the model.\n\n" +
......
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