GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-08 02:29:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices

Browse Source
This commit is contained in:
David Kocik 2019-12-19 16:28:28 +01:00
commit 58a8e9e7e0
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/slic3r/GUI/Plater.cpp
View File

@ -3611,17 +3611,14 @@ void Plater::priv::on_process_completed(wxCommandEvent &evt)
} }
else if (wxGetApp().get_mode() == comSimple) else if (wxGetApp().get_mode() == comSimple)
show_action_buttons(false); show_action_buttons(false);
if(RemovableDriveManager::get_instance().get_is_writing())
{
RemovableDriveManager::get_instance().set_is_writing(false);
RemovableDriveManager::get_instance().verify_last_save_path();
if (!RemovableDriveManager::get_instance().is_last_drive_removed())
{
RemovableDriveManager::get_instance().erase_callbacks(); if(!canceled && RemovableDriveManager::get_instance().get_is_writing())
RemovableDriveManager::get_instance().add_callback(std::bind(&Plater::drive_ejected_callback, q)); {
//if (!RemovableDriveManager::get_instance().is_last_drive_removed())
//{
RemovableDriveManager::get_instance().set_is_writing(false);
show_action_buttons(false); show_action_buttons(false);
} //}
} }
} }
@ -4755,20 +4752,21 @@ void Plater::export_gcode()
if (! output_path.empty()) if (! output_path.empty())
{ {
std::string path = output_path.string(); std::string path = output_path.string();
RemovableDriveManager::get_instance().set_is_writing(true);
RemovableDriveManager::get_instance().update(0, true);
p->export_gcode(std::move(output_path), PrintHostJob()); p->export_gcode(std::move(output_path), PrintHostJob());
RemovableDriveManager::get_instance().update(0, false);
RemovableDriveManager::get_instance().set_last_save_path(path); RemovableDriveManager::get_instance().set_last_save_path(path);
/* RemovableDriveManager::get_instance().verify_last_save_path();
if(!RemovableDriveManager::get_instance().is_last_drive_removed()) if(!RemovableDriveManager::get_instance().is_last_drive_removed())
{ {
RemovableDriveManager::get_instance().set_is_writing(true);
RemovableDriveManager::get_instance().erase_callbacks(); RemovableDriveManager::get_instance().erase_callbacks();
RemovableDriveManager::get_instance().add_callback(std::bind(&Plater::drive_ejected_callback, this)); RemovableDriveManager::get_instance().add_callback(std::bind(&Plater::drive_ejected_callback, this));
} }
*/
}
} }
}
void Plater::export_stl(bool extended, bool selection_only) void Plater::export_stl(bool extended, bool selection_only)
{ {

11
src/slic3r/GUI/RemovableDriveManager.cpp
View File

@ -457,7 +457,11 @@ bool RemovableDriveManager::update(const long time,const bool check)
} }
} }
search_for_drives(); search_for_drives();
if (m_drives_count != m_current_drives.size())
{
if (check)check_and_notify(); if (check)check_and_notify();
m_drives_count = m_current_drives.size();
}
return !m_current_drives.empty(); return !m_current_drives.empty();
} }
@ -498,8 +502,6 @@ std::vector<DriveData> RemovableDriveManager::get_all_drives()
return m_current_drives; return m_current_drives;
} }
void RemovableDriveManager::check_and_notify() void RemovableDriveManager::check_and_notify()
{
if(m_drives_count != m_current_drives.size())
{ {
if(m_callbacks.size() != 0 && m_drives_count > m_current_drives.size() && m_last_save_path_verified && !is_drive_mounted(m_last_save_path)) if(m_callbacks.size() != 0 && m_drives_count > m_current_drives.size() && m_last_save_path_verified && !is_drive_mounted(m_last_save_path))
{ {
@ -508,8 +510,6 @@ void RemovableDriveManager::check_and_notify()
(*it)(); (*it)();
} }
} }
m_drives_count = m_current_drives.size();
}
} }
void RemovableDriveManager::add_callback(std::function<void()> callback) void RemovableDriveManager::add_callback(std::function<void()> callback)
{ {
@ -532,6 +532,9 @@ void RemovableDriveManager::verify_last_save_path()
m_last_save_path_verified = true; m_last_save_path_verified = true;
m_last_save_path = last_drive; m_last_save_path = last_drive;
m_last_save_name = get_drive_name(last_drive); m_last_save_name = get_drive_name(last_drive);
}else
{
reset_last_save_path();
} }
} }
std::string RemovableDriveManager::get_drive_name(const std::string& path) std::string RemovableDriveManager::get_drive_name(const std::string& path)