#872 - Simplifying setting of file name for ascii export of summary plots

ApplicationCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp

@@ -22,7 +22,6 @@
 #include "RiaLogging.h"
 
 #include "RimSummaryPlot.h"
-#include "RimSummaryPlotExportSettings.h"
 
 #include "RiuMainWindow.h"
 
@@ -33,6 +32,7 @@
 
 #include <QAction>
 #include <QDebug>
+#include <QFileDialog>
 #include <QFileInfo>
 #include <QMessageBox>
 #include <vector>
@@ -54,35 +54,27 @@ bool RicAsciiExportSummaryPlotFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicAsciiExportSummaryPlotFeature::onActionTriggered(bool isChecked)
 {
+    RiaApplication* app = RiaApplication::instance();
+    QString projectFolder = app->currentProjectPath();
+
     RimProject* project = RiaApplication::instance()->project();
     CVF_ASSERT(project);
 
     std::vector<RimSummaryPlot*> selectedSummaryPlots;
     caf::SelectionManager::instance()->objectsByType(&selectedSummaryPlots);
 
-    RimSummaryPlotExportSettings exportSettings;
-
-    RiaApplication* app = RiaApplication::instance();
-    QString projectFolder = app->currentProjectPath();
-
     QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("SUMMARYPLOT_ASCIIEXPORT_DIR", projectFolder);
-    QString defaultFilename = QString("SummaryPlotExport"); 
+    QString defaultFileName = defaultDir + "/" + QString("SummaryPlotExport");
+    QString fileName = QFileDialog::getSaveFileName(NULL, "Select file for Summary Plot Export", defaultFileName, "All files(*.*)");
 
-    QString outputFileName = defaultDir + "/" + defaultFilename;
+    if (fileName.isEmpty()) return;
-    exportSettings.fileName = outputFileName;
+    bool isOk = writeAsciiExportForSummaryPlots(fileName, selectedSummaryPlots);
-
-    caf::PdmUiPropertyViewDialog propertyDialog(RiuMainWindow::instance(), &exportSettings, "Export Summary Plots to Ascii", "");
-    if (propertyDialog.exec() == QDialog::Accepted)
-    {
-        RiaApplication::instance()->setLastUsedDialogDirectory("SUMMARYPLOT_ASCIIEXPORT_DIR", QFileInfo(exportSettings.fileName).absolutePath());
-
-        bool isOk = writeAsciiExportForSummaryPlots(exportSettings.fileName(), selectedSummaryPlots);
 
     if (!isOk)
     {
-            QMessageBox::critical(NULL, "File export", "Failed to exported current result to " + exportSettings.fileName);
+        QMessageBox::critical(NULL, "File export", "Failed to exported current result to " + fileName);
-        }
     }
+    
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake

@@ -19,7 +19,6 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.h
-${CEE_CURRENT_LIST_DIR}RimSummaryPlotExportSettings.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -37,7 +36,6 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.cpp
-${CEE_CURRENT_LIST_DIR}RimSummaryPlotExportSettings.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotExportSettings.cpp

@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2017-     Statoil ASA
-// 
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-// 
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-// 
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#include "RimSummaryPlotExportSettings.h"
-
-#include "cafPdmUiFilePathEditor.h"
-#include "cafPdmPtrField.h"
-
-CAF_PDM_SOURCE_INIT(RimSummaryPlotExportSettings, "RimSummaryPlotExportSettings");
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RimSummaryPlotExportSettings::RimSummaryPlotExportSettings()
-{
-    CAF_PDM_InitObject("RimFractureExportSettings", "", "", "");
-
-    CAF_PDM_InitFieldNoDefault(&fileName, "Filename", "Export filename", "", "", "");
-    fileName.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
-
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimSummaryPlotExportSettings::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute)
-{
-    if (field == &fileName)
-    {
-        caf::PdmUiFilePathEditorAttribute* myAttr = static_cast<caf::PdmUiFilePathEditorAttribute*>(attribute);
-        if (myAttr)
-        {
-            myAttr->m_selectSaveFileName = true;
-        }
-    }
-}
-

ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotExportSettings.h

@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2017-     Statoil ASA
-// 
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-// 
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-// 
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "cafPdmField.h"
-#include "cafPdmFieldHandle.h"
-#include "cafPdmObject.h"
-#include "cafPdmUiFieldEditorHandle.h"
-
-//==================================================================================================
-///  
-///  
-//==================================================================================================
-class RimSummaryPlotExportSettings : public caf::PdmObject
-{
-    CAF_PDM_HEADER_INIT;
-public:
-    RimSummaryPlotExportSettings();
-
-    caf::PdmField<QString>      fileName;
-
-protected:
-    virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
-};
-