less saving, better Windows file handling

This commit is contained in:
Benoît Sierro
2023-03-21 09:38:20 +01:00
parent 6bc3e9510b
commit 20b86801c6
3 changed files with 8 additions and 7 deletions

View File

@@ -1,3 +1,3 @@
import importlib
import importlib.metadata
__version__ = importlib.metadata.version("dispersionapp")

View File

@@ -10,7 +10,7 @@ import tomli
import tomli_w
from pydantic import BaseModel, PrivateAttr, ValidationError, confloat
DEFAULT_CONFIG_FILE = "config.toml"
DEFAULT_CONFIG_FILE = "dispersion_config.toml"
class CurrentState(BaseModel):
@@ -61,7 +61,7 @@ class Config(BaseModel):
tmp = self._file_name.parent / f"{self._file_name.name}.tmp"
with open(tmp, "wb") as file:
tomli_w.dump(self.dict(), file)
tmp.rename(self._file_name)
tmp.replace(self._file_name)
def update_current(
self, core_diameter_um, pressure_mbar, wall_thickness_um, n_tubes, gap_um, t_fwhm_fs
@@ -74,7 +74,6 @@ class Config(BaseModel):
gap_um=gap_um,
t_fwhm_fs=t_fwhm_fs,
)
self.save()
class LimitValues(NamedTuple):

View File

@@ -1,13 +1,13 @@
from __future__ import annotations
import os
import warnings
from functools import cache
import numpy as np
import scgenerator as sc
from functools import cache
import warnings
from dispersionapp.core import Config, LimitValues, N_ion_max, N_sf_max, energy, b2
from dispersionapp.core import Config, LimitValues, N_ion_max, N_sf_max, b2, energy
from dispersionapp.plotapp import PlotApp
@@ -144,3 +144,5 @@ def app(config_file: os.PathLike | None = None):
zdw = lim.wl_zero_disp * 1e9
app[0].set_line_data("zdw", [zdw, zdw], [-3, 3])
app[0].set_line_name("zdw", f"ZDW = {zdw:.0f}nm")
config.save()