From 23a03e23d073d456cdbd87d21087222dd8420399 Mon Sep 17 00:00:00 2001 From: Atlantiscze Date: Thu, 17 Jul 2014 16:46:05 +0200 Subject: [PATCH] Fixes incorrect units in Radiocarbon Spectrometer's GUI. 1 GHz = 1 000 MHz = 1 000 000 kHz Conflicts: nano/templates/geoscanner.tmpl --- nano/templates/geoscanner.tmpl | 98 +++++++++++++++++----------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/nano/templates/geoscanner.tmpl b/nano/templates/geoscanner.tmpl index 351ddc4cf76..1f8e1e06003 100644 --- a/nano/templates/geoscanner.tmpl +++ b/nano/templates/geoscanner.tmpl @@ -6,10 +6,10 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan

Machine Status

- {{:helper.link(data.scanning ? 'Halt Scan' : 'Begin Scan', 'signal-diag', {'scanItem' : 1}, null)}} + {{:~link(scanning ? 'Halt Scan' : 'Begin Scan', 'signal-diag', {'scanItem' : 1}, null)}}
- {{:helper.link('Eject item', 'eject', {'ejectItem' : 1}, (data.scanned_item && !data.scanning) ? null : 'disabled')}} + {{:~link('Eject item', 'eject', {'ejectItem' : 1}, (scanned_item && !scanning) ? null : 'disabled')}}
@@ -17,8 +17,8 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Item:
- {{if data.scanned_item}} - {{:data.scanned_item}} + {{if scanned_item}} + {{:scanned_item}} {{else}} No item inserted {{/if}} @@ -27,8 +27,8 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Heuristic analysis:
- {{if data.scanned_item_desc}} - {{:data.scanned_item_desc}} + {{if scanned_item_desc}} + {{:scanned_item_desc}} {{/if}}
@@ -38,11 +38,11 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Scan progress:
- {{:helper.displayBar(data.scan_progress, 0, 100, 'good')}} - {{:data.scan_progress}} % + {{:~displayBar(scan_progress, 0, 100, 'good')}} + {{:scan_progress}} %
- {{if data.scan_progress >= 100}} + {{if scan_progress >= 100}} Scan completed successfully. {{/if}}
@@ -50,11 +50,11 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Vacuum seal integrity:
- {{:helper.displayBar(data.scanner_seal_integrity, 0, 100, ((data.scanner_seal_integrity < 66) ? ((data.scanner_seal_integrity < 33) ? 'bad' : 'average') : 'good'))}} - {{:data.scanner_seal_integrity}} % + {{:~displayBar(scanner_seal_integrity, 0, 100, (scanner_seal_integrity < 66 ? (scanner_seal_integrity < 33 ? 'bad' : 'average') : 'good'))}} + {{:scanner_seal_integrity}} %
- {{if data.scanner_seal_integrity < 25}} + {{if scanner_seal_integrity < 25}} Warning! Vacuum seal breach will result in scan failure! {{/if}}
@@ -64,11 +64,11 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
MASER Efficiency:
- {{:helper.displayBar(data.maser_efficiency, 1, 100, ((data.maser_efficiency < 66) ? ((data.maser_efficiency) < 33 ? 'bad' : 'average') : 'good'))}} - {{:data.maser_efficiency}} % + {{:~displayBar(maser_efficiency, 1, 100, (maser_efficiency < 66 ? (maser_efficiency < 33 ? 'bad' : 'average') : 'good'))}} + {{:maser_efficiency}} %
- {{if data.maser_efficiency < 50}} + {{if maser_efficiency < 50}} Match wavelengths to progress the scan. {{/if}}
@@ -76,25 +76,25 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Optimal Wavelength:
- {{:helper.displayBar(data.optimal_wavelength, 1, 10000, 'good')}} - {{:data.optimal_wavelength}} MHz + {{:~displayBar(optimal_wavelength, 1, 10000, 'good')}} + {{:optimal_wavelength}} MHz
Current Wavelength:
- {{:helper.displayBar(data.maser_wavelength, 1, 10000, 'good')}} - {{:data.maser_wavelength}} MHz + {{:~displayBar(maser_wavelength, 1, 10000, 'good')}} + {{:maser_wavelength}} MHz
- {{:helper.link('-2 KHz', null, {'maserWavelength' : -2}, null)}} - {{:helper.link('-1 KHz', null, {'maserWavelength' : -1}, null)}} - {{:helper.link('-0.5 KHz', null, {'maserWavelength' : -0.5}, null)}} + {{:~link('-2 GHz', null, {'maserWavelength' : -2}, null)}} + {{:~link('-1 GHz', null, {'maserWavelength' : -1}, null)}} + {{:~link('-0.5 GHz', null, {'maserWavelength' : -0.5}, null)}}
- {{:helper.link('+0.5 KHz', null, {'maserWavelength' : 0.5}, null)}} - {{:helper.link('+1 KHz', null, {'maserWavelength' : 1}, null)}} - {{:helper.link('+2 KHz', null, {'maserWavelength' : 2}, null)}} + {{:~link('+0.5 GHz', null, {'maserWavelength' : 0.5}, null)}} + {{:~link('+1 GHz', null, {'maserWavelength' : 1}, null)}} + {{:~link('+2 GHz', null, {'maserWavelength' : 2}, null)}}
@@ -102,18 +102,18 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Centrifuge speed:
- {{:helper.displayBar(data.scanner_rpm, 0, 1000, 'good')}} - {{:data.scanner_rpm}} RPM + {{:~displayBar(scanner_rpm, 0, 1000, 'good')}} + {{:scanner_rpm}} RPM
Internal temperature:
- {{:helper.displayBar(data.scanner_temperature, 0, 1273, (data.scanner_temperature > 250 ? (data.scanner_temperature > 1000 ? 'bad' : 'average') : 'good')))}} - {{:data.scanner_temperature}} K + {{:~displayBar(scanner_temperature, 0, 1273, (scanner_temperature > 250 ? (scanner_temperature > 1000 ? 'bad' : 'average') : 'good')))}} + {{:scanner_temperature}} K
- {{if data.scanner_temperature > 1000}} + {{if scanner_temperature > 1000}} Warning! Exceeding 1200K will result in scan failure! {{/if}}
@@ -123,12 +123,12 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Ambient radiation:
- {{:helper.displayBar(data.radiation, 0, 100, ((data.radiation > 15) ? ((data.radiation > 65) ? 'bad' : 'average') : 'good'))}} - {{:data.radiation}} mSv + {{:~displayBar(radiation, 0, 100, (radiation > 15 ? (radiation > 65 ? 'bad' : 'average') : 'good'))}} + {{:radiation}} mSv
- {{:helper.link(data.rad_shield_on ? 'Disable Radiation Shielding' : 'Enable Radiation Shielding', 'radiation', {'toggle_rad_shield' : 1}, null)}} - {{if data.rad_shield_on}} + {{:~link(rad_shield_on ? 'Disable Radiation Shielding' : 'Enable Radiation Shielding', 'radiation', {'toggle_rad_shield' : 1}, null)}} + {{if rad_shield_on}} Shield blocking scanner. {{/if}}
@@ -138,11 +138,11 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Coolant remaining:
- {{:helper.displayBar(data.unused_coolant_per, 0, 100, ((data.unused_coolant_per < 66) ? ((data.unused_coolant_per < 33) ? 'bad' : 'average') : 'good'))}} - {{:data.unused_coolant_abs}} u + {{:~displayBar(unused_coolant_per, 0, 100, (unused_coolant_per < 66 ? (unused_coolant_per < 33 ? 'bad' : 'average') : 'good'))}} + {{:unused_coolant_abs}} u
- {{if data.unused_coolant_per < 20}} + {{if unused_coolant_per < 20}} Warning! Coolant stocks low! {{/if}}
@@ -150,28 +150,28 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
Coolant flow rate:
- {{:helper.displayBar(data.coolant_usage_rate, 0, 10, 'good')}} - {{:data.coolant_usage_rate}} u/s + {{:~displayBar(coolant_usage_rate, 0, 10, 'good')}} + {{:coolant_usage_rate}} u/s
- {{:helper.link('Min u/s', null, {'coolantRate' : -10}, null)}} - {{:helper.link('-3 u/s', null, {'coolantRate' : -3}, null)}} - {{:helper.link('-1 u/s', null, {'coolantRate' : -1}, null)}} + {{:~link('Min u/s', null, {'coolantRate' : -10}, null)}} + {{:~link('-3 u/s', null, {'coolantRate' : -3}, null)}} + {{:~link('-1 u/s', null, {'coolantRate' : -1}, null)}}
- {{:helper.link('+1 u/s', null, {'coolantRate' : 1}, null)}} - {{:helper.link('+3 u/s', null, {'coolantRate' : 3}, null)}} - {{:helper.link('Max u/s', null, {'coolantRate' : 10}, null)}} + {{:~link('+1 u/s', null, {'coolantRate' : 1}, null)}} + {{:~link('+3 u/s', null, {'coolantRate' : 3}, null)}} + {{:~link('Max u/s', null, {'coolantRate' : 10}, null)}}
Coolant purity:
- {{:helper.displayBar(data.coolant_purity, 0, 100, ((data.coolant_purity < 66) ? ((data.coolant_purity < 33) ? 'bad' : 'average') : 'good'))}} - {{:data.coolant_purity}} % + {{:~displayBar(coolant_purity, 0, 100, (coolant_purity < 66 ? (coolant_purity < 33 ? 'bad' : 'average') : 'good'))}} + {{:coolant_purity}} %
- {{if data.coolant_purity < 0.5}} + {{if coolant_purity < 0.5}} Warning! Check coolant for contaminants! {{/if}}
@@ -180,6 +180,6 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan

Latest Results

- {{:data.last_scan_data}} + {{:last_scan_data}}