Updated to 1.9.5, and optimize calibration and device

This commit is contained in:
QIDI TECH
2024-09-16 16:07:29 +08:00
parent fa251e0a9a
commit d842832b25
90 changed files with 2753 additions and 998 deletions

View File

@@ -21,6 +21,9 @@
#include <sys/ipc.h>
#include <sys/shm.h>
#endif
#ifdef __APPLE__
#include <ApplicationServices/ApplicationServices.h>
#endif
#include <wx/clipbrd.h>
#include "wx/evtloop.h"
@@ -36,7 +39,8 @@ static std::map<int, std::string> error_messages = {
namespace Slic3r {
namespace GUI {
//1.9.5
static int SecondsSinceLastInput();
MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl2 *media_ctrl, const wxPoint &pos, const wxSize &size)
: wxPanel(parent, wxID_ANY, pos, size)
, m_media_ctrl(media_ctrl)
@@ -178,6 +182,11 @@ void MediaPlayCtrl::SetMachineObject(MachineObject* obj)
agent->get_camera_url(machine, [](auto) {});
m_last_user_play = wxDateTime::Now();
}
//1.9.5
if (m_last_state == wxMediaState::wxMEDIASTATE_PLAYING && SecondsSinceLastInput() > 900) { // 15 minutes
m_next_retry = wxDateTime();
Stop(_L("Temporarily closed because there is no operating for a long time."));
}
return;
}
m_machine = machine;
@@ -303,6 +312,8 @@ void MediaPlayCtrl::Play()
m_disable_lan = false;
m_failed_code = 0;
m_last_state = MEDIASTATE_IDLE;
//1.9.5
m_button_play->SetIcon("media_stop");
if (!m_remote_support) { // not support tutk
m_failed_code = -1;
@@ -849,6 +860,21 @@ bool MediaPlayCtrl::get_stream_url(std::string *url)
return url == nullptr;
}
//1.9.5
static int SecondsSinceLastInput()
{
#ifdef _WIN32
LASTINPUTINFO lii;
lii.cbSize = sizeof(lii);
::GetLastInputInfo(&lii);
return (::GetTickCount() - lii.dwTime) / 1000;
#elif defined(__APPLE__)
return (int)CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateHIDSystemState, kCGAnyInputEventType);
#else
return 0;
#endif
}
}}
void wxMediaCtrl2::DoSetSize(int x, int y, int width, int height, int sizeFlags)