GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-31 05:02:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

added point3 to UI and the required function (#4305)

Browse Source
This commit is contained in:
rockandsalt 2018-02-17 23:02:40 -05:00 committed by Joseph Lenox
parent 05461b8620
commit 5f28ee409b
7 changed files with 172 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Slic3r/GUI/OptionsGroup.pm
View File

@ -205,6 +205,11 @@ sub _build_field {
parent => $self->parent,
option => $opt,
);
} elsif ($type eq 'point3'){
$field = Slic3r::GUI::OptionsGroup::Field::Point3->new(
parent => $self->parent,
option => $opt,
);
} elsif ($type eq 'slider') {
$field = Slic3r::GUI::OptionsGroup::Field::Slider->new(
parent => $self->parent,

81
lib/Slic3r/GUI/OptionsGroup/Field.pm
View File

@ -509,6 +509,87 @@ sub disable {
$self->y_textctrl->Disable;
}
package Slic3r::GUI::OptionsGroup::Field::Point3;
use Moo;
extends 'Slic3r::GUI::OptionsGroup::Field::wxSizer';
has 'x_textctrl' => (is => 'rw');
has 'y_textctrl' => (is => 'rw');
has 'z_textctrl' => (is => 'rw');
use Slic3r::Geometry qw(X Y Z);
use Wx qw(:misc :sizer);
use Wx::Event qw(EVT_TEXT);
sub BUILD {
my ($self) = @_;
my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
$self->wxSizer($sizer);
my $field_size = Wx::Size->new(40, -1);
$self->x_textctrl(Wx::TextCtrl->new($self->parent, -1, $self->option->default->[X], wxDefaultPosition, $field_size));
$self->y_textctrl(Wx::TextCtrl->new($self->parent, -1, $self->option->default->[Y], wxDefaultPosition, $field_size));
$self->z_textctrl(Wx::TextCtrl->new($self->parent, -1, $self->option->default->[Z], wxDefaultPosition, $field_size));
my @items = (
Wx::StaticText->new($self->parent, -1, "x:"),
$self->x_textctrl,
Wx::StaticText->new($self->parent, -1, " y:"),
$self->y_textctrl,
Wx::StaticText->new($self->parent, -1, " z:"),
$self->z_textctrl,
);
$sizer->Add($_, 0, wxALIGN_CENTER_VERTICAL, 0) for @items;
if ($self->option->tooltip) {
foreach my $item (@items) {
$item->SetToolTipString($self->option->tooltip)
if $item->can('SetToolTipString');
}
}
EVT_TEXT($self->parent, $_, sub {
$self->_on_change($self->option->opt_id);
}) for $self->x_textctrl, $self->y_textctrl, $self->z_textctrl;
}
sub set_value {
my ($self, $value) = @_;
$self->disable_change_event(1);
$self->x_textctrl->SetValue($value->[X]);
$self->y_textctrl->SetValue($value->[Y]);
$self->z_textctrl->SetValue($value->[Z]);
$self->disable_change_event(0);
}
sub get_value {
my ($self) = @_;
return [
$self->x_textctrl->GetValue,
$self->y_textctrl->GetValue,
$self->z_textctrl->GetValue,
];
}
sub enable {
my ($self) = @_;
$self->x_textctrl->Enable;
$self->y_textctrl->Enable;
$self->z_textctrl->Enable;
}
sub disable {
my ($self) = @_;
$self->x_textctrl->Disable;
$self->y_textctrl->Disable;
$self->z_textctrl->Disable;
}
package Slic3r::GUI::OptionsGroup::Field::Slider;
use Moo;

6
xs/src/libslic3r/Point.cpp
View File

@ -420,6 +420,12 @@ Pointf::vector_to(const Pointf &point) const
return Vectorf(point.x - this->x, point.y - this->y);
}
std::ostream&
operator<<(std::ostream &stm, const Pointf3 &pointf3)
{
return stm << pointf3.x << "," << pointf3.y << "," << pointf3.z;
}
void
Pointf3::scale(double factor)
{

3
xs/src/libslic3r/Point.hpp
View File

@ -96,6 +96,7 @@ class Point3 : public Point
public:
coord_t z;
explicit Point3(coord_t _x = 0, coord_t _y = 0, coord_t _z = 0): Point(_x, _y), z(_z) {};
bool coincides_with(const Point3 &point3) const { return this->x == point3.x && this->y == point3.y && this->z == point3.z; }
};
std::ostream& operator<<(std::ostream &stm, const Pointf &pointf);
@ -123,6 +124,8 @@ class Pointf
Vectorf vector_to(const Pointf &point) const;
};
std::ostream& operator<<(std::ostream &stm, const Pointf3 &pointf3);
class Pointf3 : public Pointf
{
public:

70
xs/src/perlglue.cpp
View File

@ -228,6 +228,9 @@ ConfigBase__set(ConfigBase* THIS, const t_config_option_key &opt_key, SV* value)
} else if (def->type == coPoint) {
ConfigOptionPoint* optv = dynamic_cast<ConfigOptionPoint*>(opt);
return from_SV_check(value, &optv->value);
} else if(def->type == coPoint3){
ConfigOptionPoint3* optv = dynamic_cast<ConfigOptionPoint3*>(opt);
return from_SV_check(value, &optv->value);
} else if (def->type == coPoints) {
ConfigOptionPoints* optv = dynamic_cast<ConfigOptionPoints*>(opt);
std::vector<Pointf> values;
@ -507,6 +510,73 @@ bool from_SV_check(SV* point_sv, Pointf* point)
}
}
SV* to_SV_pureperl(const Point3* THIS)
{
AV* av = newAV();
av_fill(av, 2);
av_store(av, 0, newSViv(THIS->x));
av_store(av, 1, newSViv(THIS->y));
av_store(av, 1, newSViv(THIS->z));
return newRV_noinc((SV*)av);
}
void from_SV(SV* point3_sv, Point3* point)
{
AV* point3_av = (AV*)SvRV(point3_sv);
// get a double from Perl and round it, otherwise
// it would get truncated
point->x = lrint(SvNV(*av_fetch(point3_av, 0, 0)));
point->y = lrint(SvNV(*av_fetch(point3_av, 1, 0)));
point->z = lrint(SvNV(*av_fetch(point3_av, 2, 0)));
}
void from_SV_check(SV* point3_sv, Point3* point)
{
if (sv_isobject(point3_sv) && (SvTYPE(SvRV(point3_sv)) == SVt_PVMG)) {
if (!sv_isa(point3_sv, perl_class_name(point)) && !sv_isa(point3_sv, perl_class_name_ref(point)))
CONFESS("Not a valid %s object (got %s)", perl_class_name(point), HvNAME(SvSTASH(SvRV(point3_sv))));
*point = *(Point3*)SvIV((SV*)SvRV( point3_sv ));
} else {
from_SV(point3_sv, point);
}
}
SV* to_SV_pureperl(const Pointf3* point)
{
AV* av = newAV();
av_fill(av, 2);
av_store(av, 0, newSVnv(point->x));
av_store(av, 1, newSVnv(point->y));
av_store(av, 1, newSVnv(point->z));
return newRV_noinc((SV*)av);
}
bool from_SV(SV* point3_sv, Pointf3* point)
{
AV* point3_av = (AV*)SvRV(point3_sv);
SV* sv_x = *av_fetch(point3_av, 0, 0);
SV* sv_y = *av_fetch(point3_av, 1, 0);
SV* sv_z = *av_fetch(point3_av, 2, 0);
if (!looks_like_number(sv_x) || !looks_like_number(sv_y) || !looks_like_number(sv_z) ) return false;
point->x = SvNV(sv_x);
point->y = SvNV(sv_y);
point->z = SvNV(sv_z);
return true;
}
bool from_SV_check(SV* point3_sv, Pointf3* point)
{
if (sv_isobject(point3_sv) && (SvTYPE(SvRV(point3_sv)) == SVt_PVMG)) {
if (!sv_isa(point3_sv, perl_class_name(point)) && !sv_isa(point3_sv, perl_class_name_ref(point)))
CONFESS("Not a valid %s object (got %s)", perl_class_name(point), HvNAME(SvSTASH(SvRV(point3_sv))));
*point = *(Pointf3*)SvIV((SV*)SvRV( point3_sv ));
return true;
} else {
return from_SV(point3_sv, point);
}
}
void from_SV_check(SV* surface_sv, Surface* THIS)
{
if (!sv_isa(surface_sv, perl_class_name(THIS)) && !sv_isa(surface_sv, perl_class_name_ref(THIS)))

4
xs/src/xsinit.h
View File

@ -148,6 +148,10 @@ void from_SV_check(SV* point_sv, Point* point);
SV* to_SV_pureperl(const Pointf* point);
bool from_SV(SV* point_sv, Pointf* point);
bool from_SV_check(SV* point_sv, Pointf* point);
void from_SV(SV* point_sv, Point3* point);
void from_SV_check(SV* point_sv, Point3* point);
bool from_SV(SV* point_sv, Pointf3* point);
bool from_SV_check(SV* point_sv, Pointf3* point);
void from_SV_check(SV* surface_sv, Surface* THIS);
SV* to_SV(TriangleMesh* THIS);
SV* polynode_children_2_perl(const ClipperLib::PolyNode& node);

4
xs/xsp/Config.xsp
View File

@ -128,8 +128,10 @@ print_config_def()
opt_type = "s";
} else if (optdef.type == coStrings) {
opt_type = "s@";
} else if (optdef.type == coPoint || optdef.type == coPoint3 || optdef.type == coPoints) {
} else if (optdef.type == coPoint || optdef.type == coPoints) {
opt_type = "point";
} else if (optdef.type == coPoint3 ){
opt_type = "point3";
} else if (optdef.type == coBool || optdef.type == coBools) {
opt_type = "bool";
} else if (optdef.type == coEnum) {