3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

last save path

Browse source
This commit is contained in:
David Kocik 2019-12-05 16:22:54 +01:00
parent 5f54856be0
commit 822ffa6c86
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -270,9 +270,10 @@ bool GUI_App::on_init_inner()
this->obj_manipul()->update_if_dirty();
//RemovableDriveManager::get_instance().update(wxGetLocalTime());
std::cout << RemovableDriveManager::get_instance().is_last_drive_removed() << "\n";
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

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

@ -420,11 +420,11 @@ std::string RemovableDriveManager::get_drive_from_path(const std::string& path)
return "";
}
#endif
bool RemovableDriveManager::update(long time)
bool RemovableDriveManager::update(const long time)
{
if(m_last_update == 0)
{
//add_callback([](void) { RemovableDriveManager::get_instance().print(); });
add_callback([](void) { RemovableDriveManager::get_instance().print(); });
#if _WIN32
//register_window();
#endif
@ -510,12 +510,18 @@ bool RemovableDriveManager::is_last_drive_removed()
}
return !is_drive_mounted(m_last_save_path);
}
bool RemovableDriveManager::is_last_drive_removed_with_update(const long time)
{
update(time);
return is_last_drive_removed();
}
void RemovableDriveManager::reset_last_save_path()
{
m_last_save_path = "";
}
void RemovableDriveManager::print()
{
//std::cout << "Removed Device: "<<(int)is_last_drive_removed()<<"\n";
std::cout << "notified\n";
}
}}//namespace Slicer::Gui::

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

@ -24,7 +24,7 @@ public:
void operator=(RemovableDriveManager const&) = delete;
//update() searches for removable devices, returns false if empty.
bool update(long time = 0); //time = 0 is forced update, time expects wxGetLocalTime()
bool update(const long time = 0); //time = 0 is forced update, time expects wxGetLocalTime()
bool is_drive_mounted(const std::string &path);
void eject_drive(const std::string &path);
std::string get_last_drive_path();
@ -33,6 +33,7 @@ public:
void add_callback(std::function<void()> callback); // callback will notify every drive removal. to see if it was last used drive call is_last_drive_removed()
void set_last_save_path(const std::string &path);
bool is_last_drive_removed(); //if we dont need info about this drive, call reset_last_save_path();
bool is_last_drive_removed_with_update(const long time = 0); // param as update()
void reset_last_save_path();
void print();
private: