#850 Removed obsolete code

ApplicationCode/Application/RiaApplication.cpp

@@ -79,6 +79,7 @@
 #include "RiuWellLogPlot.h"
 
 #include "RicImportSummaryCaseFeature.h"
+#include "RicSnapshotViewToClipboardFeature.h"
 #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
 
 #include "cafFixedAtlasFont.h"
@@ -97,8 +98,6 @@
 #include "cvfqtUtils.h"
 
 #include <QAction>
-#include <QClipboard>
-#include <QDebug>
 #include <QDesktopServices>
 #include <QDir>
 #include <QFileDialog>
@@ -1896,71 +1895,6 @@ bool RiaApplication::openFile(const QString& fileName)
     return loadingSucceded;
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiaApplication::saveSnapshotPromtpForFilename()
-{
-    QString startPath;
-    if (!m_project->fileName().isEmpty())
-    {
-        QFileInfo fi(m_project->fileName());
-        startPath = fi.absolutePath();
-    }
-    else
-    {
-        startPath = lastUsedDialogDirectory("IMAGE_SNAPSHOT");
-    }
-
-    startPath += "/image.png";
-
-    QString fileName = QFileDialog::getSaveFileName(NULL, tr("Save File"), startPath, tr("Image files (*.bmp *.png * *.jpg)"));
-    if (fileName.isEmpty())
-    {
-        return;
-    }
-
-    // Remember the directory to next time
-    setLastUsedDialogDirectory("IMAGE_SNAPSHOT", QFileInfo(fileName).absolutePath());
-
-    saveSnapshotAs(fileName);
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiaApplication::saveSnapshotAs(const QString& fileName)
-{
-    QImage image = grabFrameBufferImage();
-    if (!image.isNull())
-    {
-        if (image.save(fileName))
-        {
-            qDebug() << "Saved snapshot image to " << fileName;
-        }
-        else
-        {
-            qDebug() << "Error when trying to save snapshot image to " << fileName;
-        }
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiaApplication::copySnapshotToClipboard()
-{
-    QClipboard* clipboard = QApplication::clipboard();
-    if (clipboard)
-    {
-        QImage image = grabFrameBufferImage();
-        if (!image.isNull())
-        {
-            clipboard->setImage(image);
-        }
-    }
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -2011,13 +1945,13 @@ void RiaApplication::saveSnapshotForAllViews(const QString& snapshotFolderName)
                 fileName.replace(" ", "_");
 
                 QString absoluteFileName = caf::Utils::constructFullFileName(absSnapshotPath, fileName, ".png");
-                saveSnapshotAs(absoluteFileName);
+                
+                RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName);
             }
         }
     }
 }
 
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -2046,7 +1980,9 @@ void RiaApplication::runMultiCaseSnapshots(const QString& templateProjectFileNam
     mainWnd->loadWinGeoAndDockToolBarLayout();
 }
 
