Loading isis/src/qisis/apps/ipce/ipce.cpp +10 −0 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ #include <QLocale> #include <QTranslator> #include "FileName.h" #include "Gui.h" #include "IException.h" #include "IpceMainWindow.h" Loading @@ -39,11 +40,20 @@ int main(int argc, char *argv[]) { Gui::checkX11(); try { // Add the Qt plugin directory to the library path FileName qtpluginpath("$ISISROOT/3rdParty/plugins"); QCoreApplication::addLibraryPath(qtpluginpath.expanded()); QApplication *app = new QIsisApplication(argc, argv); QApplication::setApplicationName("ipce"); IpceMainWindow *mainWindow = new IpceMainWindow(); // For OSX, had problems with cneteditor view because it has it's own menus, caused the // menubar on OSX to lockup QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true); // We do not want a showMaximized call, as that will negate the settings read during the main // window's initialization. References #4358. mainWindow->show(); Loading isis/src/qisis/objs/Directory/ImportImagesWorkOrder.cpp +3 −1 Original line number Diff line number Diff line Loading @@ -412,7 +412,9 @@ namespace Isis { projectImage->relocateDnData(FileName(destination).name()); } // Set new ecub to readOnly // 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. projectImage->reopen(); delete input; Loading Loading
isis/src/qisis/apps/ipce/ipce.cpp +10 −0 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ #include <QLocale> #include <QTranslator> #include "FileName.h" #include "Gui.h" #include "IException.h" #include "IpceMainWindow.h" Loading @@ -39,11 +40,20 @@ int main(int argc, char *argv[]) { Gui::checkX11(); try { // Add the Qt plugin directory to the library path FileName qtpluginpath("$ISISROOT/3rdParty/plugins"); QCoreApplication::addLibraryPath(qtpluginpath.expanded()); QApplication *app = new QIsisApplication(argc, argv); QApplication::setApplicationName("ipce"); IpceMainWindow *mainWindow = new IpceMainWindow(); // For OSX, had problems with cneteditor view because it has it's own menus, caused the // menubar on OSX to lockup QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true); // We do not want a showMaximized call, as that will negate the settings read during the main // window's initialization. References #4358. mainWindow->show(); Loading
isis/src/qisis/objs/Directory/ImportImagesWorkOrder.cpp +3 −1 Original line number Diff line number Diff line Loading @@ -412,7 +412,9 @@ namespace Isis { projectImage->relocateDnData(FileName(destination).name()); } // Set new ecub to readOnly // 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. projectImage->reopen(); delete input; Loading