3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-19 04:37:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix ramming ui

Browse source
This commit is contained in:
SoftFever 2023-09-09 23:05:45 +08:00
parent 1a358721c2
commit e95ec070c1
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,5 @@
// Orca: This file is ported from latest PrusaSlicer
#include <algorithm> #include <algorithm>
#include <wx/dcbuffer.h> #include <wx/dcbuffer.h>

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

@ -1,3 +1,5 @@
// Orca: This file is ported from latest PrusaSlicer
#ifndef RAMMING_CHART_H_ #ifndef RAMMING_CHART_H_
#define RAMMING_CHART_H_ #define RAMMING_CHART_H_

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

@ -114,7 +114,7 @@ RammingPanel::RammingPanel(wxWindow* parent, const std::string& parameters)
while (stream >> x >> y) while (stream >> x >> y)
buttons.push_back(std::make_pair(x, y)); buttons.push_back(std::make_pair(x, y));
m_chart = new Chart(this, wxRect(scale(1),scale(1),scale(48),scale(36)), buttons, ramming_speed_size, 0.25f, scale(1)); m_chart = new Chart(this, wxRect(scale(10),scale(10),scale(480),scale(360)), buttons, ramming_speed_size, 0.25f, scale(10));
#ifdef _WIN32 #ifdef _WIN32
update_ui(m_chart); update_ui(m_chart);
#else #else
@ -122,10 +122,10 @@ RammingPanel::RammingPanel(wxWindow* parent, const std::string& parameters)
#endif #endif
sizer_chart->Add(m_chart, 0, wxALL, 5); sizer_chart->Add(m_chart, 0, wxALL, 5);
m_widget_time = new wxSpinCtrlDouble(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(ITEM_WIDTH(), -1),style,0.,5.0,3.,0.5); m_widget_time = new wxSpinCtrlDouble(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(ITEM_WIDTH()*2.5, -1),style,0.,5.0,3.,0.5);
m_widget_volume = new wxSpinCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(ITEM_WIDTH(), -1),style,0,10000,0); m_widget_volume = new wxSpinCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(ITEM_WIDTH()*2.5, -1),style,0,10000,0);
m_widget_ramming_line_width_multiplicator = new wxSpinCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(ITEM_WIDTH(), -1),style,10,200,100); m_widget_ramming_line_width_multiplicator = new wxSpinCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(ITEM_WIDTH()*2.5, -1),style,10,200,100);
m_widget_ramming_step_multiplicator = new wxSpinCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(ITEM_WIDTH(), -1),style,10,200,100); m_widget_ramming_step_multiplicator = new wxSpinCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(ITEM_WIDTH()*2.5, -1),style,10,200,100);
#ifdef _WIN32 #ifdef _WIN32
update_ui(m_widget_time->GetText()); update_ui(m_widget_time->GetText());