Merge pull request #4921 from OPM/fix-contour-map-export-filename-4920

#4920 Fix second contour map export file name suggestion.
This commit is contained in:
Kristian Bendiksen 2019-10-25 12:52:41 +02:00 committed by GitHub
commit 9e1f50f198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,6 +32,7 @@
#include "RimProject.h"
#include "RimViewWindow.h"
#include "Riu3DMainWindowTools.h"
#include "RiuViewer.h"
#include "cafCmdFeatureManager.h"
@ -110,7 +111,7 @@ void RicExportContourMapToTextFeature::onActionTriggered( bool isChecked )
RicExportContourMapToTextUi featureUi;
featureUi.setExportFileName( startPath );
caf::PdmUiPropertyViewDialog propertyDialog( nullptr,
caf::PdmUiPropertyViewDialog propertyDialog( Riu3DMainWindowTools::mainWindowWidget(),
&featureUi,
"Export Contour Map to Text",
"",
@ -120,7 +121,7 @@ void RicExportContourMapToTextFeature::onActionTriggered( bool isChecked )
{
QString fileName = featureUi.exportFileName();
app->setLastUsedDialogDirectory( "CONTOUR_EXPORT", fileName );
app->setLastUsedDialogDirectory( "CONTOUR_EXPORT", QFileInfo( fileName ).absolutePath() );
m_exportFileName = fileName;
m_exportLocalCoordinates = featureUi.exportLocalCoordinates();
m_undefinedValueLabel = featureUi.undefinedValueLabel();