diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2019-10-07 18:23:37 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2019-10-07 18:23:37 +0300 |
| commit | fd6d32135bd4673d8f5b27d9f56c066701239d12 (patch) | |
| tree | 9984ae2b69fed346f661f1e7db01f54e9263811e /src/slic3r/Config | |
| parent | 570c038eb78698aeb199aac0d5d85d9508039ff5 (diff) | |
| parent | 555fcc151d50a8ff9539e96c9f5c18afeae7e0ab (diff) | |
Merge branch 'master' into materials
Diffstat (limited to 'src/slic3r/Config')
| -rw-r--r-- | src/slic3r/Config/Snapshot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/slic3r/Config/Snapshot.cpp b/src/slic3r/Config/Snapshot.cpp index 7e17542b9..fa756f49d 100644 --- a/src/slic3r/Config/Snapshot.cpp +++ b/src/slic3r/Config/Snapshot.cpp @@ -66,7 +66,7 @@ void Snapshot::load_ini(const std::string &path) if (kvp.first == "id") this->id = kvp.second.data(); else if (kvp.first == "time_captured") { - this->time_captured = Slic3r::Utils::parse_time_ISO8601Z(kvp.second.data()); + this->time_captured = Slic3r::Utils::parse_iso_utc_timestamp(kvp.second.data()); if (this->time_captured == (time_t)-1) throw_on_parse_error("invalid timestamp"); } else if (kvp.first == "slic3r_version_captured") { @@ -165,7 +165,7 @@ void Snapshot::save_ini(const std::string &path) // Export the common "snapshot". c << std::endl << "[snapshot]" << std::endl; c << "id = " << this->id << std::endl; - c << "time_captured = " << Slic3r::Utils::format_time_ISO8601Z(this->time_captured) << std::endl; + c << "time_captured = " << Slic3r::Utils::iso_utc_timestamp(this->time_captured) << std::endl; c << "slic3r_version_captured = " << this->slic3r_version_captured.to_string() << std::endl; c << "comment = " << this->comment << std::endl; c << "reason = " << reason_string(this->reason) << std::endl; @@ -365,7 +365,7 @@ const Snapshot& SnapshotDB::take_snapshot(const AppConfig &app_config, Snapshot: Snapshot snapshot; // Snapshot header. snapshot.time_captured = Slic3r::Utils::get_current_time_utc(); - snapshot.id = Slic3r::Utils::format_time_ISO8601Z(snapshot.time_captured); + snapshot.id = Slic3r::Utils::iso_utc_timestamp(snapshot.time_captured); snapshot.slic3r_version_captured = Slic3r::SEMVER; snapshot.comment = comment; snapshot.reason = reason; |