Commit 41b8c4d8 authored by Eric Seigne's avatar Eric Seigne
Browse files

version 1.8.1 + tableau complet html

parent 1c137323
syntax: regexp
.DS_Store$
mvplan/build/*
mvplan/dist/*
mvplan/nbproject/private*
mvplan/mvplan.xml
mvplan_core/build/*
mvplan_core/dist/*
mvplan_core/nbproject/private*
mvplan_core/target/*
mvplan/target/*
syntax: glob
.settings/*
mvplan_core/.project
mvplan_core/.classpath
.project
......@@ -14,3 +14,4 @@ syntax: glob
mvplan_core/.project
mvplan_core/.classpath
.project
.metadata/
\ No newline at end of file
......@@ -78,13 +78,16 @@ public class TextProfilePrinter extends ProfilePrinter <StringBuffer>{
boolean ocMode = profile.getPrefs().isOcMode();
int segTimeMins, segTimeSeconds;
textArea.append("<html>");
textArea.append("<body>");
textArea.append("<head>");
textArea.append("<style>body {\n" +
" font-size: " + MvplanInstance.getPrefs().getFontSize() + "pt;\n" +
"}\n" +
"table { border: 1px black solid; background-color: black;}\n" +
"td, th { background-color: white; }\n" +
"</style>");
textArea.append("</head>");
textArea.append("<body>");
if(profile.getIsRepetitiveDive()) {
......@@ -105,10 +108,11 @@ public class TextProfilePrinter extends ProfilePrinter <StringBuffer>{
MvplanInstance.getPrefs().getPH2O()+" "+MvplanInstance.getPrefs().getDepthShortString()+
mvplan.getResource("mvplan.gui.text.ProfilePrinter.seaWater.shortText"));
textArea.append(" "+profile.getModel().getModelName());
textArea.append("\n");
textArea.append("<br>\n");
printAltitude();
textArea.append("========================================================="+'\n');
textArea.append("<br>\n");
textArea.append("<table cellpadding=\"4\">"+'\n');
textArea.append("<tr><th>Phase</th><th>Profondeur</th><th>Durée</th><th>Temps Total</th><th>Gaz</th><th>SP</th><th>END, M-VALUE et GF</th></tr>\n");
for(SegmentAbstract s : profile.getProfile()) {
......@@ -156,6 +160,7 @@ public class TextProfilePrinter extends ProfilePrinter <StringBuffer>{
}
textArea.append("</table>"+'\n');
doGasUsage();
textArea.append("</body>");
textArea.append("</html>");
}
......@@ -195,12 +200,15 @@ public class TextProfilePrinter extends ProfilePrinter <StringBuffer>{
int segTimeMins,segTimeSeconds;
textArea.append("<html>");
textArea.append("<head>");
textArea.append("<style>body {\n" +
" font-size: " + MvplanInstance.getPrefs().getFontSize() + "pt;\n" +
"}\n" +
"table { border: 1px black solid; background-color: black;}\n" +
"td, th { background-color: white; }\n" +
"</style>");
textArea.append("</head>");
textArea.append("<body>");
if(profile.getIsRepetitiveDive()) {
// Print repetitive dive heading
......@@ -221,16 +229,16 @@ public class TextProfilePrinter extends ProfilePrinter <StringBuffer>{
textArea.append("\n");
printAltitude();
boolean ocMode = profile.getPrefs().isOcMode();
// if (ocMode){
// textArea.append(" "+MvplanInstance.getPrefs().getDepthShortString()+" "+mvplan.getResource("mvplan.gui.text.ProfilePrinter.heading.textNoSP")+'\n');
// }else{
// textArea.append(" "+MvplanInstance.getPrefs().getDepthShortString()+" "+mvplan.getResource("mvplan.gui.text.ProfilePrinter.heading.text")+'\n');
// }
if (ocMode){
textArea.append(" "+MvplanInstance.getPrefs().getDepthShortString()+" "+mvplan.getResource("mvplan.gui.text.ProfilePrinter.heading.textNoSP")+'\n');
}else{
textArea.append(" "+MvplanInstance.getPrefs().getDepthShortString()+" "+mvplan.getResource("mvplan.gui.text.ProfilePrinter.heading.text")+'\n');
}
if (ocMode){
textArea.append("========================"+'\n');
textArea.append("<br>\n");
// "- 120 00:00 000 88/88
}else{
textArea.append("=============================="+'\n');
textArea.append("<br>\n");
// "- 120 00:00 000 88/88 1.30
}
......@@ -277,8 +285,8 @@ public class TextProfilePrinter extends ProfilePrinter <StringBuffer>{
}
textArea.append("</table>"+'\n');
doGasUsage();
textArea.append("</body>");
textArea.append("</html>");
}
/*
......
......@@ -43,8 +43,8 @@ public class TextTablePrinter extends TablePrinter<StringBuffer> {
}
/** Prints table to textArea */
public StringBuffer print() {
......
......@@ -16,8 +16,8 @@ public class MvplanInstance {
public static final String NAME = "MV-Plan"; // Application name
public static final int MAJOR_VERSION = 1; // Application version codes
public static final int MINOR_VERSION = 8;
public static final int PATCH_VERSION = 0;
public static final String VERSION_STATUS = "TEST"; // Application status
public static final int PATCH_VERSION = 1;
public static final String VERSION_STATUS = "RELEASED"; // Application status UNDEFINED|TEST|ALPHA|BETA|RELEASED
public static final String BUILD_DATE = "15-05-2021"; // Application
// release date
public static Version mvplanVersion; // App version. See Version Class
......
<mvplan.util.Version>
<majorVersion>1</majorVersion>
<minorVersion>8</minorVersion>
<patchVersion>1</patchVersion>
<statusString>RELEASED</statusString>
<dateString>15-05-2021</dateString>
</mvplan.util.Version>
\ No newline at end of file
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