Merge message box fixes into dev, #2443

This commit is contained in:
Magne Sjaastad 2018-02-02 14:41:58 +01:00
commit bf0b4f68e1
16 changed files with 7 additions and 20 deletions

View File

@ -32,7 +32,6 @@
#include <QAction>
#include <QFileDialog>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT(RicExportFishbonesLateralsFeature, "RicExportFishbonesLateralsFeature");

View File

@ -43,7 +43,6 @@
#include "cvfMath.h"
#include <QAction>
#include <QMessageBox>
#include <QDir>

View File

@ -20,6 +20,7 @@
#include "RicExportFaultsFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RigEclipseCaseData.h"
#include "RigFault.h"
@ -33,7 +34,6 @@
#include <QAction>
#include <QFileDialog>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT(RicExportFaultsFeature, "RicExportFaultsFeature");
@ -191,7 +191,7 @@ void RicExportFaultsFeature::saveFault(QString completeFilename, const RigMainGr
if (!exportFile.open(QIODevice::WriteOnly) )
{
QMessageBox::critical(NULL, "ResInsight - Export Faults", "Could not open the file :\n" + completeFilename);
RiaLogging::error("Could not open the file : " + completeFilename);
}
QTextStream stream(&exportFile);

View File

@ -42,7 +42,6 @@
#include <QAction>
#include <QFileInfo>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT(RicSaveEclipseInputVisibleCellsFeature, "RicSaveEclipseInputVisibleCellsFeature");
CAF_CMD_SOURCE_INIT(RicSaveEclipseInputActiveVisibleCellsFeature, "RicSaveEclipseInputActiveVisibleCellsFeature");

View File

@ -20,6 +20,7 @@
#include "RicSaveEclipseResultAsInputPropertyExec.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RicExportFeatureImpl.h"
@ -38,7 +39,7 @@
#include "cafPdmUiPropertyViewDialog.h"
#include "cafUtils.h"
#include <QMessageBox>
//--------------------------------------------------------------------------------------------------
///
@ -101,7 +102,7 @@ void RicSaveEclipseResultAsInputPropertyExec::redo()
bool isOk = RifEclipseInputFileTools::writeBinaryResultToTextFile(exportSettings.fileName, m_cellColors->reservoirView()->eclipseCase()->eclipseCaseData(), timeStep, m_cellColors, exportSettings.eclipseKeyword, exportSettings.undefinedValue);
if (!isOk)
{
QMessageBox::critical(NULL, "File export", "Failed to exported current result to " + exportSettings.fileName);
RiaLogging::error("Failed to exported current result to " + exportSettings.fileName);
}
}
}

View File

@ -38,7 +38,6 @@
#include <QFileDialog>
#include <QFileInfo>
#include <QMdiSubWindow>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT(RicSnapshotAllPlotsToFileFeature, "RicSnapshotAllPlotsToFileFeature");
@ -63,7 +62,7 @@ void RicSnapshotAllPlotsToFileFeature::saveAllPlots()
exportSnapshotOfAllPlotsIntoFolder(snapshotFolderName);
QString text = QString("Exported snapshots to folder : \n%1").arg(snapshotFolderName);
QMessageBox::information(nullptr, "Export Snapshots To Folder", text);
RiaLogging::info(text);
}
//--------------------------------------------------------------------------------------------------

View File

@ -45,7 +45,6 @@
#include <QFileDialog>
#include <QFileInfo>
#include <QMdiSubWindow>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT(RicSnapshotAllViewsToFileFeature, "RicSnapshotAllViewsToFileFeature");
@ -65,7 +64,7 @@ void RicSnapshotAllViewsToFileFeature::saveAllViews()
exportSnapshotOfAllViewsIntoFolder(snapshotFolderName);
QString text = QString("Exported snapshots to folder : \n%1").arg(snapshotFolderName);
QMessageBox::information(nullptr, "Export Snapshots To Folder", text);
RiaLogging::info(text);
}
//--------------------------------------------------------------------------------------------------

View File

@ -35,7 +35,6 @@
#include <QFileDialog>
#include <QFileInfo>
#include <QMdiSubWindow>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT(RicSnapshotViewToClipboardFeature, "RicSnapshotViewToClipboardFeature");

View File

@ -36,7 +36,6 @@
#include <QFileDialog>
#include <QFileInfo>
#include <QMdiSubWindow>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT(RicSnapshotViewToFileFeature, "RicSnapshotViewToFileFeature");

View File

@ -31,7 +31,6 @@
#include "cvfAssert.h"
#include <QAction>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT(RicDeleteScriptPathFeature, "RicDeleteScriptPathFeature");

View File

@ -39,7 +39,6 @@
#include "cvfAssert.h"
#include <QAction>
#include <QMessageBox>
#include <QString>
#include <QFileInfo>

View File

@ -40,7 +40,6 @@
#include <QAction>
#include <QFileInfo>
#include <QMessageBox>
#include <QString>
CAF_CMD_SOURCE_INIT(RicConvertAllFractureTemplatesToMetricFeature, "RicConvertAllFractureTemplatesToMetricFeature");

View File

@ -39,7 +39,6 @@
#include "cvfAssert.h"
#include <QAction>
#include <QMessageBox>
#include <QString>
#include <QFileInfo>

View File

@ -36,7 +36,6 @@
#include <QDebug>
#include <QFileDialog>
#include <QFileInfo>
#include <QMessageBox>

View File

@ -35,7 +35,6 @@
#include <QDebug>
#include <QFileDialog>
#include <QFileInfo>
#include <QMessageBox>

View File

@ -45,7 +45,6 @@
#include "cvfVector3.h"
#include <QFileInfo>
#include <QMessageBox>
#include <algorithm>
#include <vector>