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

rdm update every 2 seconds

Browse Source
This commit is contained in:
David Kocik 2019-11-27 15:47:37 +01:00
parent 1cd06e3267
commit 4337b65f52
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GUI_App.cpp
View File

@ -46,6 +46,7 @@
#include "SysInfoDialog.hpp"
#include "KBShortcutsDialog.hpp"
#include "UpdateDialogs.hpp"
#include "RemovableDriveManager.hpp"
#ifdef __WXMSW__
#include <Shlobj.h>
@ -269,6 +270,7 @@ bool GUI_App::on_init_inner()
this->obj_manipul()->update_if_dirty();
RemovableDriveManager::getInstance().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

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

@ -23,6 +23,7 @@ namespace Slic3r {
namespace GUI {
std::vector<DriveData> RemovableDriveManager::m_current_drives;
long RemovableDriveManager::m_last_update = 0;
#if _WIN32
void RemovableDriveManager::search_for_drives()
@ -215,8 +216,20 @@ bool RemovableDriveManager::is_path_on_removable_drive(const std::string &path)
return false;
}
#endif
bool RemovableDriveManager::update()
bool RemovableDriveManager::update(long time)
{
if(time != 0) //time = 0 is forced update
{
long diff = m_last_update - time;
if(diff <= -2)
{
m_last_update = time;
}else
{
return false; // return value shouldnt matter if update didnt run
}
}
std::cout << "RDM update " << m_last_update <<"\n";
search_for_drives();
return !m_current_drives.empty();
}

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.
static bool update();
static bool update(long time = 0); //time = 0 is forced update
static bool is_drive_mounted(const std::string &path);
static void eject_drive(const std::string &path);
static std::string get_last_drive_path();
@ -34,6 +34,7 @@ private:
RemovableDriveManager(){}
static void search_for_drives();
static std::vector<DriveData> m_current_drives;
static long m_last_update;
#if _WIN32
#else
static void search_path(const std::string &path, const dev_t &parentDevID);