From fbfd47b23550c46ec4f7997d4675fbb08f5ca84a Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sat, 17 Dec 2016 21:47:45 +0100
Subject: [PATCH] Command for reloading an object from file. #1466

---
 lib/Slic3r/GUI/Plater.pm   |  38 ++++++++++++++++++++++++++++++++++++-
 var/arrow_refresh.png      | Bin 0 -> 685 bytes
 xs/src/libslic3r/Model.cpp |   3 +++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100755 var/arrow_refresh.png

diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index 2be9074b68..99713e0595 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -582,6 +582,7 @@ sub load_file {
     my $model = eval { Slic3r::Model->read_from_file($input_file) };
     Slic3r::GUI::show_error($self, $@) if $@;
     
+    my @obj_idx = ();
     if (defined $model) {
         if ($model->looks_like_multipart_object) {
             my $dialog = Wx::MessageDialog->new($self,
@@ -593,11 +594,13 @@ sub load_file {
                 $model->convert_multipart_object;
             }
         }
-        $self->load_model_objects(@{$model->objects});
+        @obj_idx = $self->load_model_objects(@{$model->objects});
         $self->statusbar->SetStatusText("Loaded " . basename($input_file));
     }
     
     $process_dialog->Destroy;
+    
+    return @obj_idx;
 }
 
 sub load_model_objects {
@@ -679,6 +682,8 @@ sub load_model_objects {
     $self->object_list_changed;
     
     $self->schedule_background_process;
+    
+    return @obj_idx;
 }
 
 sub bed_centerf {
@@ -1391,6 +1396,34 @@ sub export_stl {
     $self->statusbar->SetStatusText("STL file exported to $output_file");
 }
 
+sub reload_from_disk {
+    my ($self) = @_;
+    
+    my ($obj_idx, $object) = $self->selected_object;
+    return if !defined $obj_idx;
+    
+    my $model_object = $self->{model}->objects->[$obj_idx];
+    return if !$model_object->input_file
+        || !-e $model_object->input_file;
+    
+    my @obj_idx = $self->load_file($model_object->input_file);
+    return if !@obj_idx;
+    
+    foreach my $new_obj_idx (@obj_idx) {
+        my $o = $self->{model}->objects->[$new_obj_idx];
+        $o->clear_instances;
+        $o->add_instance($_) for @{$model_object->instances};
+        
+        if ($o->volumes_count == $model_object->volumes_count) {
+            for my $i (0..($o->volumes_count-1)) {
+                $o->get_volume($i)->config->apply($model_object->get_volume($i)->config);
+            }
+        }
+    }
+    
+    $self->remove($obj_idx);
+}
+
 sub export_object_stl {
     my $self = shift;
     
@@ -1879,6 +1912,9 @@ sub object_menu {
         $self->object_settings_dialog;
     }, undef, 'cog.png');
     $menu->AppendSeparator();
+    $frame->_append_menu_item($menu, "Reload from Disk", 'Reload the selected file from Disk', sub {
+        $self->reload_from_disk;
+    }, undef, 'arrow_refresh.png');
     $frame->_append_menu_item($menu, "Export object as STL…", 'Export this single object as STL file', sub {
         $self->export_object_stl;
     }, undef, 'brick_go.png');
diff --git a/var/arrow_refresh.png b/var/arrow_refresh.png
new file mode 100755
index 0000000000000000000000000000000000000000..0de26566d4102eec080253c2d08985ec58b14838
GIT binary patch
literal 685
zcmV;e0#f~nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!KS@MER5;6x
zliN$vVI0N>`!iy8(2_#ButL^3%VaH2WCpD^U)OZxp@C)2#hU)y+@T%ZNzJigNk%37
zz-WYJwT%teVfiEI+B*@v4ey@58(ld4VY_&5-ox`e@AKg+0U-I`y79bmuw_~y6+4rZ
zBG5EdFDS+@M0OSE`>d7SUDOzKZ&h*4eB1iX7tOd9RiYtW2mQ--bUahxr1`i{RG@dM
zL#}_X=DDO1{;UI$pFu=dLYT_=5d8WC-sLfjr7UO-HKMAwa<oXG=R>=!>)kEhvuwre
zuW3yF@ZxFCkI*+ad|5kOX%5zu8IQjhan)UqgSrFGA_0nQFn@Z08DSEUToCSz4Z1ls
z&fDbq$T&7|6iq$_uDI$@q1_kQ@dfqk*0>{SDL6V)94@)ete)j++*>bIc9sj}Y;R1o
z#OpH+Yt-^4wfv{nern^i<pj6=(tb^usZ6y;N@k3ZGD6Cffs2gHn1otpmp$hgMP?M4
zQDoMi?vff3cTC%b$c!VijelmFWVR;Cosh-|sjzjAkh;li)swan6*~qN?&bT5?|4i|
z1J;ZQ!-<EW$e_re$mo8fg)7MwkUG*MXq#xxBQ+E~CZtX-WyIX?XaQ+Vm?%Ozk{Bu=
z)z03=k?uo0A(a&g5Yo{{ANvto2^Wxtzk4yBb;6agVt8o?J@Y!W_?0-Uuiy!(Tyz#F
zvagTtg#H!FBLyKvjj0;d_p8<^a-5JF2&rt>Vag8<wJek}Xrh~hR7yw(OA+`Bgsg~}
T=<19p00000NkvXXu0mjf<1{{&

literal 0
HcmV?d00001

diff --git a/xs/src/libslic3r/Model.cpp b/xs/src/libslic3r/Model.cpp
index bb5b8c89f5..a494228a91 100644
--- a/xs/src/libslic3r/Model.cpp
+++ b/xs/src/libslic3r/Model.cpp
@@ -717,6 +717,8 @@ ModelObject::cut(Axis axis, coordf_t z, Model* model) const
     ModelObject* lower = model->add_object(*this);
     upper->clear_volumes();
     lower->clear_volumes();
+    upper->input_file = "";
+    lower->input_file = "";
     
     for (ModelVolumePtrs::const_iterator v = this->volumes.begin(); v != this->volumes.end(); ++v) {
         ModelVolume* volume = *v;
@@ -772,6 +774,7 @@ ModelObject::split(ModelObjectPtrs* new_objects)
         (*mesh)->repair();
         
         ModelObject* new_object = this->model->add_object(*this, false);
+        new_object->input_file  = "";
         ModelVolume* new_volume = new_object->add_volume(**mesh);
         new_volume->name        = volume->name;
         new_volume->config      = volume->config;