Skip to content

Commit 9627fc3

Browse files
rozyczkorozyczko
committed
moved to toStdDevSmallestPrecision
fixed a typo added missing tests to the resources
1 parent f6c1791 commit 9627fc3

File tree

3 files changed

+26
-39
lines changed

3 files changed

+26
-39
lines changed

‎easyDiffractionApp/Gui/Components/Pages/Analysis/SideBarBasic/Fittables.qml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ Column {
228228
fit: item.fit
229229
text: item.error === 0 ?
230230
EaLogic.Utils.toDefaultPrecision(item.value) :
231-
Globals.Proxies.main.backendHelpers.toStdDevSmalestPrecision(item.value, item.error).value
231+
Globals.Proxies.main.backendHelpers.toStdDevSmallestPrecision(item.value, item.error).value
232232
onEditingFinished: {
233233
focus = false
234234
console.debug('')
@@ -255,7 +255,7 @@ Column {
255255
elide: Text.ElideNone
256256
text: item.error === 0 ?
257257
'' :
258-
Globals.Proxies.main.backendHelpers.toStdDevSmalestPrecision(item.value, item.error).std_dev
258+
Globals.Proxies.main.backendHelpers.toStdDevSmallestPrecision(item.value, item.error).std_dev
259259
}
260260

261261
EaComponents.TableViewParameter {
@@ -334,7 +334,7 @@ Column {
334334
// EaLogic.Utils.toDefaultPrecision(slider.from)
335335
return error === 0 ?
336336
EaLogic.Utils.toDefaultPrecision(slider.from) :
337-
Globals.Proxies.main.backendHelpers.toStdDevSmalestPrecision(slider.from, error).value
337+
Globals.Proxies.main.backendHelpers.toStdDevSmallestPrecision(slider.from, error).value
338338
}
339339
}
340340

@@ -355,7 +355,7 @@ Column {
355355
// EaLogic.Utils.toDefaultPrecision(value)
356356
return error === 0 ?
357357
EaLogic.Utils.toDefaultPrecision(value) :
358-
Globals.Proxies.main.backendHelpers.toStdDevSmalestPrecision(value, error).value
358+
Globals.Proxies.main.backendHelpers.toStdDevSmallestPrecision(value, error).value
359359
}
360360

361361
onMoved: {
@@ -391,7 +391,7 @@ Column {
391391
// EaLogic.Utils.toDefaultPrecision(slider.to)
392392
return error === 0 ?
393393
EaLogic.Utils.toDefaultPrecision(slider.to) :
394-
Globals.Proxies.main.backendHelpers.toStdDevSmalestPrecision(slider.to, error).value
394+
Globals.Proxies.main.backendHelpers.toStdDevSmallestPrecision(slider.to, error).value
395395
}
396396
}
397397

‎easyDiffractionApp/Logic/Helpers.py

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@
77
import os
88
import pathlib
99
import sys
10-
import decimal
11-
import importlib.util
1210
import numpy as np
1311
from uncertainties import ufloat
1412

1513
from PySide6.QtCore import Qt, QObject, QCoreApplication, QUrl, Signal, Slot, Property
16-
#from PySide6.QtGui import QStyleHints
1714
from PySide6.QtWidgets import QApplication
1815

1916
from EasyApp.Logic.Logging import console
17+
from easydiffraction.io.cif import toStdDevSmallestPrecision as toStdDevSmallestPrecisionLib
2018

2119

2220
class PersistentSettingsHandler:
@@ -234,20 +232,10 @@ def listToUri(self, fpathParts):
234232
# return str(decimal.Decimal(xStr).quantize(decimal.Decimal(sStr)))
235233

236234
@Slot(float, float, result='QVariant')
237-
def toStdDevSmalestPrecision(self, value, std_dev):
238-
if std_dev > 1:
239-
value_str = f'{round(value)}'
240-
std_dev_str = f'{round(std_dev)}'
241-
value_with_std_dev_str = f'{value_str}({std_dev_str})'
242-
else:
243-
precision = 1
244-
std_dev_decimals = precision - int(np.floor(np.log10(std_dev) + 1))
245-
std_dev = round(std_dev, std_dev_decimals)
246-
std_dev_str = f'{std_dev:.{std_dev_decimals}f}'
247-
value = round(value, std_dev_decimals)
248-
value_str = f'{value:.{std_dev_decimals}f}'
249-
clipped_std_dev = int(round(std_dev * 10**std_dev_decimals))
250-
value_with_std_dev_str = f'{value_str}({clipped_std_dev})'
235+
def toStdDevSmallestPrecision(self, value, std_dev):
236+
value, std_dev, _ = toStdDevSmallestPrecisionLib(value, std_dev)
237+
value_str = f'{value}'
238+
std_dev_str = f'{std_dev}'
251239
return {'value': value_str, 'std_dev': std_dev_str}
252240

253241

@@ -313,20 +301,3 @@ def formatMsg(type, *args):
313301
msg = ' ▌ '.join(msgs)
314302
msg = f'{mark} {msg}'
315303
return msg
316-
317-
@staticmethod
318-
def toStdDevSmalestPrecision(value, std_dev):
319-
if std_dev > 1:
320-
value_str = f'{round(value)}'
321-
std_dev_str = f'{round(std_dev)}'
322-
value_with_std_dev_str = f'{value_str}({std_dev_str})'
323-
else:
324-
precision = 1
325-
std_dev_decimals = precision - int(np.floor(np.log10(std_dev) + 1))
326-
std_dev = round(std_dev, std_dev_decimals)
327-
std_dev_str = f'{std_dev:.{std_dev_decimals}f}'
328-
value = round(value, std_dev_decimals)
329-
value_str = f'{value:.{std_dev_decimals}f}'
330-
clipped_std_dev = int(round(std_dev * 10**std_dev_decimals))
331-
value_with_std_dev_str = f'{value_str}({clipped_std_dev})'
332-
return value_str, std_dev_str, value_with_std_dev_str

‎easyDiffractionApp/resources.qrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,5 +228,21 @@
228228
<file>Examples/Na2Ca3Al2F14_WISH@ISIS/models/ncaf_light.png</file>
229229
<file>Examples/Na2Ca3Al2F14_WISH@ISIS/summary/report.cif</file>
230230
<file>Examples/Na2Ca3Al2F14_WISH@ISIS/project.cif</file>
231+
<file>Examples/CeO2_iMATERIA@J-PARC/experiments/imateria.cif</file>
232+
<file>Examples/CeO2_iMATERIA@J-PARC/experiments/imateria_dark.png</file>
233+
<file>Examples/CeO2_iMATERIA@J-PARC/experiments/imateria_light.png</file>
234+
<file>Examples/CeO2_iMATERIA@J-PARC/models/ceo.cif</file>
235+
<file>Examples/CeO2_iMATERIA@J-PARC/models/ceo_dark.png</file>
236+
<file>Examples/CeO2_iMATERIA@J-PARC/models/ceo_light.png</file>
237+
<file>Examples/CeO2_iMATERIA@J-PARC/summary/report.cif</file>
238+
<file>Examples/CeO2_iMATERIA@J-PARC/project.cif</file>
239+
<file>Examples/Tb2Ti2O7_HEiDi@MLZ/experiments/heidi.cif</file>
240+
<file>Examples/Tb2Ti2O7_HEiDi@MLZ/experiments/heidi_dark.png</file>
241+
<file>Examples/Tb2Ti2O7_HEiDi@MLZ/experiments/heidi_light.png</file>
242+
<file>Examples/Tb2Ti2O7_HEiDi@MLZ/models/tbti.cif</file>
243+
<file>Examples/Tb2Ti2O7_HEiDi@MLZ/models/tbti_dark.png</file>
244+
<file>Examples/Tb2Ti2O7_HEiDi@MLZ/models/tbti_light.png</file>
245+
<file>Examples/Tb2Ti2O7_HEiDi@MLZ/summary/report.cif</file>
246+
<file>Examples/Tb2Ti2O7_HEiDi@MLZ/project.cif</file>
231247
</qresource>
232248
</RCC>

0 commit comments

Comments
 (0)