Commit 5e97c989 authored by Xavier de Blas's avatar Xavier de Blas

Fixed sayers potency

version is now in version file

svn path=/trunk/; revision=321
parent eccf4c9e
......@@ -111,6 +111,7 @@ server: $(CHRONOJUMP).prg $(CHRONOJUMP_MINI).prg $(CHRONOJUMP_SERVER)
#-------------------------------
$(CHRONOJUMP).prg: $(NPLOT_LIBS)/NPlot.dll $(NPLOT_LIBS)/NPlot.Gtk.dll $(CHRONOJUMP_DEP) src/chronopic.cs glade/chronojump.glade
cp version.txt $(BUILD_DIR)
./compile_po_files.sh #update translations
$(MCS) -debug $(CHRONOJUMP_DEP) $(RESOURCES_GLADE) $(RESOURCES_IMAGES) $(RESOURCES_REPORT) -unsafe src/chronopic.cs -r:$(NPLOT_LIBS)/NPlot.dll -r:$(NPLOT_LIBS)/NPlot.Gtk.dll -r:System.Drawing -r:Mono.Posix $(CHRONOJUMP_LIB) -nowarn:169 -out:$(BUILD_DIR)/$(CHRONOJUMP).prg
......
CHRONOJUMP DETAILED CHANGELOG:
6 nov 2007 (2)
Fixed sayers potency
version is now in version file
6 nov 2007
Potency sayers now is correct (adds extra weight)
Updated spanish translation
......
......@@ -31,7 +31,7 @@ public class ChronoJump
ChronoJumpWindow chronoJumpWin;
private static string [] authors = {"Xavier de Blas", "Juan Gonzalez", "Juan Fernando Pardo"};
private static string progversion = "0.6-svn7";
private static string progversion = ""; //now in "version" file
private static string progname = "Chronojump";
private string runningFileName; //useful for knowing if there are two chronojump instances
......@@ -150,7 +150,7 @@ public class ChronoJump
} else {
*/
chronoJumpWin = new ChronoJumpWindow(recuperatedString, isFirstTime,
authors, progversion, progname, runningFileName);
authors, readVersion(), progname, runningFileName);
Application.Run();
/*
}
......@@ -236,5 +236,16 @@ public class ChronoJump
File.Delete(runningFileName);
Environment.Exit(1);
}
private string readVersion() {
string version = "";
try {
StreamReader reader = File.OpenText(Constants.FileNameVersion);
version = reader.ReadToEnd();
reader.Close();
} catch {
version = "not available";
}
return version;
}
}
......@@ -39,11 +39,11 @@ public class Constants
public static string PotencySayersSJlFormula = Catalog.GetString("Potency") + " SJl (Sayers) " +
"(60.7*" + Catalog.GetString("height") + "(cm))" +
"+ (45.3*" + Catalog.GetString("body weight") + "+" + Catalog.GetString("extra weight") + ") -2055";
"+ (45.3*(" + Catalog.GetString("body weight") + "+" + Catalog.GetString("extra weight") + ")) -2055";
public static string PotencySayersCMJlFormula = Catalog.GetString("Potency") + " CMJl (Sayers) " +
"(51.9*" + Catalog.GetString("height") + "(cm))" +
"+ (48.9*" + Catalog.GetString("body weight") + "+" + Catalog.GetString("extra weight") + ") -2007";
"+ (48.9*(" + Catalog.GetString("body weight") + "+" + Catalog.GetString("extra weight") + ")) -2007";
//global stat types
public static string TypeSessionSummary = Catalog.GetString("Session summary");
......@@ -60,8 +60,8 @@ public class Constants
//fileNames
public static string FileNameLogo = "chronojump_logo.png";
public static string FileNameCSS = "report_web_style.css";
public static string FileNameIcon = "chronojump_icon.png";
public static string FileNameVersion = "version.txt";
//30 colors defined
public static string [] Colors = {
......
......@@ -884,12 +884,12 @@ class SqliteStat : Sqlite
}
else if (indexType == Constants.PotencySayersSJlFormula) {
moreSelect =
ini + "((60.7 * 100 * " + jumpHeightInM + ") + (45.3 * " + totalWeight + ") - 2055)" + end + ", 1, "; //the "1" is for selecting something for compatibility with potencyLewisCMJl that needs to select two things
ini + "((60.7 * 100 * " + jumpHeightInM + ") + (45.3 * (" + totalWeight + ")) - 2055)" + end + ", 1, "; //the "1" is for selecting something for compatibility with potencyLewisCMJl that needs to select two things
}
//else if (indexType == Constants.PotencySayersCMJlFormula) {
else {
moreSelect =
ini + "((51.9 * 100 * " + jumpHeightInM + ") + (48.9 * " + totalWeight + ") - 2007)" + end + ", 1, "; //the "1" is for selecting something for compatibility with potencyLewisCMJl that needs to select two things
ini + "((51.9 * 100 * " + jumpHeightInM + ") + (48.9 * (" + totalWeight + ")) - 2007)" + end + ", 1, "; //the "1" is for selecting something for compatibility with potencyLewisCMJl that needs to select two things
}
......
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