3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

linux eject

Browse source
This commit is contained in:
David Kocik 2019-12-03 10:09:53 +01:00
parent 82baaf291e
commit 0eb8cb3fa1
3 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/GUI_App.cpp
View file

@ -271,6 +271,7 @@ bool GUI_App::on_init_inner()
this->obj_manipul()->update_if_dirty();
RemovableDriveManager::get_instance().update(wxGetLocalTime());
// Preset updating & Configwizard are done after the above initializations,
// and after MainFrame is created & shown.
// The extra CallAfter() is needed because of Mac, where this is the only way

29
src/slic3r/GUI/RemovableDriveManager.cpp
View file

@ -20,8 +20,7 @@ DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE,
#endif
namespace Slic3r {
namespace GUI {
namespace GUI {
//std::vector<DriveData> RemovableDriveManager::m_current_drives;
//std::vector<std::function<void()>> RemovableDriveManager::m_callbacks;
@ -95,7 +94,10 @@ void RemovableDriveManager::eject_drive(const std::string &path)
if (error == 0)
{
std::cerr << "Ejecting " << mpath << " failed " << deviceControlRetVal << " " << GetLastError() << " \n";
return;
}
m_current_drives.erase(it);
break;
}
@ -179,7 +181,7 @@ void RemovableDriveManager::search_for_drives()
}
std::cout << "found drives:" <<m_current_drives.size() << "\n";
//std::cout << "found drives:" <<m_current_drives.size() << "\n";
}
void RemovableDriveManager::search_path(const std::string &path,const std::string &parent_path)
{
@ -225,13 +227,16 @@ void RemovableDriveManager::eject_drive(const std::string &path)
if((*it).path == path)
{
std::cout<<"Ejecting "<<(*it).name<<" from "<< (*it).path<<"\n";
int error = umount2(path.c_str(),MNT_DETACH);
if(error)
std::string command = "umount ";
command += (*it).path;
int err = system(command.c_str());
if(err)
{
int errsv = errno;
std::cerr<<"Ejecting failed Error "<< errsv<<"\n";
std::cerr<<"Ejecting failed\n";
return;
}
m_current_drives.erase(it);
break;
}
@ -272,10 +277,8 @@ bool RemovableDriveManager::update(long time)
return false; // return value shouldnt matter if update didnt run
}
}
//std::cout << "RDM update " << last_update <<"\n";
search_for_drives();
check_and_notify();
eject_drive(m_current_drives.back().path);
return !m_current_drives.empty();
}
@ -310,15 +313,17 @@ std::vector<DriveData> RemovableDriveManager::get_all_drives()
}
void RemovableDriveManager::check_and_notify()
{
static size_t number_of_drives = 0;
if(number_of_drives != m_current_drives.size())
//std::cout<<"drives count: "<<m_drives_count;
if(m_drives_count != m_current_drives.size())
{
//std::cout<<" vs "<< m_current_drives.size();
for (auto it = m_callbacks.begin(); it != m_callbacks.end(); ++it)
{
(*it)();
}
number_of_drives = m_current_drives.size();
m_drives_count = m_current_drives.size();
}
//std::cout<<"\n";
}
void RemovableDriveManager::add_callback(std::function<void()> callback)
{

3
src/slic3r/GUI/RemovableDriveManager.hpp
View file

@ -33,11 +33,12 @@ public:
void add_callback(std::function<void()> callback);
void print();
private:
RemovableDriveManager(){}
RemovableDriveManager():m_drives_count(0){}
void search_for_drives();
void check_and_notify();
std::vector<DriveData> m_current_drives;
std::vector<std::function<void()>> m_callbacks;
size_t m_drives_count;
#if _WIN32
void register_window();
#else