Menu
▾
▴
[proteowizard-commit] SF.net SVN: proteowizard:[1659] trunk/pwiz/pwiz
|
From: <ch...@us...> - 2009-12-30 21:34:58
|
Revision: 1659
http://proteowizard.svn.sourceforge.net/proteowizard/?rev=1659&view=rev
Author: chambm
Date: 2009-12-30 21:34:49 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
- fixed cvgen namespace issues
- fixed OBO filename in code comment to exclude parent directory
- updated psi-ms CV to 2.30.0
- updated unit CV to 18:12:2009
Modified Paths:
--------------
trunk/pwiz/pwiz/data/common/cv.cpp
trunk/pwiz/pwiz/data/common/cv.hpp
trunk/pwiz/pwiz/data/common/cvgen.cpp
trunk/pwiz/pwiz/data/common/psi-ms.obo
trunk/pwiz/pwiz/data/common/unit.obo
trunk/pwiz/pwiz/utility/bindings/CLI/cv.hpp
trunk/pwiz/pwiz/utility/bindings/CLI/cvgen_cli.cpp
Modified: trunk/pwiz/pwiz/data/common/cv.cpp
===================================================================
--- trunk/pwiz/pwiz/data/common/cv.cpp 2009-12-30 21:33:45 UTC (rev 1658)
+++ trunk/pwiz/pwiz/data/common/cv.cpp 2009-12-30 21:34:49 UTC (rev 1659)
@@ -1486,6 +1486,8 @@
{MS_Bruker_Daltonics_apex_series, "MS:1001556", "Bruker Daltonics apex series", "", false},
{MS_Shimadzu_Biotech_software, "MS:1001557", "Shimadzu Biotech software", "", false},
{MS_MALDI_Solutions, "MS:1001558", "MALDI Solutions", "Shimadzu Biotech software for data acquisition, processing, and analysis.", false},
+ {MS_AB_SCIEX_TOF_TOF_T2D_nativeID_format, "MS:1001559", "AB SCIEX TOF/TOF T2D nativeID format", "file=xsd:IDREF.", false},
+ {MS_AB_SCIEX_TOF_TOF_T2D_file, "MS:1001560", "AB SCIEX TOF/TOF T2D file", "Applied Biosystems/MDS Analytical Technologies TOF/TOF instrument export format.", false},
{MS_ProteinScape_ProfoundProbability, "MS:1001597", "ProteinScape:ProfoundProbability", "The Profound probability score stored by ProteinScape.", false},
{UO_unit, "UO:0000000", "unit", "A unit of measurement is a standardized quantity of a physical quality.", false},
{UO_length_unit, "UO:0000001", "length unit", "A base unit which is a standard measure of the distance between two points.", false},
@@ -1676,7 +1678,7 @@
{UO_dimensionless_unit, "UO:0000186", "dimensionless unit", "A derived unit which is a standard measure of physical quantity consisting of only a numerical number without any units.", false},
{UO_percent, "UO:0000187", "percent", "A dimensionless ratio unit which denotes numbers as fractions of 100.", false},
{UO_pi, "UO:0000188", "pi", "A dimensionless unit which denoted an irrational real number, approximately equal to 3.14159 which is the ratio of a circle's circumference to its diameter in Euclidean geometry.", false},
- {UO_count, "UO:0000189", "count", "A dimensionless unit which denotes a simple count of things.", false},
+ {UO_count_unit, "UO:0000189", "count unit", "A dimensionless unit which denotes a simple count of things.", false},
{UO_ratio, "UO:0000190", "ratio", "A dimensionless unit which denotes an amount or magnitude of one quantity relative to another.", false},
{UO_fraction, "UO:0000191", "fraction", "A dimensionless ratio unit which relates the part (the numerator) to the whole (the denominator).", false},
{UO_molecule_count, "UO:0000192", "molecule count", "A dimensionless count unit which denotes the number of molecules.", false},
@@ -1731,7 +1733,7 @@
{UO_micron, "UO:0000241", "micron", "A spatial resolution unit which is equal to a pixel size of one micrometer.", false},
{UO_pixels_per_inch, "UO:0000242", "pixels per inch", "A spatial resolution unit which is a standard measure of the resolution of a computer display, related to the size of the display in inches and the total number of pixels in the horizontal and vertical directions.", false},
{UO_pixels_per_millimeter, "UO:0000243", "pixels per millimeter", "A spatial resolution unit which is a standard measure of the number of pixels in one millimeter length or width of a digital image divided by the physical length or width of a printed image.", false},
- {UO_base_pair, "UO:0000244", "base pair", "A length unit which contains one nucleotide.", false},
+ {UO_base_pair, "UO:0000244", "base pair", "A count unit which contains one nucleotide.", false},
{UO_kibibyte, "UO:0000245", "kibibyte", "An information unit which is equal to 1024 B.", false},
{UO_mebibyte, "UO:0000246", "mebibyte", "An information unit which is equal to 1024 KiB.", false},
{UO_millivolt, "UO:0000247", "millivolt", "An electric potential difference unit which is equal to one thousandth of a volt or 10^[-3] V.", false},
@@ -1757,6 +1759,7 @@
{UO_electric_field_strength_unit, "UO:0000267", "electric field strength unit", "The electric field strength is a derived unit which is a measure of the potential difference between two points some distance apart.", false},
{UO_volt_per_meter, "UO:0000268", "volt per meter", "The volt per meter is a unit of electric field strength equal to the a potential difference of 1 volt existing between two points that are 1 meter apart.", false},
{UO_absorbance_unit, "UO:0000269", "absorbance unit", "A dimensionless logarithmic unit assigned to a measure of absorbance of light through a partially absorbing substance, defined as -log10(I/I_0) where I = transmitted light and I_0 = incident light.", false},
+ {UO_microgram_per_liter, "UO:0000301", "microgram per liter", "A mass unit density which is equal to mass of an object in micrograms divided by the volume in liters.", false},
{UNIMOD_unimod_root_node, "UNIMOD:0", "unimod root node", "The root node of the unimod modifications ontology.", false},
{UNIMOD_Acetyl, "UNIMOD:1", "Acetyl", "Acetylation", false},
{UNIMOD_Amidated, "UNIMOD:2", "Amidated", "Amidation", false},
@@ -7911,6 +7914,8 @@
{MS_MALDI_Solutions, MS_acquisition_software},
{MS_MALDI_Solutions, MS_analysis_software},
{MS_MALDI_Solutions, MS_data_processing_software},
+ {MS_AB_SCIEX_TOF_TOF_T2D_nativeID_format, MS_native_spectrum_identifier_format},
+ {MS_AB_SCIEX_TOF_TOF_T2D_file, MS_mass_spectrometer_file_format},
{MS_ProteinScape_ProfoundProbability, MS_search_engine_specific_score_for_peptides},
{MS_ProteinScape_ProfoundProbability, MS_search_engine_specific_score},
{UO_length_unit, UO_base_unit},
@@ -8106,10 +8111,10 @@
{UO_dimensionless_unit, UO_derived_unit},
{UO_percent, UO_ratio},
{UO_pi, UO_dimensionless_unit},
- {UO_count, UO_dimensionless_unit},
+ {UO_count_unit, UO_dimensionless_unit},
{UO_ratio, UO_dimensionless_unit},
{UO_fraction, UO_ratio},
- {UO_molecule_count, UO_count},
+ {UO_molecule_count, UO_count_unit},
{UO_purity_percentage, UO_percent},
{UO_confluence_percentage, UO_percent},
{UO_degree_fahrenheit, UO_temperature_derived_unit},
@@ -8128,8 +8133,8 @@
{UO_milliliter_per_liter, UO_volume_per_unit_volume},
{UO_gram_per_deciliter, UO_mass_density_unit},
{UO_deciliter, UO_volume_unit},
- {UO_colony_forming_unit, UO_count},
- {UO_plaque_forming_unit, UO_count},
+ {UO_colony_forming_unit, UO_count_unit},
+ {UO_plaque_forming_unit, UO_count_unit},
{UO_colony_forming_unit_per_volume, UO_concentration_unit},
{UO_colony_forming_unit_per_milliliter, UO_colony_forming_unit_per_volume},
{UO_plaque_forming_unit_per_volume, UO_concentration_unit},
@@ -8162,7 +8167,7 @@
{UO_micron, UO_spatial_resolution_unit},
{UO_pixels_per_inch, UO_spatial_resolution_unit},
{UO_pixels_per_millimeter, UO_spatial_resolution_unit},
- {UO_base_pair, UO_count},
+ {UO_base_pair, UO_count_unit},
{UO_kibibyte, UO_information_unit},
{UO_mebibyte, UO_information_unit},
{UO_millivolt, UO_electric_potential_difference},
@@ -8188,6 +8193,7 @@
{UO_electric_field_strength_unit, UO_derived_unit},
{UO_volt_per_meter, UO_electric_field_strength_unit},
{UO_absorbance_unit, UO_dimensionless_unit},
+ {UO_microgram_per_liter, UO_mass_density_unit},
{UNIMOD_Acetyl, UNIMOD_unimod_root_node},
{UNIMOD_Amidated, UNIMOD_unimod_root_node},
{UNIMOD_Biotin, UNIMOD_unimod_root_node},
@@ -13688,7 +13694,7 @@
{BTO_vascular_smooth_muscle_cell_line, "DRV", BTO_vascular_smooth_muscle},
{BTO_M22_cell, "DRV", BTO_OC_CDE22_cell},
{BTO_large_cell_lung_cancer_cell_line, "DRV", BTO_large_cell_carcinoma_cell},
- {BTO_small_cell_lung_cancer_cell_line, "DRV", UO_count},
+ {BTO_small_cell_lung_cancer_cell_line, "DRV", UO_count_unit},
{BTO_adrenocortical_carcinoma_cell, "DRV", UO_base_unit},
{BTO_digestive_gland_cell_line, "DRV", UNIMOD_Trioxidation},
{BTO_foreskin_fibroblast_cell_line, "DRV", BTO_prepuce},
@@ -14284,6 +14290,7 @@
{UO_enzyme_unit, "U"},
{UO_kilogram_per_meter, "kg/m"},
{UO_percent, "%"},
+ {UO_count_unit, "count"},
{UO_degree_fahrenheit, "F"},
{UO_liter_per_kilogram, "l/kg"},
{UO_milliliter_per_kilogram, "ml/kg"},
@@ -14343,6 +14350,7 @@
{UO_electric_field_strength_unit, "E-field strength "},
{UO_volt_per_meter, "V/m"},
{UO_absorbance_unit, "AU"},
+ {UO_microgram_per_liter, "ug/L"},
{BTO_microglia, "microglial cell"},
{BTO_glia, "glial cell"},
{BTO_macroglia, "macroglial cell"},
@@ -14392,10 +14400,10 @@
cvMap_["UO"].URI = "http://obo.cvs.sourceforge.net/*checkout*/obo/obo/ontology/phenotype/unit.obo";
cvMap_["MS"].id = "MS";
- cvMap_["MS"].version = "2.29.0";
+ cvMap_["MS"].version = "2.30.0";
cvMap_["UO"].id = "UO";
- cvMap_["UO"].version = "14:07:2009";
+ cvMap_["UO"].version = "18:12:2009";
cvMap_["UNIMOD"].id = "UNIMOD";
cvMap_["UNIMOD"].version = "19:11:2008";
Modified: trunk/pwiz/pwiz/data/common/cv.hpp
===================================================================
--- trunk/pwiz/pwiz/data/common/cv.hpp 2009-12-30 21:33:45 UTC (rev 1658)
+++ trunk/pwiz/pwiz/data/common/cv.hpp 2009-12-30 21:34:49 UTC (rev 1659)
@@ -33,15 +33,15 @@
#include "pwiz/utility/misc/Export.hpp"
-// [pwiz\data\common\psi-ms.obo]
+// [psi-ms.obo]
// format-version: 1.2
// date: 19:08:2009 0:07
// saved-by: andreas_bertsch
// auto-generated-by: OBO-Edit 1.101
// default-namespace: MS
// remark: namespace: MS
-// remark: version: 2.29.0
-// remark: release date: 2009-12-10
+// remark: version: 2.30.0
+// remark: release date: 2009-12-30
// remark: coverage: Mass spectrometer output files and spectra interpretation
// remark: creator: Matt Chambers <matt.chambers <-at-> vanderbilt.edu>
// remark: creator: Andreas Bertsch <bertsch <-at-> informatik.uni-tuebingen.de>
@@ -51,9 +51,9 @@
// remark: When appropriate the definition and synonyms of a term are reported exactly as in the chapter 12 of IUPAC orange book. See http://www.iupac.org/projects/2003/2003-056-2-500.html.
// import: http://obo.cvs.sourceforge.net/*checkout*/obo/obo/ontology/phenotype/unit.obo?revision=1.21
//
-// [pwiz\data\common\unit.obo]
+// [unit.obo]
// format-version: 1.2
-// date: 14:07:2009 12:37
+// date: 18:12:2009 10:12
// saved-by: George Gkoutos
// auto-generated-by: OBO-Edit 2.000-beta55
// subsetdef: abnormal_slim "Abnormal/normal slim"
@@ -66,13 +66,13 @@
// namespace-id-rule: * UO:$sequence(7,0,9999999)$
// import: http://purl.org/obo/obo-all/quality/quality.obo
//
-// [pwiz\data\common\unimod.obo]
+// [unimod.obo]
// format-version: 1.0
// date: 19:11:2008 14:50
// saved-by: psi-pi_team
// default-namespace: UNIMOD
//
-// [pwiz\data\common\BrendaTissueOBO.obo]
+// [BrendaTissueOBO.obo]
// format-version: 1.2
// date: 21:05:2009 21:34
// auto-generated-by: OBO-Edit 2.000-beta49
@@ -4861,6 +4861,12 @@
/// MALDI Solutions: Shimadzu Biotech software for data acquisition, processing, and analysis.
MS_MALDI_Solutions = 1001558,
+ /// AB SCIEX TOF/TOF T2D nativeID format: file=xsd:IDREF.
+ MS_AB_SCIEX_TOF_TOF_T2D_nativeID_format = 1001559,
+
+ /// AB SCIEX TOF/TOF T2D file: Applied Biosystems/MDS Analytical Technologies TOF/TOF instrument export format.
+ MS_AB_SCIEX_TOF_TOF_T2D_file = 1001560,
+
/// ProteinScape:ProfoundProbability: The Profound probability score stored by ProteinScape.
MS_ProteinScape_ProfoundProbability = 1001597,
@@ -5431,8 +5437,8 @@
/// pi: A dimensionless unit which denoted an irrational real number, approximately equal to 3.14159 which is the ratio of a circle's circumference to its diameter in Euclidean geometry.
UO_pi = 100000188,
- /// count: A dimensionless unit which denotes a simple count of things.
- UO_count = 100000189,
+ /// count unit: A dimensionless unit which denotes a simple count of things.
+ UO_count_unit = 100000189,
/// ratio: A dimensionless unit which denotes an amount or magnitude of one quantity relative to another.
UO_ratio = 100000190,
@@ -5596,7 +5602,7 @@
/// pixels per millimeter: A spatial resolution unit which is a standard measure of the number of pixels in one millimeter length or width of a digital image divided by the physical length or width of a printed image.
UO_pixels_per_millimeter = 100000243,
- /// base pair: A length unit which contains one nucleotide.
+ /// base pair: A count unit which contains one nucleotide.
UO_base_pair = 100000244,
/// kibibyte: An information unit which is equal to 1024 B.
@@ -5674,6 +5680,9 @@
/// absorbance unit: A dimensionless logarithmic unit assigned to a measure of absorbance of light through a partially absorbing substance, defined as -log10(I/I_0) where I = transmitted light and I_0 = incident light.
UO_absorbance_unit = 100000269,
+ /// microgram per liter: A mass unit density which is equal to mass of an object in micrograms divided by the volume in liters.
+ UO_microgram_per_liter = 100000301,
+
/// unimod root node: The root node of the unimod modifications ontology.
UNIMOD_unimod_root_node = 200000000,
Modified: trunk/pwiz/pwiz/data/common/cvgen.cpp
===================================================================
--- trunk/pwiz/pwiz/data/common/cvgen.cpp 2009-12-30 21:33:45 UTC (rev 1658)
+++ trunk/pwiz/pwiz/data/common/cvgen.cpp 2009-12-30 21:34:49 UTC (rev 1659)
@@ -37,8 +37,7 @@
using namespace std;
-using namespace pwiz;
-using namespace pwiz::msdata;
+using namespace pwiz::data;
namespace bfs = boost::filesystem;
@@ -149,7 +148,7 @@
for (vector<OBO>::const_iterator obo=obos.begin(); obo!=obos.end(); ++obo)
{
- os << "// [" << obo->filename << "]\n";
+ os << "// [" << bfs::path(obo->filename).filename() << "]\n";
for (vector<string>::const_iterator it=obo->header.begin(); it!=obo->header.end(); ++it)
os << "// " << *it << endl;
Modified: trunk/pwiz/pwiz/data/common/psi-ms.obo
===================================================================
--- trunk/pwiz/pwiz/data/common/psi-ms.obo 2009-12-30 21:33:45 UTC (rev 1658)
+++ trunk/pwiz/pwiz/data/common/psi-ms.obo 2009-12-30 21:34:49 UTC (rev 1659)
@@ -4,8 +4,8 @@
auto-generated-by: OBO-Edit 1.101
default-namespace: MS
remark: namespace: MS
-remark: version: 2.29.0
-remark: release date: 2009-12-10
+remark: version: 2.30.0
+remark: release date: 2009-12-30
remark: coverage: Mass spectrometer output files and spectra interpretation
remark: creator: Matt Chambers <matt.chambers <-at-> vanderbilt.edu>
remark: creator: Andreas Bertsch <bertsch <-at-> informatik.uni-tuebingen.de>
@@ -9434,6 +9434,18 @@
is_a: MS:1001456 ! analysis software
is_a: MS:1001457 ! data processing software
+[Term]
+id: MS:1001559
+name: AB SCIEX TOF/TOF T2D nativeID format
+def: "file=xsd:IDREF." [PSI:MS]
+is_a: MS:1000767 ! native spectrum identifier format
+
+[Term]
+id: MS:1001560
+name: AB SCIEX TOF/TOF T2D file
+def: "Applied Biosystems/MDS Analytical Technologies TOF/TOF instrument export format." [PSI:MS]
+is_a: MS:1000560 ! mass spectrometer file format
+
[Typedef]
id: has_regexp
name: has regexp
Modified: trunk/pwiz/pwiz/data/common/unit.obo
===================================================================
--- trunk/pwiz/pwiz/data/common/unit.obo 2009-12-30 21:33:45 UTC (rev 1658)
+++ trunk/pwiz/pwiz/data/common/unit.obo 2009-12-30 21:34:49 UTC (rev 1659)
@@ -1,5 +1,5 @@
format-version: 1.2
-date: 14:07:2009 12:37
+date: 18:12:2009 10:12
saved-by: George Gkoutos
auto-generated-by: OBO-Edit 2.000-beta55
subsetdef: abnormal_slim "Abnormal/normal slim"
@@ -620,6 +620,13 @@
is_a: UO:0000052 ! mass density unit
[Term]
+id: UO:0000301
+name: microgram per liter
+def: "A mass unit density which is equal to mass of an object in micrograms divided by the volume in liters." [UOC:GVG]
+synonym: "ug/L" EXACT []
+is_a: UO:0000052 ! mass density unit
+
+[Term]
id: UO:0000085
name: candela per square meter
def: "A luminance unit which is equal to a luminous intensity of one candela radiating from a surface whose area is one square meter." [NIST:NIST "http://physics.nist.gov/cuu/Units/"]
@@ -1365,8 +1372,9 @@
[Term]
id: UO:0000189
-name: count
+name: count unit
def: "A dimensionless unit which denotes a simple count of things." [MGED:MGED "http://mged.sourceforge.net/ontologies/MGEDontology.php"]
+synonym: "count" EXACT []
is_a: UO:0000186 ! dimensionless unit
[Term]
@@ -1385,7 +1393,7 @@
id: UO:0000192
name: molecule count
def: "A dimensionless count unit which denotes the number of molecules." [MGED:MGED "http://mged.sourceforge.net/ontologies/MGEDontology.php"]
-is_a: UO:0000189 ! count
+is_a: UO:0000189 ! count unit
[Term]
id: UO:0000193
@@ -1510,14 +1518,14 @@
name: colony forming unit
def: "A dimensionless count unit which a measure of viable bacterial numbers." [Wikipedia:Wikipedia "http://www.wikipedia.org/"]
synonym: "cfu" EXACT []
-is_a: UO:0000189 ! count
+is_a: UO:0000189 ! count unit
[Term]
id: UO:0000211
name: plaque forming unit
def: "A dimensionless count unit which a measure of plague forming units in a given volume." [Wikipedia:Wikipedia "http://www.wikipedia.org/"]
synonym: "pfu" EXACT []
-is_a: UO:0000189 ! count
+is_a: UO:0000189 ! count unit
[Term]
id: UO:0000212
@@ -1743,9 +1751,9 @@
[Term]
id: UO:0000244
name: base pair
-def: "A length unit which contains one nucleotide." [UO:GVG]
+def: "A count unit which contains one nucleotide." [UO:GVG]
synonym: "bp" EXACT []
-is_a: UO:0000189 ! count
+is_a: UO:0000189 ! count unit
[Term]
id: UO:0000245
Modified: trunk/pwiz/pwiz/utility/bindings/CLI/cv.hpp
===================================================================
--- trunk/pwiz/pwiz/utility/bindings/CLI/cv.hpp 2009-12-30 21:33:45 UTC (rev 1658)
+++ trunk/pwiz/pwiz/utility/bindings/CLI/cv.hpp 2009-12-30 21:34:49 UTC (rev 1659)
@@ -32,15 +32,15 @@
#include "SharedCLI.hpp"
-// [C:\bumbershoot\src\pwiz-src\pwiz\data\common\psi-ms.obo]
+// [psi-ms.obo]
// format-version: 1.2
// date: 19:08:2009 0:07
// saved-by: andreas_bertsch
// auto-generated-by: OBO-Edit 1.101
// default-namespace: MS
// remark: namespace: MS
-// remark: version: 2.29.0
-// remark: release date: 2009-12-10
+// remark: version: 2.30.0
+// remark: release date: 2009-12-30
// remark: coverage: Mass spectrometer output files and spectra interpretation
// remark: creator: Matt Chambers <matt.chambers <-at-> vanderbilt.edu>
// remark: creator: Andreas Bertsch <bertsch <-at-> informatik.uni-tuebingen.de>
@@ -50,9 +50,9 @@
// remark: When appropriate the definition and synonyms of a term are reported exactly as in the chapter 12 of IUPAC orange book. See http://www.iupac.org/projects/2003/2003-056-2-500.html.
// import: http://obo.cvs.sourceforge.net/*checkout*/obo/obo/ontology/phenotype/unit.obo?revision=1.21
//
-// [C:\bumbershoot\src\pwiz-src\pwiz\data\common\unit.obo]
+// [unit.obo]
// format-version: 1.2
-// date: 14:07:2009 12:37
+// date: 18:12:2009 10:12
// saved-by: George Gkoutos
// auto-generated-by: OBO-Edit 2.000-beta55
// subsetdef: abnormal_slim "Abnormal/normal slim"
@@ -4849,6 +4849,12 @@
/// <summary>MALDI Solutions: Shimadzu Biotech software for data acquisition, processing, and analysis.</summary>
MS_MALDI_Solutions = 1001558,
+ /// <summary>AB SCIEX TOF/TOF T2D nativeID format: file=xsd:IDREF.</summary>
+ MS_AB_SCIEX_TOF_TOF_T2D_nativeID_format = 1001559,
+
+ /// <summary>AB SCIEX TOF/TOF T2D file: Applied Biosystems/MDS Analytical Technologies TOF/TOF instrument export format.</summary>
+ MS_AB_SCIEX_TOF_TOF_T2D_file = 1001560,
+
/// <summary>ProteinScape:ProfoundProbability: The Profound probability score stored by ProteinScape.</summary>
MS_ProteinScape_ProfoundProbability = 1001597,
@@ -5419,8 +5425,8 @@
/// <summary>pi: A dimensionless unit which denoted an irrational real number, approximately equal to 3.14159 which is the ratio of a circle's circumference to its diameter in Euclidean geometry.</summary>
UO_pi = 100000188,
- /// <summary>count: A dimensionless unit which denotes a simple count of things.</summary>
- UO_count = 100000189,
+ /// <summary>count unit: A dimensionless unit which denotes a simple count of things.</summary>
+ UO_count_unit = 100000189,
/// <summary>ratio: A dimensionless unit which denotes an amount or magnitude of one quantity relative to another.</summary>
UO_ratio = 100000190,
@@ -5584,7 +5590,7 @@
/// <summary>pixels per millimeter: A spatial resolution unit which is a standard measure of the number of pixels in one millimeter length or width of a digital image divided by the physical length or width of a printed image.</summary>
UO_pixels_per_millimeter = 100000243,
- /// <summary>base pair: A length unit which contains one nucleotide.</summary>
+ /// <summary>base pair: A count unit which contains one nucleotide.</summary>
UO_base_pair = 100000244,
/// <summary>kibibyte: An information unit which is equal to 1024 B.</summary>
@@ -5660,7 +5666,10 @@
UO_volt_per_meter = 100000268,
/// <summary>absorbance unit: A dimensionless logarithmic unit assigned to a measure of absorbance of light through a partially absorbing substance, defined as -log10(I/I_0) where I = transmitted light and I_0 = incident light.</summary>
- UO_absorbance_unit = 100000269
+ UO_absorbance_unit = 100000269,
+
+ /// <summary>microgram per liter: A mass unit density which is equal to mass of an object in micrograms divided by the volume in liters.</summary>
+ UO_microgram_per_liter = 100000301
}; // enum CVID
Modified: trunk/pwiz/pwiz/utility/bindings/CLI/cvgen_cli.cpp
===================================================================
--- trunk/pwiz/pwiz/utility/bindings/CLI/cvgen_cli.cpp 2009-12-30 21:33:45 UTC (rev 1658)
+++ trunk/pwiz/pwiz/utility/bindings/CLI/cvgen_cli.cpp 2009-12-30 21:34:49 UTC (rev 1659)
@@ -145,7 +145,7 @@
for (vector<OBO>::const_iterator obo=obos.begin(); obo!=obos.end(); ++obo)
{
- os << "// [" << obo->filename << "]\n";
+ os << "// [" << bfs::path(obo->filename).filename() << "]\n";
for (vector<string>::const_iterator it=obo->header.begin(); it!=obo->header.end(); ++it)
os << "// " << *it << endl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|