Skip to content

Commit 8cceaf9

Browse files
zhaoheting-zontalzhaoheting-zontal
committed
ZSPACE-12104 Remove reduncant properties.
1 parent 84519e8 commit 8cceaf9

File tree

1 file changed

+25
-37
lines changed

1 file changed

+25
-37
lines changed

‎Writer/MetadataWriter.cs‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ private void WriteJsonMetada(IRawDataPlus rawFile, int firstScanNumber, int last
154154
// File Properties
155155
string filePath = rawFile.FileName;
156156
metadata.addFileProperty(new CVTerm("NCIT:C47922", "NCIT", "Pathname", filePath));
157-
metadata.addFileProperty(new CVTerm("NCIT:*****************", "NCIT", "File Name", filePath.Substring(0, filePath.LastIndexOf(".")).Remove(0, filePath.LastIndexOf("\\") + 1)));
158157
metadata.addFileProperty(new CVTerm("NCIT:C25714", "NCIT", "Version",
159158
rawFile.FileHeader.Revision.ToString()));
160159
metadata.addFileProperty(new CVTerm("NCIT:C69199", "NCIT", "Content Creation Date",
@@ -229,20 +228,20 @@ private void WriteJsonMetada(IRawDataPlus rawFile, int firstScanNumber, int last
229228
// Sample Data
230229
if (!rawFile.SampleInformation.SampleName.IsNullOrEmpty())
231230
{
232-
metadata.addSampleProperty(new CVTerm("MS:1000002", "MS", "sample name",
231+
metadata.addSampleProperty(new CVTerm("MS:1000002", "MS", "Sample Name",
233232
rawFile.SampleInformation.SampleName));
234233
}
235234

236235
if (!rawFile.SampleInformation.SampleId.IsNullOrEmpty())
237236
{
238-
metadata.addSampleProperty(new CVTerm("MS:1000001", "MS", "sample number",
237+
metadata.addSampleProperty(new CVTerm("MS:1000001", "MS", "Sample Number",
239238
rawFile.SampleInformation.SampleId));
240239
}
241240

242241
if (!rawFile.SampleInformation.SampleType.ToString().IsNullOrEmpty() &&
243242
!rawFile.SampleInformation.SampleType.ToString().Equals("Unknown"))
244243
{
245-
metadata.addSampleProperty(new CVTerm("NCIT:C25284", "NCIT", "Type",
244+
metadata.addSampleProperty(new CVTerm("NCIT:C25284", "NCIT", "Sample Type",
246245
rawFile.SampleInformation.SampleType.ToString()));
247246
}
248247

@@ -260,13 +259,13 @@ private void WriteJsonMetada(IRawDataPlus rawFile, int firstScanNumber, int last
260259

261260
if (rawFile.SampleInformation.SampleVolume != 0)
262261
{
263-
metadata.addSampleProperty(new CVTerm("MS:1000005", "MS", "sample volume",
262+
metadata.addSampleProperty(new CVTerm("MS:1000005", "MS", "Sample Volume",
264263
rawFile.SampleInformation.SampleVolume.ToString(CultureInfo.InvariantCulture)));
265264
}
266265

267266
if (rawFile.SampleInformation.InjectionVolume != 0)
268267
{
269-
metadata.addSampleProperty(new CVTerm("AFR:0001577", "AFO", "injection volume setting",
268+
metadata.addSampleProperty(new CVTerm("AFR:0001577", "AFO", "Injection Volume",
270269
rawFile.SampleInformation.InjectionVolume.ToString(CultureInfo.InvariantCulture)));
271270
}
272271

@@ -278,38 +277,33 @@ private void WriteJsonMetada(IRawDataPlus rawFile, int firstScanNumber, int last
278277

279278
if (rawFile.SampleInformation.DilutionFactor != 0)
280279
{
281-
metadata.addSampleProperty(new CVTerm("AFQ:0000178", "AFO", "dilution factor",
280+
metadata.addSampleProperty(new CVTerm("AFQ:0000178", "AFO", "Dilution Factor",
282281
rawFile.SampleInformation.DilutionFactor.ToString(CultureInfo.InvariantCulture)));
283282
}
284283

285-
if (!rawFile.SampleInformation.Path.IsNullOrEmpty())
286-
{
287-
metadata.addSampleProperty(new CVTerm("AFQ:**********************", "AFO", "Path", rawFile.SampleInformation.Path));
288-
}
289-
290284
if (!rawFile.SampleInformation.InstrumentMethodFile.IsNullOrEmpty())
291285
{
292-
metadata.addSampleProperty(new CVTerm("AFQ:******************", "AFO", "Instrument Method", rawFile.SampleInformation.InstrumentMethodFile));
286+
metadata.addSampleProperty(new CVTerm("AFR:0002045", "AFO", "Device Acquisition Method", rawFile.SampleInformation.InstrumentMethodFile));
293287
}
294288

295289
if (rawFile.SampleInformation.IstdAmount != 0)
296290
{
297-
metadata.addSampleProperty(new CVTerm("AFQ:****************", "AFO", "Istd Amount", rawFile.SampleInformation.IstdAmount.ToString()));
291+
metadata.addSampleProperty(new CVTerm("", "", "Internal Standard Amount", rawFile.SampleInformation.IstdAmount.ToString()));
298292
}
299293

300294
if (!rawFile.SampleInformation.CalibrationLevel.IsNullOrEmpty())
301295
{
302-
metadata.addSampleProperty(new CVTerm("AFQ:****************", "AFO", "Calibration Level", rawFile.SampleInformation.CalibrationLevel));
296+
metadata.addSampleProperty(new CVTerm("AFR:0001849", "AFO", "Calibration Level", rawFile.SampleInformation.CalibrationLevel));
303297
}
304298

305299
if (!rawFile.SampleInformation.ProcessingMethodFile.IsNullOrEmpty())
306300
{
307-
metadata.addSampleProperty(new CVTerm("AFQ:****************", "AFO", "Processing Method", rawFile.SampleInformation.ProcessingMethodFile));
301+
metadata.addSampleProperty(new CVTerm("AFR:0002175", "AFO", "Data Processing Method", rawFile.SampleInformation.ProcessingMethodFile));
308302
}
309303

310304
if (rawFile.SampleInformation.SampleWeight != 0)
311305
{
312-
metadata.addSampleProperty(new CVTerm("AFQ:****************", "AFO", "Processing Method", rawFile.SampleInformation.SampleWeight.ToString()));
306+
metadata.addSampleProperty(new CVTerm("", "", "Sample Weight", rawFile.SampleInformation.SampleWeight.ToString()));
313307
}
314308

315309
string[] userLabels = rawFile.UserLabel;
@@ -324,7 +318,7 @@ private void WriteJsonMetada(IRawDataPlus rawFile, int firstScanNumber, int last
324318
{
325319
if (!userTexts[i].IsNullOrEmpty())
326320
{
327-
metadata.addSampleProperty(new CVTerm("AFQ:****************", "AFO", userLabels[i], userTexts[i]));
321+
metadata.addSampleProperty(new CVTerm("", "", userLabels[i], userTexts[i]));
328322
}
329323
}
330324
}
@@ -354,8 +348,7 @@ private void WriteTextMetadata(IRawDataPlus rawFile, int firstScanNumber, int la
354348
var output = new List<string>
355349
{
356350
"#FileProperties",
357-
"RAW file path=" + filePath,
358-
"RAW file name=" + filePath.Substring(0, filePath.LastIndexOf(".")).Remove(0, filePath.LastIndexOf("\\") + 1),
351+
"RAW File Path=" + filePath,
359352
"RAW file version=" + rawFile.FileHeader.Revision,
360353
"Creation date=" + rawFile.FileHeader.CreationDate
361354
};
@@ -422,53 +415,53 @@ private void WriteTextMetadata(IRawDataPlus rawFile, int firstScanNumber, int la
422415

423416
if (!rawFile.SampleInformation.SampleName.IsNullOrEmpty())
424417
{
425-
output.Add("Sample name=" + rawFile.SampleInformation.SampleName);
418+
output.Add("Sample Name=" + rawFile.SampleInformation.SampleName);
426419
}
427420

428421
if (!rawFile.SampleInformation.SampleId.IsNullOrEmpty())
429422
{
430-
output.Add("Sample id=" + rawFile.SampleInformation.SampleId);
423+
output.Add("Sample Number=" + rawFile.SampleInformation.SampleId);
431424
}
432425

433426
if (!rawFile.SampleInformation.SampleType.ToString().IsNullOrEmpty() &&
434427
!rawFile.SampleInformation.SampleType.ToString().Equals("Unknown"))
435428
{
436-
output.Add("Sample type=" + rawFile.SampleInformation.SampleType);
429+
output.Add("Sample Type=" + rawFile.SampleInformation.SampleType);
437430
}
438431

439432
if (!rawFile.SampleInformation.Comment.IsNullOrEmpty())
440433
{
441-
output.Add("Sample comment=" + rawFile.SampleInformation.Comment);
434+
output.Add("Comment=" + rawFile.SampleInformation.Comment);
442435
}
443436

444437
if (!rawFile.SampleInformation.Vial.IsNullOrEmpty())
445438
{
446-
output.Add("Sample vial=" + rawFile.SampleInformation.Vial);
439+
output.Add("Vial=" + rawFile.SampleInformation.Vial);
447440
}
448441

449442
if (rawFile.SampleInformation.SampleVolume != 0)
450443
{
451-
output.Add("Sample volume=" + rawFile.SampleInformation.SampleVolume);
444+
output.Add("Sample Volume=" + rawFile.SampleInformation.SampleVolume);
452445
}
453446

454447
if (rawFile.SampleInformation.InjectionVolume != 0)
455448
{
456-
output.Add("Sample injection volume=" + rawFile.SampleInformation.InjectionVolume);
449+
output.Add("Injection Volume=" + rawFile.SampleInformation.InjectionVolume);
457450
}
458451

459452
if (rawFile.SampleInformation.RowNumber != 0)
460453
{
461-
output.Add("Sample row number=" + rawFile.SampleInformation.RowNumber);
454+
output.Add("Sample Row Number=" + rawFile.SampleInformation.RowNumber);
462455
}
463456

464457
if (rawFile.SampleInformation.DilutionFactor != 0)
465458
{
466-
output.Add("Sample dilution factor=" + rawFile.SampleInformation.DilutionFactor);
459+
output.Add("Dilution Factor=" + rawFile.SampleInformation.DilutionFactor);
467460
}
468461

469462
if (rawFile.SampleInformation.IstdAmount != 0)
470463
{
471-
output.Add("Istd Amount=" + rawFile.SampleInformation.IstdAmount);
464+
output.Add("Internal Standard Amount=" + rawFile.SampleInformation.IstdAmount);
472465
}
473466

474467
if (!rawFile.SampleInformation.CalibrationLevel.IsNullOrEmpty())
@@ -478,7 +471,7 @@ private void WriteTextMetadata(IRawDataPlus rawFile, int firstScanNumber, int la
478471

479472
if (!rawFile.SampleInformation.InstrumentMethodFile.IsNullOrEmpty())
480473
{
481-
output.Add("Instrument Method=" + rawFile.SampleInformation.InstrumentMethodFile);
474+
output.Add("Device Acquisition Method=" + rawFile.SampleInformation.InstrumentMethodFile);
482475
}
483476

484477
if (rawFile.SampleInformation.SampleWeight != 0)
@@ -488,12 +481,7 @@ private void WriteTextMetadata(IRawDataPlus rawFile, int firstScanNumber, int la
488481

489482
if (!rawFile.SampleInformation.ProcessingMethodFile.IsNullOrEmpty())
490483
{
491-
output.Add("Processing Method=" + rawFile.SampleInformation.ProcessingMethodFile);
492-
}
493-
494-
if (!rawFile.SampleInformation.Path.IsNullOrEmpty())
495-
{
496-
output.Add("Path=" + rawFile.SampleInformation.Path);
484+
output.Add("Data Processing Method=" + rawFile.SampleInformation.ProcessingMethodFile);
497485
}
498486

499487
string[] userLabels = rawFile.UserLabel;

0 commit comments

Comments
 (0)