-
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
 void removeDirectoryWithContent(QDir dirToDelete )
 {
     QStringList files = dirToDelete.entryList();
@@ -2057,7 +1993,6 @@ void removeDirectoryWithContent(QDir dirToDelete )
     dirToDelete.rmdir(".");
 }
 
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -2328,33 +2263,6 @@ cvf::Font* RiaApplication::customFont()
     return m_customFont.p();
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-QImage RiaApplication::grabFrameBufferImage()
-{
-    // TODO: Create a general solution that also works with well log plots and summary plots
-    // For now, only reservoir views are supported by this solution
-    /*
-        RimViewWindow* viewWindow = RiaApplication::activeViewWindow();
-        if (viewWindow)
-        {
-            return viewWindow->snapshotWindowContent();
-        }
-
-        return QImage();
-    */
-    
-    QImage image;
-    if (m_activeReservoirView && m_activeReservoirView->viewer())
-    {
-        return m_activeReservoirView->snapshotWindowContent();
-    }
-
-    return image;
-    
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/RiaApplication.h

@@ -132,9 +132,6 @@ public:
     void                addWellPathsToModel(QList<QString> wellPathFilePaths);
     void                addWellLogsToModel(const QList<QString>& wellLogFilePaths);
 
-    void                copySnapshotToClipboard();
-    void                saveSnapshotPromtpForFilename();
-    void                saveSnapshotAs(const QString& fileName);
     void                saveSnapshotForAllViews(const QString& snapshotFolderName);
     void                runMultiCaseSnapshots(const QString& templateProjectFileName, std::vector<QString> gridFileNames, const QString& snapshotFolderName);
     void                runRegressionTest(const QString& testRootPath);
@@ -206,7 +203,6 @@ private:
     std::vector<QString>    readFileListFromTextFile(QString listFileName);
     void                    setWindowCaptionFromAppState();
     
-    QImage                  grabFrameBufferImage();
     void                    clearViewsScheduledForUpdate();
 
     void                    createMainPlotWindow();

ApplicationCode/UserInterface/RiuMainPlotWindow.cpp

@@ -129,12 +129,8 @@ void RiuMainPlotWindow::closeEvent(QCloseEvent* event)
 //--------------------------------------------------------------------------------------------------
 void RiuMainPlotWindow::createActions()
 {
-    m_snapshotToFile = new QAction(QIcon(":/SnapShotSave.png"), "Snapshot To File", this);
-    m_snapshotToClipboard = new QAction(QIcon(":/SnapShot.png"), "Copy Snapshot To Clipboard", this);
     m_snapshotAllViewsToFile = new QAction(QIcon(":/SnapShotSaveViews.png"), "Snapshot All Views To File", this);
 
-    connect(m_snapshotToFile, SIGNAL(triggered()), SLOT(slotSnapshotToFile()));
-    connect(m_snapshotToClipboard, SIGNAL(triggered()), SLOT(slotSnapshotToClipboard()));
     connect(m_snapshotAllViewsToFile, SIGNAL(triggered()), SLOT(slotSnapshotAllViewsToFile()));
 }
 
@@ -190,6 +186,7 @@ void RiuMainPlotWindow::createMenus()
     // Edit menu
     QMenu* editMenu = menuBar()->addMenu("&Edit");
     editMenu->addAction(cmdFeatureMgr->action("RicSnapshotViewToClipboardFeature"));
+    editMenu->addAction(cmdFeatureMgr->action("RicSnapshotViewToFileFeature"));
     editMenu->addSeparator();
     editMenu->addAction(cmdFeatureMgr->action("RicEditPreferencesFeature"));
 
@@ -600,26 +597,6 @@ void RiuMainPlotWindow::selectedObjectsChanged()
     }
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiuMainPlotWindow::slotSnapshotToFile()
-{
-    RiaApplication* app = RiaApplication::instance();
-
-    app->saveSnapshotPromtpForFilename();
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiuMainPlotWindow::slotSnapshotToClipboard()
-{
-    RiaApplication* app = RiaApplication::instance();
-
-    app->copySnapshotToClipboard();
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/UserInterface/RiuMainPlotWindow.h

@@ -94,8 +94,6 @@ private:
     QByteArray                m_initialDockAndToolbarLayout;    // Initial dock window and toolbar layout, used to reset GUI
 
 private:
-    QAction*            m_snapshotToFile;
-    QAction*            m_snapshotToClipboard;
     QAction*            m_snapshotAllViewsToFile;
 
     QMdiArea*           m_mdiArea;
@@ -109,8 +107,6 @@ private slots:
 
     friend class RiuMdiSubWindow;
 
-    void    slotSnapshotToFile();
-    void    slotSnapshotToClipboard();
     void    slotSnapshotAllViewsToFile();
 
     void    slotBuildWindowActions();

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -209,8 +209,6 @@ void RiuMainWindow::createActions()
     m_mockModelCustomizedAction = new QAction("Customized Mock Model", this);
     m_mockInputModelAction      = new QAction("Input Mock Model", this);
 
-    m_snapshotToFile            = new QAction(QIcon(":/SnapShotSave.png"), "Snapshot To File", this);
-    m_snapshotToClipboard       = new QAction(QIcon(":/SnapShot.png"), "Copy Snapshot To Clipboard", this);
     m_snapshotAllViewsToFile    = new QAction(QIcon(":/SnapShotSaveViews.png"), "Snapshot All Views To File", this);
 
     m_createCommandObject       = new QAction("Create Command Object", this);
@@ -223,8 +221,6 @@ void RiuMainWindow::createActions()
     connect(m_mockModelCustomizedAction,    SIGNAL(triggered()), SLOT(slotMockModelCustomized()));
     connect(m_mockInputModelAction,        SIGNAL(triggered()), SLOT(slotInputMockModel()));
 
-    connect(m_snapshotToFile,            SIGNAL(triggered()), SLOT(slotSnapshotToFile()));
-    connect(m_snapshotToClipboard,        SIGNAL(triggered()), SLOT(slotSnapshotToClipboard()));
     connect(m_snapshotAllViewsToFile,   SIGNAL(triggered()), SLOT(slotSnapshotAllViewsToFile()));
 
     connect(m_createCommandObject,      SIGNAL(triggered()), SLOT(slotCreateCommandObject()));
@@ -333,7 +329,7 @@ void RiuMainWindow::createMenus()
     importMenu->addAction(cmdFeatureMgr->action("RicImportFormationNamesFeature"));
 
     QMenu* exportMenu = fileMenu->addMenu("&Export");
-    exportMenu->addAction(m_snapshotToFile);
+    exportMenu->addAction(cmdFeatureMgr->action("RicSnapshotViewToFileFeature"));
     exportMenu->addAction(m_snapshotAllViewsToFile);
 
     fileMenu->addSeparator();
@@ -358,7 +354,7 @@ void RiuMainWindow::createMenus()
 
     // Edit menu
     QMenu* editMenu = menuBar()->addMenu("&Edit");
-    editMenu->addAction(m_snapshotToClipboard);
+    editMenu->addAction(cmdFeatureMgr->action("RicSnapshotViewToClipboardFeature"));
     editMenu->addSeparator();
     editMenu->addAction(cmdFeatureMgr->action("RicEditPreferencesFeature"));
 
@@ -433,8 +429,8 @@ void RiuMainWindow::createToolBars()
     {
         QToolBar* toolbar = addToolBar(tr("View Snapshots"));
         toolbar->setObjectName(toolbar->windowTitle());
-        toolbar->addAction(m_snapshotToClipboard);
-        toolbar->addAction(m_snapshotToFile);
+        toolbar->addAction(cmdFeatureMgr->action("RicSnapshotViewToClipboardFeature"));
+        toolbar->addAction(cmdFeatureMgr->action("RicSnapshotViewToFileFeature"));
         toolbar->addAction(m_snapshotAllViewsToFile);
     }
 
@@ -1231,26 +1227,6 @@ void RiuMainWindow::slotNewObjectPropertyView()
     additionalProjectViews.push_back(dockWidget);
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiuMainWindow::slotSnapshotToFile()
-{
-    RiaApplication* app = RiaApplication::instance();
-
-    app->saveSnapshotPromtpForFilename();
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiuMainWindow::slotSnapshotToClipboard()
-{
-    RiaApplication* app = RiaApplication::instance();
-
-    app->copySnapshotToClipboard();
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/UserInterface/RiuMainWindow.h

@@ -146,8 +146,6 @@ private:
     QAction*            m_mockModelCustomizedAction;
     QAction*            m_mockInputModelAction;
 
-    QAction*            m_snapshotToFile;
-    QAction*            m_snapshotToClipboard;
     QAction*            m_snapshotAllViewsToFile;
 
     QAction*            m_createCommandObject;
@@ -199,8 +197,6 @@ private slots:
     void    slotUseShaders(bool enable);
     void    slotShowPerformanceInfo(bool enable);
     
-    void    slotSnapshotToFile();
-    void    slotSnapshotToClipboard();
     void    slotSnapshotAllViewsToFile();
 
     void    slotCreateCommandObject();