Unverified Commit 923bb569 authored by kledmundson's avatar kledmundson Committed by GitHub
Browse files

Merge pull request #147 from TracieSucharski/ipce 

Fixed bug where shape ecubs not created properly if DN data not impor…
parents e90f930f 026ef253

isis/src/qisis/objs/Directory/ImportShapesWorkOrder.cpp

+5 −0
Original line number Diff line number Diff line
@@ -318,6 +318,11 @@ namespace Isis { 
          projectShape->relocateDnData(FileName(destination).name());

        }



        //  Set new ecub to readOnly.  When closing cube, the labels were being re-written because

        // the cube was read/write. This caused a segfault when imported large number of images

        // because of a label template file being opened too many times. 

        projectShape->reopen();



        delete input;



        result = projectShape;

isis/src/qisis/objs/Directory/ImportShapesWorkOrder.h

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ namespace Isis { 
   *   @history 2017-11-02 Tyler Wilson - Added a  null pointer check on the ProjectItem *item

   *                           pointer in isExecutable to prevent potential seg faults.

   *                           References #4492.

   *   @history 2018-04-19 Tracie Sucharski - Fixed bug when importing shapes without DN data. Ecub

   *                           labels were not complete due to a resulting ecub not being closed

   *                           properly in thread.  The resulting ecub needs to be re-opened as

   *                           readOnly to prevent this problem.  Fixes #5274.

   */

  class ImportShapesWorkOrder : public WorkOrder {

      Q_OBJECT