2346, 2354 - Landmarks zoom problem and crash on deleting all shapes (#2355)

* Fix crash when deleting all shapes

* Fix #2346 - landmarks placed on wrong shape when zoomed in too far.

The problem was that each viewer was checked independently regardless of which square it was in.  When zoomed in, the shape is clipped, but the picker can still locate it.  This fix checks which renderer was clicked first.

Author: akenmorris

Libs/Analyze/Shape.h

@@ -32,7 +32,7 @@ class Shape {
    public:
     Point(){};
     Point(double _x, double _y, double _z) : x(_x), y(_y), z(_z){};
-    double x, y, z;
+    double x = 0, y = 0, z = 0;
   };
 
   Shape();

Studio/Interface/ShapeWorksStudioApp.cpp

@@ -1217,7 +1217,6 @@ void ShapeWorksStudioApp::handle_project_changed() {
   }
 
   if (session_->get_shapes().size() == 0) {
-    new_session();
     analysis_tool_->reset_stats();
     lightbox_->clear_renderers();
   }

Studio/Visualization/Lightbox.cpp

@@ -274,22 +274,26 @@ void Lightbox::redraw() {
 ViewerList Lightbox::get_viewers() { return viewers_; }
 
 //-----------------------------------------------------------------------------
-void Lightbox::handle_pick(int* click_pos, bool one, bool ctrl) {
+void Lightbox::handle_pick(int* click_pos, bool one, bool ctrl, vtkRenderer* renderer) {
   if (ctrl) {
     for (int i = 0; i < viewers_.size(); i++) {
-      auto result = viewers_[i]->handle_ctrl_click(click_pos);
-      if (result.domain_ != -1) {
-        result.subject_ = i + get_start_shape();
-        visualizer_->handle_ctrl_click(result);
-        return;
+      if (viewers_[i]->get_renderer() == renderer) {
+        auto result = viewers_[i]->handle_ctrl_click(click_pos);
+        if (result.domain_ != -1) {
+          result.subject_ = i + get_start_shape();
+          visualizer_->handle_ctrl_click(result);
+          return;
+        }
       }
     }
   } else {
     int id = -1;
     Q_FOREACH (ViewerHandle viewer, viewers_) {
-      int vid = viewer->handle_pick(click_pos);
-      if (vid != -1) {
-        id = vid;
+      if (viewer->get_renderer() == renderer) {
+        int vid = viewer->handle_pick(click_pos);
+        if (vid != -1) {
+          id = vid;
+        }
       }
     }
 

Studio/Visualization/Lightbox.h

@@ -56,7 +56,7 @@ class Lightbox : public QObject {
 
   void redraw();
 
-  void handle_pick(int* click_pos, bool one, bool ctrl);
+  void handle_pick(int* click_pos, bool one, bool ctrl, vtkRenderer* renderer);
 
   void handle_hover(int* click_pos);
 
@@ -89,7 +89,7 @@ class Lightbox : public QObject {
   void update_feature_range();
 
   void update_interactor_style();
-  
+
   void set_shared_brightness_and_contrast(double brightness, double contrast);
 
   vtkRenderWindow* get_render_window();

Studio/Visualization/StudioInteractorStyle.cpp

@@ -17,8 +17,9 @@ StudioInteractorStyle::~StudioInteractorStyle() {}
 //-----------------------------------------------------------------------------
 void StudioInteractorStyle::OnLeftButtonDown() {
   if (this->Interactor->GetControlKey()) {
-    int* clickPos = this->GetInteractor()->GetEventPosition();
-    this->lightbox_->handle_pick(clickPos, true, true);
+    int* pos = this->GetInteractor()->GetEventPosition();
+    vtkRenderer* renderer = GetInteractor()->FindPokedRenderer(pos[0], pos[1]);
+    this->lightbox_->handle_pick(pos, true, true, renderer);
     return;
   }
 
@@ -61,17 +62,18 @@ void StudioInteractorStyle::OnMouseWheelBackward() {
 //-----------------------------------------------------------------------------
 void StudioInteractorStyle::OnKeyDown() {
   int* click_pos = this->GetInteractor()->GetEventPosition();
+  vtkRenderer* renderer = GetInteractor()->FindPokedRenderer(click_pos[0], click_pos[1]);
 
   char keycode = this->GetInteractor()->GetKeyCode();
   std::string keysym = GetInteractor()->GetKeySym();
 
   switch (keycode) {
     case '1':
-      this->lightbox_->handle_pick(click_pos, true, false);
+      this->lightbox_->handle_pick(click_pos, true, false, renderer);
       break;
 
     case '2':
-      this->lightbox_->handle_pick(click_pos, false, false);
+      this->lightbox_->handle_pick(click_pos, false, false, renderer);
       break;
 
     case 'r':