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

Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk

Browse source
This commit is contained in:
Enrico Turri 2019-09-09 12:15:24 +02:00
commit e7aaa0037d
5 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -3906,7 +3906,7 @@ void GLCanvas3D::_picking_pass() const
m_gizmos.set_hover_id(-1); m_gizmos.set_hover_id(-1);
} }
else else
m_gizmos.set_hover_id(inside && volume_id <= (int)GLGizmoBase::BASE_ID ? ((int)GLGizmoBase::BASE_ID - volume_id) : -1); m_gizmos.set_hover_id(inside && (unsigned int)volume_id <= GLGizmoBase::BASE_ID ? ((int)GLGizmoBase::BASE_ID - volume_id) : -1);
_update_volumes_hover_state(); _update_volumes_hover_state();
} }

6
src/slic3r/GUI/PrintHostDialogs.cpp
View file

@ -250,7 +250,7 @@ void PrintHostQueueDialog::on_list_select()
void PrintHostQueueDialog::on_progress(Event &evt) void PrintHostQueueDialog::on_progress(Event &evt)
{ {
wxCHECK_RET(evt.job_id < job_list->GetItemCount(), "Out of bounds access to job list"); wxCHECK_RET(evt.job_id < (size_t)job_list->GetItemCount(), "Out of bounds access to job list");
if (evt.progress < 100) { if (evt.progress < 100) {
set_state(evt.job_id, ST_PROGRESS); set_state(evt.job_id, ST_PROGRESS);
@ -265,7 +265,7 @@ void PrintHostQueueDialog::on_progress(Event &evt)
void PrintHostQueueDialog::on_error(Event &evt) void PrintHostQueueDialog::on_error(Event &evt)
{ {
wxCHECK_RET(evt.job_id < job_list->GetItemCount(), "Out of bounds access to job list"); wxCHECK_RET(evt.job_id < (size_t)job_list->GetItemCount(), "Out of bounds access to job list");
set_state(evt.job_id, ST_ERROR); set_state(evt.job_id, ST_ERROR);
@ -280,7 +280,7 @@ void PrintHostQueueDialog::on_error(Event &evt)
void PrintHostQueueDialog::on_cancel(Event &evt) void PrintHostQueueDialog::on_cancel(Event &evt)
{ {
wxCHECK_RET(evt.job_id < job_list->GetItemCount(), "Out of bounds access to job list"); wxCHECK_RET(evt.job_id < (size_t)job_list->GetItemCount(), "Out of bounds access to job list");
set_state(evt.job_id, ST_CANCELLED); set_state(evt.job_id, ST_CANCELLED);
job_list->SetValue(wxVariant(0), evt.job_id, COL_PROGRESS); job_list->SetValue(wxVariant(0), evt.job_id, COL_PROGRESS);

1
src/slic3r/GUI/PrintHostDialogs.hpp
View file

@ -37,7 +37,6 @@ public:
private: private:
wxTextCtrl *txt_filename; wxTextCtrl *txt_filename;
wxCheckBox *box_print; wxCheckBox *box_print;
bool can_start_print;
}; };

6
src/slic3r/GUI/UpdateDialogs.cpp
View file

@ -34,10 +34,8 @@ static const std::string CONFIG_UPDATE_WIKI_URL("https://github.com/prusa3d/Prus
// MsgUpdateSlic3r // MsgUpdateSlic3r
MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_online) : MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_online)
MsgDialog(nullptr, _(L("Update available")), wxString::Format(_(L("New version of %s is available")), SLIC3R_APP_NAME)), : MsgDialog(nullptr, _(L("Update available")), wxString::Format(_(L("New version of %s is available")), SLIC3R_APP_NAME))
ver_current(ver_current),
ver_online(ver_online)
{ {
const bool dev_version = ver_online.prerelease() != nullptr; const bool dev_version = ver_online.prerelease() != nullptr;

2
src/slic3r/GUI/UpdateDialogs.hpp
View file

@ -31,8 +31,6 @@ public:
bool disable_version_check() const; bool disable_version_check() const;
private: private:
const Semver &ver_current;
const Semver &ver_online;
wxCheckBox *cbox; wxCheckBox *cbox;
}; };