Commit b14d8dcf authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Making a few mild modifications based on testing feedback

parent 8d5a2496

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

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ namespace Isis { 
    m_isUndoable = true;

    m_list = NULL;



    QAction::setText(tr("Import Map Templates"));

    QUndoCommand::setText(tr("Import Map Templates"));

    QAction::setText(tr("Import Map Templates..."));

    QUndoCommand::setText(tr("Import Map Templates..."));

    setModifiesDiskState(true);



  }
@@ -117,7 +117,7 @@ namespace Isis { 
        qobject_cast<QWidget *>(parent()),

        "Import Map Templates",

        QString(),

        "Maps (*.def *.map *.pvl);; All Files (*)");

        "Maps (*.map);; All Files (*)");



    if (!templateFileNames.isEmpty()) {

      QUndoCommand::setText(tr("Import %1 Template(s)").arg(templateFileNames.count()));

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

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ namespace Isis { 
    m_isUndoable = true;

    m_list = NULL;



    QAction::setText(tr("Import Registration Templates"));

    QUndoCommand::setText(tr("Import Registration Templates"));

    QAction::setText(tr("Import Registration Templates..."));

    QUndoCommand::setText(tr("Import Registration Templates..."));

    setModifiesDiskState(true);



  }
@@ -117,7 +117,7 @@ namespace Isis { 
        qobject_cast<QWidget *>(parent()),

        "Import Registration Templates",

        QString(),

        "Registrations (*.def *.pvl);; All Files (*)");

        "Registrations (*.def);; All Files (*)");



    if (!templateFileNames.isEmpty()) {

      QUndoCommand::setText(tr("Import %1 Template(s)").arg(templateFileNames.count()));

isis/src/qisis/objs/TemplateEditorWidget/TemplateEditorWidget.cpp

+43 −12
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ namespace Isis { 
  }





  /**

  * @brief Called when a user clicks the "Save" button

  *

  */

  void TemplateEditorWidget::saveText() {

    //We create a new QFile just in case the template's file name has changed

    QFile templateFile(m_template->fileName());
@@ -56,12 +60,15 @@ namespace Isis { 
    m_textChanged = false;

  }



  // Future plans to include Save As button

  

  /**

  * @brief Called when a user clicks the "Save As" button

  *

  */

  void TemplateEditorWidget::saveAsText() {

    //We create a new QFile just in case the template's file name has changed



    // First need to get the filename to save to via a QFileDialog

    // Create a filedialog for the user to choose a save location and name as well as whether they 

    // would like to import the saved template file into the project.

    QFileDialog *fileDialog = new QFileDialog(qobject_cast<QWidget *>(parent()), 

                                                            "Save Template File");

    QGridLayout *layout = static_cast<QGridLayout*>(fileDialog->layout());
@@ -72,18 +79,34 @@ namespace Isis { 
    

    fileDialog->setAcceptMode(QFileDialog::AcceptSave);

    fileDialog->setDirectory(QDir::currentPath());

    fileDialog->setNameFilter("DEF (*.def);;MAP (*.map);;All (*)"); // Need .pvl?

    if (m_fileType == "maps") {

      fileDialog->setNameFilter("Maps (*.map);;All Files (*)");

    }

    else if (m_fileType == "registrations") {

      fileDialog->setNameFilter("Registrations (*.def);;All Files (*)");

    }

    fileDialog->exec();



    // Simply return if the user cancelled the save

    if (!fileDialog->result()){

      return;

    }



    // Add file extension based on selected filter if extension not provided, defaulting to ".def"

    // or ".map", respectively.

    QString extension = fileDialog->selectedNameFilter().split("(")[1].mid(1, 4);

    

    if (QString::compare(extension, ".def") == 0 || QString::compare(extension, ".map") == 0) {

      fileDialog->setDefaultSuffix(extension);

    }

    else {

      if (m_fileType == "maps") {

        fileDialog->setDefaultSuffix(".map");

      }

      else if (m_fileType == "registrations") {

        fileDialog->setDefaultSuffix(".def");

      }

    }

    QString templateFileName = fileDialog->selectedFiles().first();



    // Write the file out
@@ -94,7 +117,7 @@ namespace Isis { 
      templateFile.close();

    } 

    

    // Import the newly created template file to the project if user checked the box.

    // Import the newly created template file to the project if user checked the optional checkbox.

    if (checkbox->checkState()) {

      if (templateFile.exists()) {

        QDir templateFolder = m_directory->project()->addTemplateFolder(m_fileType + "/import");
@@ -126,14 +149,22 @@ namespace Isis { 
  }

  

  

  /**

  * @brief Slot called when text within widget has been changed

  *

  */

  void TemplateEditorWidget::textChanged() {

    m_textChanged = true;

  }



  

  /**

  * @brief This slot is called when the widget is closed (either via the widget itself or on 

  *        project close).

  *

  */

  void TemplateEditorWidget::saveOption() {

    // The active control is checked here for modification because this was the simplest solution

    // vs changing the project clean state every time the control is modified or saved.



    if (m_textChanged) {

      QMessageBox *box = new QMessageBox(QMessageBox::NoIcon, QString("Current Template Has Unsaved Changes"),

                             QString("Would you like to save your current template?"),