mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 16:57:53 -06:00
NEW:popup warning message when has filament in the extrusion
Change-Id: Ice9a3b5e6ae6ef8514213e61d9034ceb4c585093
This commit is contained in:
parent
9f749b304c
commit
33a38393cf
2 changed files with 29 additions and 15 deletions
|
@ -124,21 +124,21 @@ public:
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
// Generic static line, used intead of wxStaticLine
|
// Generic static line, used intead of wxStaticLine
|
||||||
class StaticLine: public wxTextCtrl
|
//class StaticLine: public wxTextCtrl
|
||||||
{
|
//{
|
||||||
public:
|
//public:
|
||||||
StaticLine( wxWindow* parent,
|
// StaticLine( wxWindow* parent,
|
||||||
wxWindowID id = wxID_ANY,
|
// wxWindowID id = wxID_ANY,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
// const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
// const wxSize& size = wxDefaultSize,
|
||||||
long style = wxLI_HORIZONTAL,
|
// long style = wxLI_HORIZONTAL,
|
||||||
const wxString& name = wxString::FromAscii(wxTextCtrlNameStr))
|
// const wxString& name = wxString::FromAscii(wxTextCtrlNameStr))
|
||||||
: wxTextCtrl(parent, id, wxEmptyString, pos, size!=wxDefaultSize ? size : (style == wxLI_HORIZONTAL ? wxSize(10, 1) : wxSize(1, 10)), wxSIMPLE_BORDER, wxDefaultValidator, name)
|
// : wxTextCtrl(parent, id, wxEmptyString, pos, size!=wxDefaultSize ? size : (style == wxLI_HORIZONTAL ? wxSize(10, 1) : wxSize(1, 10)), wxSIMPLE_BORDER, wxDefaultValidator, name)
|
||||||
{
|
// {
|
||||||
this->Enable(false);
|
// this->Enable(false);
|
||||||
}
|
// }
|
||||||
~StaticLine() {}
|
// ~StaticLine() {}
|
||||||
};
|
//};
|
||||||
|
|
||||||
// Generic message dialog, used intead of wxMessageDialog
|
// Generic message dialog, used intead of wxMessageDialog
|
||||||
class MessageDialog : public MsgDialog
|
class MessageDialog : public MsgDialog
|
||||||
|
|
|
@ -7,11 +7,14 @@
|
||||||
#include "BitmapCache.hpp"
|
#include "BitmapCache.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
|
||||||
|
#include "MsgDialog.hpp"
|
||||||
#include "slic3r/Utils/Http.hpp"
|
#include "slic3r/Utils/Http.hpp"
|
||||||
#include "libslic3r/Thread.hpp"
|
#include "libslic3r/Thread.hpp"
|
||||||
|
|
||||||
#include "RecenterDialog.hpp"
|
#include "RecenterDialog.hpp"
|
||||||
#include "ReleaseNote.hpp"
|
#include "ReleaseNote.hpp"
|
||||||
|
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
|
||||||
#define TEMP_THRESHOLD_VAL 2
|
#define TEMP_THRESHOLD_VAL 2
|
||||||
|
@ -2227,6 +2230,17 @@ void StatusPanel::on_filament_edit(wxCommandEvent &event)
|
||||||
void StatusPanel::on_ams_refresh_rfid(wxCommandEvent &event)
|
void StatusPanel::on_ams_refresh_rfid(wxCommandEvent &event)
|
||||||
{
|
{
|
||||||
if (obj) {
|
if (obj) {
|
||||||
|
|
||||||
|
if (obj->is_filament_at_extruder()) {
|
||||||
|
MessageDialog msg_dlg(
|
||||||
|
nullptr,
|
||||||
|
_L("Cannot read filament info: the filament is loaded to the tool head,please unload the filament and try again."),
|
||||||
|
wxEmptyString,
|
||||||
|
wxICON_WARNING | wxYES);
|
||||||
|
msg_dlg.ShowModal();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
std::string curr_ams_id = m_ams_control->GetCurentAms();
|
std::string curr_ams_id = m_ams_control->GetCurentAms();
|
||||||
std::string curr_can_id = event.GetString().ToStdString();
|
std::string curr_can_id = event.GetString().ToStdString();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue