mirror of
https://github.com/QIDITECH/QIDIStudio.git
synced 2026-02-07 04:11:50 +03:00
update src\libslic3r
This commit is contained in:
@@ -100,6 +100,8 @@ const std::string& var_dir();
|
||||
// Return a full resource path for a file_name.
|
||||
std::string var(const std::string &file_name);
|
||||
|
||||
std::string format_diameter_to_str(double diameter, int precision = 1);
|
||||
|
||||
// Set a path with various static definition data (for example the initial config bundles).
|
||||
void set_resources_dir(const std::string &path);
|
||||
// Return a full path to the resources directory.
|
||||
@@ -766,15 +768,15 @@ inline std::string get_qdt_monitor_time_dhm(float time_in_secs)
|
||||
time_in_secs -= (float)days * 86400.0f;
|
||||
int hours = (int)(time_in_secs / 3600.0f);
|
||||
time_in_secs -= (float)hours * 3600.0f;
|
||||
int minutes = (int)(time_in_secs / 60.0f);
|
||||
int minutes = (int) std::ceil(time_in_secs / 60.0f);
|
||||
|
||||
char buffer[64];
|
||||
if (days > 0)
|
||||
::sprintf(buffer, "%dd%dh%dm", days, hours, minutes);
|
||||
::sprintf(buffer, "%dd%dh%dmin", days, hours, minutes);
|
||||
else if (hours > 0)
|
||||
::sprintf(buffer, "%dh%dm", hours, minutes);
|
||||
::sprintf(buffer, "%dh%dmin", hours, minutes);
|
||||
else if (minutes >= 0)
|
||||
::sprintf(buffer, "%dm", minutes);
|
||||
::sprintf(buffer, "%dmin", minutes);
|
||||
else {
|
||||
return "";
|
||||
}
|
||||
@@ -827,7 +829,7 @@ inline std::string get_qdt_remain_time_dhms(float time_in_secs)
|
||||
time_in_secs -= (float) days * 86400.0f;
|
||||
int hours = (int) (time_in_secs / 3600.0f);
|
||||
time_in_secs -= (float) hours * 3600.0f;
|
||||
int minutes = (int) (time_in_secs / 60.0f);
|
||||
int minutes = (int) std::ceil(time_in_secs / 60.0f);
|
||||
time_in_secs -= (float) minutes * 60.0f;
|
||||
|
||||
char buffer[64];
|
||||
|
||||
Reference in New Issue
Block a user