mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Aligning prefix of class names with standard:
RICursors RiuCursors RIMainWindow RiuMainWindow RIPreferencesDialog RiuPreferencesDialog RIProcessMonitor RiuProcessMonitor RIResultInfoPanel RiuResultInfoPanel RIViewer RiuViewer p4#: 21071
This commit is contained in:
Jacob Støren
parent
f0174a02fa
commit
c8da0f4179
@ -160,7 +160,7 @@ RiaApplication* RiaApplication::instance()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiaApplication::setWindowCaptionFromAppState()
|
||||
{
|
||||
RIMainWindow* mainWnd = RIMainWindow::instance();
|
||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||
if (!mainWnd) return;
|
||||
|
||||
// The stuff being done here should really be handled by Qt automatically as a result of
|
||||
@ -245,7 +245,7 @@ bool RiaApplication::loadProject(const QString& projectFileName)
|
||||
QString tmp = QString("Unknown project file version detected in file \n%1\n\nCould not open project.").arg(projectFileName);
|
||||
QMessageBox::warning(NULL, "Error when opening project file", tmp);
|
||||
|
||||
RIMainWindow* mainWnd = RIMainWindow::instance();
|
||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||
mainWnd->setPdmRoot(NULL);
|
||||
|
||||
// Delete all object possibly generated by readFile()
|
||||
@ -413,7 +413,7 @@ bool RiaApplication::saveProjectAs(const QString& fileName)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RiaApplication::closeProject(bool askToSaveIfDirty)
|
||||
{
|
||||
RIMainWindow* mainWnd = RIMainWindow::instance();
|
||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||
|
||||
terminateProcess();
|
||||
|
||||
@ -453,7 +453,7 @@ bool RiaApplication::closeProject(bool askToSaveIfDirty)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiaApplication::onProjectOpenedOrClosed()
|
||||
{
|
||||
RIMainWindow* mainWnd = RIMainWindow::instance();
|
||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||
if (!mainWnd) return;
|
||||
|
||||
mainWnd->initializeGuiNewProjectLoaded();
|
||||
@ -820,7 +820,7 @@ bool RiaApplication::parseArguments()
|
||||
|
||||
if (isRunRegressionTest)
|
||||
{
|
||||
RIMainWindow* mainWnd = RIMainWindow::instance();
|
||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||
if (mainWnd)
|
||||
{
|
||||
mainWnd->hideAllDockWindows();
|
||||
@ -911,7 +911,7 @@ QString RiaApplication::octavePath() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiaApplication::slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
|
||||
{
|
||||
RIMainWindow::instance()->processMonitor()->stopMonitorWorkProcess();
|
||||
RiuMainWindow::instance()->processMonitor()->stopMonitorWorkProcess();
|
||||
|
||||
// Execute delete later so that other slots that are hooked up
|
||||
// get a chance to run before we delete the object
|
||||
@ -950,7 +950,7 @@ bool RiaApplication::launchProcess(const QString& program, const QStringList& ar
|
||||
m_workerProcess = new caf::UiProcess(this);
|
||||
connect(m_workerProcess, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(slotWorkerProcessFinished(int, QProcess::ExitStatus)));
|
||||
|
||||
RIMainWindow::instance()->processMonitor()->startMonitorWorkProcess(m_workerProcess);
|
||||
RiuMainWindow::instance()->processMonitor()->startMonitorWorkProcess(m_workerProcess);
|
||||
|
||||
m_workerProcess->start(program, arguments);
|
||||
if (!m_workerProcess->waitForStarted(1000))
|
||||
@ -958,9 +958,9 @@ bool RiaApplication::launchProcess(const QString& program, const QStringList& ar
|
||||
m_workerProcess->close();
|
||||
m_workerProcess = NULL;
|
||||
|
||||
RIMainWindow::instance()->processMonitor()->stopMonitorWorkProcess();
|
||||
RiuMainWindow::instance()->processMonitor()->stopMonitorWorkProcess();
|
||||
|
||||
QMessageBox::warning(RIMainWindow::instance(), "Script execution", "Failed to start script executable located at\n" + program);
|
||||
QMessageBox::warning(RiuMainWindow::instance(), "Script execution", "Failed to start script executable located at\n" + program);
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -1054,7 +1054,7 @@ void RiaApplication::applyPreferences()
|
||||
if (this->project())
|
||||
{
|
||||
this->project()->setUserScriptPath(m_preferences->scriptDirectory());
|
||||
RimUiTreeModelPdm* treeModel = RIMainWindow::instance()->uiPdmModel();
|
||||
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel();
|
||||
if (treeModel) treeModel->rebuildUiSubTree(this->project()->scriptCollection());
|
||||
}
|
||||
|
||||
@ -1169,7 +1169,7 @@ void RiaApplication::copySnapshotToClipboard()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiaApplication::saveSnapshotForAllViews(const QString& snapshotFolderName)
|
||||
{
|
||||
RIMainWindow* mainWnd = RIMainWindow::instance();
|
||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||
if (!mainWnd) return;
|
||||
|
||||
if (m_project.isNull()) return;
|
||||
@ -1200,7 +1200,7 @@ void RiaApplication::saveSnapshotForAllViews(const QString& snapshotFolderName)
|
||||
{
|
||||
setActiveReservoirView(riv);
|
||||
|
||||
RIViewer* viewer = riv->viewer();
|
||||
RiuViewer* viewer = riv->viewer();
|
||||
mainWnd->setActiveViewer(viewer);
|
||||
|
||||
// Process all events to avoid a black image when grabbing frame buffer
|
||||
|
||||
@ -172,7 +172,7 @@ RimReservoirView::~RimReservoirView()
|
||||
|
||||
if (m_viewer)
|
||||
{
|
||||
RIMainWindow::instance()->removeViewer(m_viewer);
|
||||
RiuMainWindow::instance()->removeViewer(m_viewer);
|
||||
}
|
||||
|
||||
m_geometry->clearGeometryCache();
|
||||
@ -194,10 +194,10 @@ void RimReservoirView::updateViewerWidget()
|
||||
QGLFormat glFormat;
|
||||
glFormat.setDirectRendering(RiaApplication::instance()->useShaders());
|
||||
|
||||
m_viewer = new RIViewer(glFormat, NULL);
|
||||
m_viewer = new RiuViewer(glFormat, NULL);
|
||||
m_viewer->setOwnerReservoirView(this);
|
||||
|
||||
RIMainWindow::instance()->addViewer(m_viewer);
|
||||
RiuMainWindow::instance()->addViewer(m_viewer);
|
||||
m_viewer->setMinNearPlaneDistance(10);
|
||||
this->cellResult()->legendConfig->recreateLegend();
|
||||
this->cellEdgeResult()->legendConfig->recreateLegend();
|
||||
@ -220,7 +220,7 @@ void RimReservoirView::updateViewerWidget()
|
||||
isViewerCreated = true;
|
||||
}
|
||||
|
||||
RIMainWindow::instance()->setActiveViewer(m_viewer);
|
||||
RiuMainWindow::instance()->setActiveViewer(m_viewer);
|
||||
|
||||
if (isViewerCreated) m_viewer->mainCamera()->setViewMatrix(cameraPosition);
|
||||
m_viewer->mainCamera()->viewport()->setClearColor(cvf::Color4f(backgroundColor()));
|
||||
@ -303,7 +303,7 @@ void RimReservoirView::createDisplayModelAndRedraw()
|
||||
}
|
||||
}
|
||||
|
||||
RIMainWindow::instance()->refreshAnimationActions();
|
||||
RiuMainWindow::instance()->refreshAnimationActions();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@ -702,7 +702,7 @@ void RimReservoirView::loadDataAndUpdate()
|
||||
{
|
||||
if (!m_reservoir->openEclipseGridFile())
|
||||
{
|
||||
QMessageBox::warning(RIMainWindow::instance(), "Error when opening project file", "Could not open the Eclipse Grid file (EGRID/GRID): \n"+ m_reservoir->caseName());
|
||||
QMessageBox::warning(RiuMainWindow::instance(), "Error when opening project file", "Could not open the Eclipse Grid file (EGRID/GRID): \n"+ m_reservoir->caseName());
|
||||
m_reservoir = NULL;
|
||||
return;
|
||||
}
|
||||
@ -832,7 +832,7 @@ void RimReservoirView::updateStaticCellColors(unsigned short geometryType)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIViewer* RimReservoirView::viewer()
|
||||
RiuViewer* RimReservoirView::viewer()
|
||||
{
|
||||
return m_viewer;
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
#include "RivReservoirViewPartMgr.h"
|
||||
#include "RivReservoirPipesPartMgr.h"
|
||||
|
||||
class RIViewer;
|
||||
class RiuViewer;
|
||||
class RigGridBase;
|
||||
class RigGridCellFaceVisibilityFilter;
|
||||
class RivReservoirViewPartMgr;
|
||||
@ -130,7 +130,7 @@ public:
|
||||
void endAnimation();
|
||||
|
||||
// 3D Viewer
|
||||
RIViewer* viewer();
|
||||
RiuViewer* viewer();
|
||||
void updateViewerWidget();
|
||||
void updateViewerWidgetWindowTitle();
|
||||
void setDefaultView();
|
||||
@ -178,7 +178,7 @@ private:
|
||||
|
||||
private:
|
||||
caf::PdmField<int> m_currentTimeStep;
|
||||
QPointer<RIViewer> m_viewer;
|
||||
QPointer<RiuViewer> m_viewer;
|
||||
caf::PdmPointer<RimCase> m_reservoir;
|
||||
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ void RimResultSlot::changeLegendConfig(QString resultVarNameOfNewLegend)
|
||||
m_legendConfigData.v().erase(it);
|
||||
m_legendConfigData.v().push_back(this->legendConfig());
|
||||
this->legendConfig = newLegend;
|
||||
RIMainWindow::instance()->uiPdmModel()->rebuildUiSubTree(this);
|
||||
RiuMainWindow::instance()->uiPdmModel()->rebuildUiSubTree(this);
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
@ -105,7 +105,7 @@ void RimResultSlot::changeLegendConfig(QString resultVarNameOfNewLegend)
|
||||
newLegend->resultVariableName = resultVarNameOfNewLegend;
|
||||
m_legendConfigData.v().push_back(this->legendConfig());
|
||||
this->legendConfig = newLegend;
|
||||
RIMainWindow::instance()->uiPdmModel()->rebuildUiSubTree(this);
|
||||
RiuMainWindow::instance()->uiPdmModel()->rebuildUiSubTree(this);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -161,7 +161,7 @@ void RimScriptCollection::fieldChangedByUi(const caf::PdmFieldHandle *changedFie
|
||||
QFileInfo fi(directory);
|
||||
this->setUiName(fi.baseName());
|
||||
this->readContentFromDisc();
|
||||
RimUiTreeModelPdm* treeModel = RIMainWindow::instance()->uiPdmModel();
|
||||
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel();
|
||||
if (treeModel) treeModel->rebuildUiSubTree(this);
|
||||
}
|
||||
}
|
||||
|
||||
@ -437,7 +437,7 @@ void RimUiTreeView::slotEditScript()
|
||||
|
||||
if (!myProcess->waitForStarted(1000))
|
||||
{
|
||||
QMessageBox::warning(RIMainWindow::instance(), "Script editor", "Failed to start script editor executable\n" + scriptEditor);
|
||||
QMessageBox::warning(RiuMainWindow::instance(), "Script editor", "Failed to start script editor executable\n" + scriptEditor);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -494,7 +494,7 @@ void RimUiTreeView::slotNewScript()
|
||||
|
||||
if (!myProcess->waitForStarted(1000))
|
||||
{
|
||||
QMessageBox::warning(RIMainWindow::instance(), "Script editor", "Failed to start script editor executable\n" + scriptEditor);
|
||||
QMessageBox::warning(RiuMainWindow::instance(), "Script editor", "Failed to start script editor executable\n" + scriptEditor);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -676,7 +676,7 @@ void RimUiTreeView::slotWriteInputProperty()
|
||||
|
||||
if (!isResolved)
|
||||
{
|
||||
QMessageBox::warning(RIMainWindow::instance(), "Export failure", "Property is not resolved, and then it is not possible to export the property.");
|
||||
QMessageBox::warning(RiuMainWindow::instance(), "Export failure", "Property is not resolved, and then it is not possible to export the property.");
|
||||
|
||||
return;
|
||||
}
|
||||
@ -724,7 +724,7 @@ void RimUiTreeView::slotWriteInputProperty()
|
||||
exportSettings.fileName = outputFileName;
|
||||
}
|
||||
|
||||
RIPreferencesDialog preferencesDialog(this, &exportSettings, "Export Eclipse Property to Text File");
|
||||
RiuPreferencesDialog preferencesDialog(this, &exportSettings, "Export Eclipse Property to Text File");
|
||||
if (preferencesDialog.exec() == QDialog::Accepted)
|
||||
{
|
||||
bool isOk = RifEclipseInputFileTools::writePropertyToTextFile(exportSettings.fileName, inputReservoir->reservoirData(), 0, inputProperty->resultName, exportSettings.eclipseKeyword);
|
||||
@ -777,7 +777,7 @@ void RimUiTreeView::slotWriteBinaryResultAsInputProperty()
|
||||
exportSettings.fileName = outputFileName;
|
||||
}
|
||||
|
||||
RIPreferencesDialog preferencesDialog(this, &exportSettings, "Export Binary Eclipse Data to Text File");
|
||||
RiuPreferencesDialog preferencesDialog(this, &exportSettings, "Export Binary Eclipse Data to Text File");
|
||||
if (preferencesDialog.exec() == QDialog::Accepted)
|
||||
{
|
||||
size_t timeStep = resultSlot->reservoirView()->currentTimeStep();
|
||||
|
||||
@ -27,7 +27,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
|
||||
|
||||
RIMainWindow window;
|
||||
RiuMainWindow window;
|
||||
QString platform = cvf::System::is64Bit() ? "(64bit)" : "(32bit)";
|
||||
window.setWindowTitle("ResInsight " + platform);
|
||||
window.resize(1000, 800);
|
||||
|
||||
@ -47,7 +47,7 @@ RiaSocketServer::RiaSocketServer(QObject* parent)
|
||||
m_invalidActiveCellCountDetected(false),
|
||||
m_readState(ReadingCommand)
|
||||
{
|
||||
m_errorMessageDialog = new QErrorMessage(RIMainWindow::instance());
|
||||
m_errorMessageDialog = new QErrorMessage(RiuMainWindow::instance());
|
||||
|
||||
// TCP server setup
|
||||
|
||||
@ -514,7 +514,7 @@ void RiaSocketServer::readPropertyDataFromOctave()
|
||||
inputProperty->eclipseKeyword = "";
|
||||
inputProperty->fileName = "";
|
||||
inputRes->m_inputPropertyCollection->inputProperties.push_back(inputProperty);
|
||||
RimUiTreeModelPdm* treeModel = RIMainWindow::instance()->uiPdmModel();
|
||||
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel();
|
||||
treeModel->rebuildUiSubTree(inputRes->m_inputPropertyCollection());
|
||||
}
|
||||
inputProperty->resolvedState = RimInputProperty::RESOLVED_NOT_SAVED;
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RICursors::RICursors()
|
||||
RiuCursors::RiuCursors()
|
||||
{
|
||||
m_cursors[FILTER_BOX] = cursorFromFile(":/Cursors/curFilterBox.bmp", 10, 10);
|
||||
m_cursors[NORMAL] = cursorFromFile(":/Cursors/curNormal.bmp", 10, 10);
|
||||
@ -53,10 +53,10 @@ RICursors::RICursors()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QCursor RICursors::get(CursorIndex cursorIdx)
|
||||
QCursor RiuCursors::get(CursorIndex cursorIdx)
|
||||
{
|
||||
// Create our single instance in a local static variable
|
||||
static RICursors myStaticInstance;
|
||||
static RiuCursors myStaticInstance;
|
||||
|
||||
return myStaticInstance.m_cursors[cursorIdx];
|
||||
}
|
||||
@ -65,7 +65,7 @@ QCursor RICursors::get(CursorIndex cursorIdx)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QCursor RICursors::cursorFromFile(const QString& fileName, int hotspotX, int hotspotY)
|
||||
QCursor RiuCursors::cursorFromFile(const QString& fileName, int hotspotX, int hotspotY)
|
||||
{
|
||||
QImage image(fileName);
|
||||
if (image.width() == 0 || image.height() == 0)
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
// Singleton for getting the cursors
|
||||
//
|
||||
//==================================================================================================
|
||||
class RICursors
|
||||
class RiuCursors
|
||||
{
|
||||
public:
|
||||
enum CursorIndex
|
||||
@ -48,7 +48,7 @@ public:
|
||||
static QCursor get(CursorIndex cursorIdx);
|
||||
|
||||
private:
|
||||
RICursors();
|
||||
RiuCursors();
|
||||
static QCursor cursorFromFile(const QString& fileName, int hotspotX = -1, int hotspotY = -1);
|
||||
|
||||
private:
|
||||
|
||||
@ -53,12 +53,12 @@
|
||||
//==================================================================================================
|
||||
|
||||
|
||||
RIMainWindow* RIMainWindow::sm_mainWindowInstance = NULL;
|
||||
RiuMainWindow* RiuMainWindow::sm_mainWindowInstance = NULL;
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIMainWindow::RIMainWindow()
|
||||
RiuMainWindow::RiuMainWindow()
|
||||
: m_treeView(NULL),
|
||||
m_pdmRoot(NULL),
|
||||
m_mainViewer(NULL),
|
||||
@ -103,7 +103,7 @@ RIMainWindow::RIMainWindow()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIMainWindow* RIMainWindow::instance()
|
||||
RiuMainWindow* RiuMainWindow::instance()
|
||||
{
|
||||
return sm_mainWindowInstance;
|
||||
}
|
||||
@ -111,7 +111,7 @@ RIMainWindow* RIMainWindow::instance()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::initializeGuiNewProjectLoaded()
|
||||
void RiuMainWindow::initializeGuiNewProjectLoaded()
|
||||
{
|
||||
slotRefreshFileActions();
|
||||
slotRefreshEditActions();
|
||||
@ -122,7 +122,7 @@ void RIMainWindow::initializeGuiNewProjectLoaded()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::cleanupGuiBeforeProjectClose()
|
||||
void RiuMainWindow::cleanupGuiBeforeProjectClose()
|
||||
{
|
||||
setPdmRoot(NULL);
|
||||
setResultInfo("");
|
||||
@ -138,7 +138,7 @@ void RIMainWindow::cleanupGuiBeforeProjectClose()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Lightweight refresh of GUI (mainly toolbar actions). Called during idle processing
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::refreshGuiLightweight()
|
||||
void RiuMainWindow::refreshGuiLightweight()
|
||||
{
|
||||
refreshToolbars();
|
||||
}
|
||||
@ -146,7 +146,7 @@ void RIMainWindow::refreshGuiLightweight()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::refreshToolbars()
|
||||
void RiuMainWindow::refreshToolbars()
|
||||
{
|
||||
slotRefreshFileActions();
|
||||
slotRefreshViewActions();
|
||||
@ -155,7 +155,7 @@ void RIMainWindow::refreshToolbars()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::closeEvent(QCloseEvent* event)
|
||||
void RiuMainWindow::closeEvent(QCloseEvent* event)
|
||||
{
|
||||
if (!RiaApplication::instance()->closeProject(true))
|
||||
{
|
||||
@ -173,7 +173,7 @@ void RIMainWindow::closeEvent(QCloseEvent* event)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::createActions()
|
||||
void RiuMainWindow::createActions()
|
||||
{
|
||||
// File actions
|
||||
m_openAction = new QAction(QIcon(":/AppLogo48x48.png"), "&Open Eclipse Case", this);
|
||||
@ -262,7 +262,7 @@ void RIMainWindow::createActions()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::createMenus()
|
||||
void RiuMainWindow::createMenus()
|
||||
{
|
||||
// File menu
|
||||
QMenu* fileMenu = menuBar()->addMenu("&File");
|
||||
@ -330,7 +330,7 @@ void RIMainWindow::createMenus()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::createToolBars()
|
||||
void RiuMainWindow::createToolBars()
|
||||
{
|
||||
|
||||
m_standardToolBar = addToolBar(tr("Standard"));
|
||||
@ -366,7 +366,7 @@ void RIMainWindow::createToolBars()
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
void RIMainWindow::createDockPanels()
|
||||
void RiuMainWindow::createDockPanels()
|
||||
{
|
||||
{
|
||||
QDockWidget* dockWidget = new QDockWidget("Project", this);
|
||||
@ -392,7 +392,7 @@ void RIMainWindow::createDockPanels()
|
||||
QDockWidget* dockPanel = new QDockWidget("Result Info", this);
|
||||
dockPanel->setObjectName("dockResultInfoPanel");
|
||||
dockPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
|
||||
m_resultInfoPanel = new RIResultInfoPanel(dockPanel);
|
||||
m_resultInfoPanel = new RiuResultInfoPanel(dockPanel);
|
||||
dockPanel->setWidget(m_resultInfoPanel);
|
||||
|
||||
addDockWidget(Qt::BottomDockWidgetArea, dockPanel);
|
||||
@ -402,7 +402,7 @@ void RIMainWindow::createDockPanels()
|
||||
QDockWidget* dockPanel = new QDockWidget("Process Monitor", this);
|
||||
dockPanel->setObjectName("dockProcessMonitor");
|
||||
dockPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
|
||||
m_processMonitor = new RIProcessMonitor(dockPanel);
|
||||
m_processMonitor = new RiuProcessMonitor(dockPanel);
|
||||
dockPanel->setWidget(m_processMonitor);
|
||||
|
||||
addDockWidget(Qt::BottomDockWidgetArea, dockPanel);
|
||||
@ -429,7 +429,7 @@ void RIMainWindow::createDockPanels()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::saveWinGeoAndDockToolBarLayout()
|
||||
void RiuMainWindow::saveWinGeoAndDockToolBarLayout()
|
||||
{
|
||||
// Company and appname set through QCoreApplication
|
||||
QSettings settings;
|
||||
@ -445,7 +445,7 @@ void RIMainWindow::saveWinGeoAndDockToolBarLayout()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::loadWinGeoAndDockToolBarLayout()
|
||||
void RiuMainWindow::loadWinGeoAndDockToolBarLayout()
|
||||
{
|
||||
// Company and appname set through QCoreApplication
|
||||
QSettings settings;
|
||||
@ -468,7 +468,7 @@ void RIMainWindow::loadWinGeoAndDockToolBarLayout()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::setResultInfo(const QString& info) const
|
||||
void RiuMainWindow::setResultInfo(const QString& info) const
|
||||
{
|
||||
m_resultInfoPanel->setInfo(info);
|
||||
}
|
||||
@ -484,7 +484,7 @@ void RIMainWindow::setResultInfo(const QString& info) const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotRefreshFileActions()
|
||||
void RiuMainWindow::slotRefreshFileActions()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
|
||||
@ -498,7 +498,7 @@ void RIMainWindow::slotRefreshFileActions()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotRefreshEditActions()
|
||||
void RiuMainWindow::slotRefreshEditActions()
|
||||
{
|
||||
// RiaApplication* app = RiaApplication::instance();
|
||||
// RISceneManager* proj = app->project();
|
||||
@ -508,7 +508,7 @@ void RIMainWindow::slotRefreshEditActions()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotRefreshViewActions()
|
||||
void RiuMainWindow::slotRefreshViewActions()
|
||||
{
|
||||
// RiaApplication* app = RiaApplication::instance();
|
||||
// RISceneManager* proj = app->project();
|
||||
@ -525,7 +525,7 @@ void RIMainWindow::slotRefreshViewActions()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::refreshAnimationActions()
|
||||
void RiuMainWindow::refreshAnimationActions()
|
||||
{
|
||||
caf::FrameAnimationControl* ac = NULL;
|
||||
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
|
||||
@ -593,7 +593,7 @@ void RIMainWindow::refreshAnimationActions()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotAbout()
|
||||
void RiuMainWindow::slotAbout()
|
||||
{
|
||||
cvfqt::BasicAboutDialog dlg(this);
|
||||
|
||||
@ -626,7 +626,7 @@ void RIMainWindow::slotAbout()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotOpenBinaryGridFiles()
|
||||
void RiuMainWindow::slotOpenBinaryGridFiles()
|
||||
{
|
||||
if (checkForDocumentModifications())
|
||||
{
|
||||
@ -654,7 +654,7 @@ void RIMainWindow::slotOpenBinaryGridFiles()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotOpenInputFiles()
|
||||
void RiuMainWindow::slotOpenInputFiles()
|
||||
{
|
||||
if (checkForDocumentModifications())
|
||||
{
|
||||
@ -675,7 +675,7 @@ void RIMainWindow::slotOpenInputFiles()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotOpenProject()
|
||||
void RiuMainWindow::slotOpenProject()
|
||||
{
|
||||
if (checkForDocumentModifications())
|
||||
{
|
||||
@ -697,7 +697,7 @@ void RIMainWindow::slotOpenProject()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotOpenLastUsedProject()
|
||||
void RiuMainWindow::slotOpenLastUsedProject()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
app->loadLastUsedProject();
|
||||
@ -706,7 +706,7 @@ void RIMainWindow::slotOpenLastUsedProject()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotMockModel()
|
||||
void RiuMainWindow::slotMockModel()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
app->createMockModel();
|
||||
@ -717,7 +717,7 @@ void RIMainWindow::slotMockModel()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotMockResultsModel()
|
||||
void RiuMainWindow::slotMockResultsModel()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
app->createResultsMockModel();
|
||||
@ -729,7 +729,7 @@ void RIMainWindow::slotMockResultsModel()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotMockLargeResultsModel()
|
||||
void RiuMainWindow::slotMockLargeResultsModel()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
app->createLargeResultsMockModel();
|
||||
@ -739,7 +739,7 @@ void RIMainWindow::slotMockLargeResultsModel()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotInputMockModel()
|
||||
void RiuMainWindow::slotInputMockModel()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
app->createInputMockModel();
|
||||
@ -749,7 +749,7 @@ void RIMainWindow::slotInputMockModel()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotSetCurrentFrame(int frameIndex)
|
||||
void RiuMainWindow::slotSetCurrentFrame(int frameIndex)
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
// app->setTimeStep(frameIndex);
|
||||
@ -758,7 +758,7 @@ void RIMainWindow::slotSetCurrentFrame(int frameIndex)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RIMainWindow::checkForDocumentModifications()
|
||||
bool RiuMainWindow::checkForDocumentModifications()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
// RISceneManager* project = app->sceneManager();
|
||||
@ -788,7 +788,7 @@ bool RIMainWindow::checkForDocumentModifications()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotCloseProject()
|
||||
void RiuMainWindow::slotCloseProject()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
bool ret = app->closeProject(true);
|
||||
@ -798,7 +798,7 @@ void RIMainWindow::slotCloseProject()
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
QMdiSubWindow* RIMainWindow::findMdiSubWindow(RIViewer* viewer)
|
||||
QMdiSubWindow* RiuMainWindow::findMdiSubWindow(RiuViewer* viewer)
|
||||
{
|
||||
QList<QMdiSubWindow*> subws = m_mdiArea->subWindowList();
|
||||
int i;
|
||||
@ -817,7 +817,7 @@ QMdiSubWindow* RIMainWindow::findMdiSubWindow(RIViewer* viewer)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::removeViewer(RIViewer* viewer)
|
||||
void RiuMainWindow::removeViewer(RiuViewer* viewer)
|
||||
{
|
||||
#if 0
|
||||
m_CentralFrame->layout()->removeWidget(viewer->layoutWidget());
|
||||
@ -829,7 +829,7 @@ void RIMainWindow::removeViewer(RIViewer* viewer)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::addViewer(RIViewer* viewer)
|
||||
void RiuMainWindow::addViewer(RiuViewer* viewer)
|
||||
{
|
||||
#if 0
|
||||
m_CentralFrame->layout()->addWidget(viewer->layoutWidget());
|
||||
@ -852,7 +852,7 @@ void RIMainWindow::addViewer(RIViewer* viewer)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotSaveProject()
|
||||
void RiuMainWindow::slotSaveProject()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
|
||||
@ -862,7 +862,7 @@ void RIMainWindow::slotSaveProject()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotSaveProjectAs()
|
||||
void RiuMainWindow::slotSaveProjectAs()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
|
||||
@ -873,7 +873,7 @@ void RIMainWindow::slotSaveProjectAs()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// This method needs to handle memory deallocation !!!
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::setPdmRoot(caf::PdmObject* pdmRoot)
|
||||
void RiuMainWindow::setPdmRoot(caf::PdmObject* pdmRoot)
|
||||
{
|
||||
m_pdmRoot = pdmRoot;
|
||||
|
||||
@ -891,7 +891,7 @@ void RIMainWindow::setPdmRoot(caf::PdmObject* pdmRoot)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotViewFromNorth()
|
||||
void RiuMainWindow::slotViewFromNorth()
|
||||
{
|
||||
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
|
||||
{
|
||||
@ -902,7 +902,7 @@ void RIMainWindow::slotViewFromNorth()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotViewFromSouth()
|
||||
void RiuMainWindow::slotViewFromSouth()
|
||||
{
|
||||
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
|
||||
{
|
||||
@ -913,7 +913,7 @@ void RIMainWindow::slotViewFromSouth()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotViewFromEast()
|
||||
void RiuMainWindow::slotViewFromEast()
|
||||
{
|
||||
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
|
||||
{
|
||||
@ -924,7 +924,7 @@ void RIMainWindow::slotViewFromEast()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotViewFromWest()
|
||||
void RiuMainWindow::slotViewFromWest()
|
||||
{
|
||||
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
|
||||
{
|
||||
@ -935,7 +935,7 @@ void RIMainWindow::slotViewFromWest()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotViewFromAbove()
|
||||
void RiuMainWindow::slotViewFromAbove()
|
||||
{
|
||||
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
|
||||
{
|
||||
@ -946,7 +946,7 @@ void RIMainWindow::slotViewFromAbove()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotViewFromBelow()
|
||||
void RiuMainWindow::slotViewFromBelow()
|
||||
{
|
||||
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
|
||||
{
|
||||
@ -957,7 +957,7 @@ void RIMainWindow::slotViewFromBelow()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotZoomAll()
|
||||
void RiuMainWindow::slotZoomAll()
|
||||
{
|
||||
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
|
||||
{
|
||||
@ -968,7 +968,7 @@ void RIMainWindow::slotZoomAll()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
|
||||
void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
|
||||
{
|
||||
RimProject * proj = RiaApplication::instance()->project();
|
||||
if (!proj) return;
|
||||
@ -1050,7 +1050,7 @@ void RIMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotUseShaders(bool enable)
|
||||
void RiuMainWindow::slotUseShaders(bool enable)
|
||||
{
|
||||
RiaApplication::instance()->setUseShaders(enable);
|
||||
}
|
||||
@ -1058,7 +1058,7 @@ void RIMainWindow::slotUseShaders(bool enable)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotShowPerformanceInfo(bool enable)
|
||||
void RiuMainWindow::slotShowPerformanceInfo(bool enable)
|
||||
{
|
||||
RiaApplication::instance()->setShowPerformanceInfo(enable);
|
||||
}
|
||||
@ -1066,7 +1066,7 @@ void RIMainWindow::slotShowPerformanceInfo(bool enable)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotRefreshDebugActions()
|
||||
void RiuMainWindow::slotRefreshDebugActions()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
}
|
||||
@ -1074,10 +1074,10 @@ void RIMainWindow::slotRefreshDebugActions()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotEditPreferences()
|
||||
void RiuMainWindow::slotEditPreferences()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
RIPreferencesDialog preferencesDialog(this, app->preferences(), "Preferences");
|
||||
RiuPreferencesDialog preferencesDialog(this, app->preferences(), "Preferences");
|
||||
if (preferencesDialog.exec() == QDialog::Accepted)
|
||||
{
|
||||
// Write preferences using QSettings and apply them to the application
|
||||
@ -1094,7 +1094,7 @@ void RIMainWindow::slotEditPreferences()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::setActiveViewer(RIViewer* viewer)
|
||||
void RiuMainWindow::setActiveViewer(RiuViewer* viewer)
|
||||
{
|
||||
QMdiSubWindow * swin = findMdiSubWindow(viewer);
|
||||
if (swin) m_mdiArea->setActiveSubWindow(swin);
|
||||
@ -1103,7 +1103,7 @@ void RIMainWindow::setActiveViewer(RIViewer* viewer)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotFramerateChanged(double frameRate)
|
||||
void RiuMainWindow::slotFramerateChanged(double frameRate)
|
||||
{
|
||||
if (RiaApplication::instance()->activeReservoirView() != NULL)
|
||||
{
|
||||
@ -1114,7 +1114,7 @@ void RIMainWindow::slotFramerateChanged(double frameRate)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIProcessMonitor* RIMainWindow::processMonitor()
|
||||
RiuProcessMonitor* RiuMainWindow::processMonitor()
|
||||
{
|
||||
return m_processMonitor;
|
||||
}
|
||||
@ -1122,7 +1122,7 @@ RIProcessMonitor* RIMainWindow::processMonitor()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotBuildWindowActions()
|
||||
void RiuMainWindow::slotBuildWindowActions()
|
||||
{
|
||||
m_windowMenu->clear();
|
||||
|
||||
@ -1139,7 +1139,7 @@ void RIMainWindow::slotBuildWindowActions()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotCurrentChanged(const QModelIndex & current, const QModelIndex & previous)
|
||||
void RiuMainWindow::slotCurrentChanged(const QModelIndex & current, const QModelIndex & previous)
|
||||
{
|
||||
RimReservoirView* activeReservoirView = RiaApplication::instance()->activeReservoirView();
|
||||
QModelIndex activeViewModelIndex = m_treeModelPdm->getModelIndexFromPdmObject(activeReservoirView);
|
||||
@ -1185,7 +1185,7 @@ void RIMainWindow::slotCurrentChanged(const QModelIndex & current, const QModelI
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotNewObjectPropertyView()
|
||||
void RiuMainWindow::slotNewObjectPropertyView()
|
||||
{
|
||||
if (!m_treeModelPdm) return;
|
||||
|
||||
@ -1223,7 +1223,7 @@ void RIMainWindow::slotNewObjectPropertyView()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotSnapshotToFile()
|
||||
void RiuMainWindow::slotSnapshotToFile()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
|
||||
@ -1233,7 +1233,7 @@ void RIMainWindow::slotSnapshotToFile()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotSnapshotToClipboard()
|
||||
void RiuMainWindow::slotSnapshotToClipboard()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
|
||||
@ -1243,7 +1243,7 @@ void RIMainWindow::slotSnapshotToClipboard()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotSnapshotAllViewsToFile()
|
||||
void RiuMainWindow::slotSnapshotAllViewsToFile()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
|
||||
@ -1253,7 +1253,7 @@ void RIMainWindow::slotSnapshotAllViewsToFile()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::hideAllDockWindows()
|
||||
void RiuMainWindow::hideAllDockWindows()
|
||||
{
|
||||
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
|
||||
|
||||
@ -1267,7 +1267,7 @@ void RIMainWindow::hideAllDockWindows()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIMainWindow::slotOpenMultipleCases()
|
||||
void RiuMainWindow::slotOpenMultipleCases()
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
|
||||
|
||||
@ -32,9 +32,9 @@ class QLabel;
|
||||
class QLineEdit;
|
||||
class QItemSelection;
|
||||
|
||||
class RIViewer;
|
||||
class RIResultInfoPanel;
|
||||
class RIProcessMonitor;
|
||||
class RiuViewer;
|
||||
class RiuResultInfoPanel;
|
||||
class RiuProcessMonitor;
|
||||
class RimUiTreeModelPdm;
|
||||
|
||||
namespace caf
|
||||
@ -52,13 +52,13 @@ namespace caf
|
||||
//
|
||||
//
|
||||
//==================================================================================================
|
||||
class RIMainWindow : public QMainWindow
|
||||
class RiuMainWindow : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RIMainWindow();
|
||||
static RIMainWindow* instance();
|
||||
RiuMainWindow();
|
||||
static RiuMainWindow* instance();
|
||||
|
||||
void initializeGuiNewProjectLoaded();
|
||||
void cleanupGuiBeforeProjectClose();
|
||||
@ -66,9 +66,9 @@ public:
|
||||
void refreshGuiLightweight();
|
||||
void refreshToolbars();
|
||||
|
||||
void removeViewer( RIViewer* viewer );
|
||||
void addViewer(RIViewer* viewer);
|
||||
void setActiveViewer(RIViewer* subWindow);
|
||||
void removeViewer( RiuViewer* viewer );
|
||||
void addViewer(RiuViewer* viewer);
|
||||
void setActiveViewer(RiuViewer* subWindow);
|
||||
|
||||
void setResultInfo(const QString& info) const;
|
||||
|
||||
@ -76,7 +76,7 @@ public:
|
||||
|
||||
RimUiTreeModelPdm* uiPdmModel() { return m_treeModelPdm;}
|
||||
|
||||
RIProcessMonitor* processMonitor();
|
||||
RiuProcessMonitor* processMonitor();
|
||||
|
||||
void hideAllDockWindows();
|
||||
|
||||
@ -95,10 +95,10 @@ private:
|
||||
|
||||
void updateMRUList(const QString &fileName, bool remove = false);
|
||||
|
||||
QMdiSubWindow* findMdiSubWindow(RIViewer* viewer);
|
||||
QMdiSubWindow* findMdiSubWindow(RiuViewer* viewer);
|
||||
|
||||
private:
|
||||
static RIMainWindow* sm_mainWindowInstance;
|
||||
static RiuMainWindow* sm_mainWindowInstance;
|
||||
|
||||
QByteArray m_initialDockAndToolbarLayout; // Initial dock window and toolbar layout, used to reset GUI
|
||||
|
||||
@ -150,9 +150,9 @@ private:
|
||||
|
||||
QFrame* m_CentralFrame;
|
||||
QMdiArea* m_mdiArea;
|
||||
RIViewer* m_mainViewer;
|
||||
RIResultInfoPanel* m_resultInfoPanel;
|
||||
RIProcessMonitor* m_processMonitor;
|
||||
RiuViewer* m_mainViewer;
|
||||
RiuResultInfoPanel* m_resultInfoPanel;
|
||||
RiuProcessMonitor* m_processMonitor;
|
||||
|
||||
QMenu* m_windowMenu;
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIPreferencesDialog::RIPreferencesDialog(QWidget* parent, caf::PdmObject* object, const QString& windowTitle)
|
||||
RiuPreferencesDialog::RiuPreferencesDialog(QWidget* parent, caf::PdmObject* object, const QString& windowTitle)
|
||||
: QDialog(parent)
|
||||
{
|
||||
CVF_ASSERT(object);
|
||||
@ -44,7 +44,7 @@ RIPreferencesDialog::RIPreferencesDialog(QWidget* parent, caf::PdmObject* object
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIPreferencesDialog::setupUi()
|
||||
void RiuPreferencesDialog::setupUi()
|
||||
{
|
||||
setWindowTitle(m_windowTitle);
|
||||
|
||||
|
||||
@ -32,12 +32,12 @@ namespace caf
|
||||
//
|
||||
//
|
||||
//==================================================================================================
|
||||
class RIPreferencesDialog : public QDialog
|
||||
class RiuPreferencesDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RIPreferencesDialog(QWidget* parent, caf::PdmObject* object, const QString& windowTitle);
|
||||
RiuPreferencesDialog(QWidget* parent, caf::PdmObject* object, const QString& windowTitle);
|
||||
|
||||
private:
|
||||
void setupUi();
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIProcessMonitor::RIProcessMonitor(QDockWidget* pParent)
|
||||
RiuProcessMonitor::RiuProcessMonitor(QDockWidget* pParent)
|
||||
: QWidget(pParent)
|
||||
{
|
||||
m_monitoredProcess = NULL;
|
||||
@ -70,7 +70,7 @@ RIProcessMonitor::RIProcessMonitor(QDockWidget* pParent)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIProcessMonitor::~RIProcessMonitor()
|
||||
RiuProcessMonitor::~RiuProcessMonitor()
|
||||
{
|
||||
|
||||
}
|
||||
@ -79,7 +79,7 @@ RIProcessMonitor::~RIProcessMonitor()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::startMonitorWorkProcess(caf::UiProcess* pProcess)
|
||||
void RiuProcessMonitor::startMonitorWorkProcess(caf::UiProcess* pProcess)
|
||||
{
|
||||
setStatusMsg("N/A", caf::PROCESS_STATE_NORMAL);
|
||||
|
||||
@ -102,7 +102,7 @@ void RIProcessMonitor::startMonitorWorkProcess(caf::UiProcess* pProcess)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::stopMonitorWorkProcess()
|
||||
void RiuProcessMonitor::stopMonitorWorkProcess()
|
||||
{
|
||||
m_monitoredProcess = NULL;
|
||||
|
||||
@ -118,7 +118,7 @@ void RIProcessMonitor::stopMonitorWorkProcess()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::setStatusMsg(const QString& sStatusMsg, int iStatusMsgType)
|
||||
void RiuProcessMonitor::setStatusMsg(const QString& sStatusMsg, int iStatusMsgType)
|
||||
{
|
||||
if (!m_labelStatus) return;
|
||||
|
||||
@ -138,7 +138,7 @@ void RIProcessMonitor::setStatusMsg(const QString& sStatusMsg, int iStatusMsgTyp
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::addStringToLog(const QString& sTxt)
|
||||
void RiuProcessMonitor::addStringToLog(const QString& sTxt)
|
||||
{
|
||||
m_textEdit->moveCursor(QTextCursor::End);
|
||||
m_textEdit->insertPlainText(sTxt);
|
||||
@ -150,7 +150,7 @@ void RIProcessMonitor::addStringToLog(const QString& sTxt)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::slotShowProcStatusMsg(const QString& sMsg, int iStatusMsgType)
|
||||
void RiuProcessMonitor::slotShowProcStatusMsg(const QString& sMsg, int iStatusMsgType)
|
||||
{
|
||||
setStatusMsg(sMsg, iStatusMsgType);
|
||||
}
|
||||
@ -159,7 +159,7 @@ void RIProcessMonitor::slotShowProcStatusMsg(const QString& sMsg, int iStatusMsg
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::slotProcReadyReadStdOut()
|
||||
void RiuProcessMonitor::slotProcReadyReadStdOut()
|
||||
{
|
||||
if (!m_monitoredProcess) return;
|
||||
|
||||
@ -174,7 +174,7 @@ void RIProcessMonitor::slotProcReadyReadStdOut()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::slotProcReadyReadStdErr()
|
||||
void RiuProcessMonitor::slotProcReadyReadStdErr()
|
||||
{
|
||||
if (!m_monitoredProcess) return;
|
||||
|
||||
@ -188,7 +188,7 @@ void RIProcessMonitor::slotProcReadyReadStdErr()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::slotTerminateProcess()
|
||||
void RiuProcessMonitor::slotTerminateProcess()
|
||||
{
|
||||
addStringToLog("Process terminated by user\n");
|
||||
|
||||
@ -199,7 +199,7 @@ void RIProcessMonitor::slotTerminateProcess()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIProcessMonitor::slotClearTextEdit()
|
||||
void RiuProcessMonitor::slotClearTextEdit()
|
||||
{
|
||||
m_textEdit->clear();
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ namespace caf
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
class RIProcessMonitor : public QWidget
|
||||
class RiuProcessMonitor : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@ -46,8 +46,8 @@ private:
|
||||
caf::UiProcess* m_monitoredProcess; // Pointer to the process we're monitoring. Needed to fetch text
|
||||
|
||||
public:
|
||||
RIProcessMonitor(QDockWidget* pParent);
|
||||
~RIProcessMonitor();
|
||||
RiuProcessMonitor(QDockWidget* pParent);
|
||||
~RiuProcessMonitor();
|
||||
|
||||
void startMonitorWorkProcess(caf::UiProcess* process);
|
||||
void stopMonitorWorkProcess();
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIResultInfoPanel::RIResultInfoPanel(QDockWidget* parent)
|
||||
RiuResultInfoPanel::RiuResultInfoPanel(QDockWidget* parent)
|
||||
: QWidget(parent)
|
||||
{
|
||||
m_textEdit = new QTextEdit(this);
|
||||
@ -49,7 +49,7 @@ RIResultInfoPanel::RIResultInfoPanel(QDockWidget* parent)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIResultInfoPanel::setInfo(const QString& info)
|
||||
void RiuResultInfoPanel::setInfo(const QString& info)
|
||||
{
|
||||
QString tmp(info);
|
||||
|
||||
@ -62,7 +62,7 @@ void RIResultInfoPanel::setInfo(const QString& info)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIResultInfoPanel::convertStringToHTML(QString* str)
|
||||
void RiuResultInfoPanel::convertStringToHTML(QString* str)
|
||||
{
|
||||
str->replace("\n", "<br>");
|
||||
str->replace(" ", " ");
|
||||
@ -72,7 +72,7 @@ void RIResultInfoPanel::convertStringToHTML(QString* str)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QSize RIResultInfoPanel::sizeHint () const
|
||||
QSize RiuResultInfoPanel::sizeHint () const
|
||||
{
|
||||
// As small as possible fow now
|
||||
return QSize(20, 20);
|
||||
|
||||
@ -30,12 +30,12 @@ class QTextEdit;
|
||||
// RIResultInfoPanel
|
||||
//
|
||||
//==================================================================================================
|
||||
class RIResultInfoPanel : public QWidget
|
||||
class RiuResultInfoPanel : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RIResultInfoPanel(QDockWidget* parent);
|
||||
RiuResultInfoPanel(QDockWidget* parent);
|
||||
|
||||
void setInfo(const QString& info);
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ const double RI_MIN_NEARPLANE_DISTANCE = 0.1;
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIViewer::RIViewer(const QGLFormat& format, QWidget* parent)
|
||||
RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
|
||||
: caf::Viewer(format, parent)
|
||||
{
|
||||
cvf::FixedAtlasFont* font = new cvf::FixedAtlasFont(cvf::FixedAtlasFont::STANDARD);
|
||||
@ -113,7 +113,7 @@ RIViewer::RIViewer(const QGLFormat& format, QWidget* parent)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RIViewer::~RIViewer()
|
||||
RiuViewer::~RiuViewer()
|
||||
{
|
||||
m_reservoirView->showWindow = false;
|
||||
m_reservoirView->cameraPosition = m_mainCamera->viewMatrix();
|
||||
@ -128,7 +128,7 @@ RIViewer::~RIViewer()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setColorLegend1(cvf::OverlayScalarMapperLegend* legend)
|
||||
void RiuViewer::setColorLegend1(cvf::OverlayScalarMapperLegend* legend)
|
||||
{
|
||||
m_mainRendering->removeOverlayItem(m_legend1.p());
|
||||
|
||||
@ -141,7 +141,7 @@ void RIViewer::setColorLegend1(cvf::OverlayScalarMapperLegend* legend)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setColorLegend2(cvf::OverlayScalarMapperLegend* legend)
|
||||
void RiuViewer::setColorLegend2(cvf::OverlayScalarMapperLegend* legend)
|
||||
{
|
||||
m_mainRendering->removeOverlayItem(m_legend2.p());
|
||||
|
||||
@ -153,7 +153,7 @@ void RIViewer::setColorLegend2(cvf::OverlayScalarMapperLegend* legend)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::updateLegends()
|
||||
void RiuViewer::updateLegends()
|
||||
{
|
||||
cvf::Rendering* firstRendering = m_renderingSequence->firstRendering();
|
||||
CVF_ASSERT(firstRendering);
|
||||
@ -175,7 +175,7 @@ void RIViewer::updateLegends()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setDefaultView()
|
||||
void RiuViewer::setDefaultView()
|
||||
{
|
||||
cvf::BoundingBox bb;
|
||||
|
||||
@ -211,7 +211,7 @@ void RIViewer::setDefaultView()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::mouseReleaseEvent(QMouseEvent* event)
|
||||
void RiuViewer::mouseReleaseEvent(QMouseEvent* event)
|
||||
{
|
||||
m_mouseState.updateFromMouseEvent(event);
|
||||
|
||||
@ -233,7 +233,7 @@ void RIViewer::mouseReleaseEvent(QMouseEvent* event)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::keyPressEvent(QKeyEvent* event)
|
||||
void RiuViewer::keyPressEvent(QKeyEvent* event)
|
||||
{
|
||||
// Trap escape key so we can get out of direct button press actions
|
||||
if (event->key() == Qt::Key_Escape)
|
||||
@ -246,11 +246,11 @@ void RIViewer::keyPressEvent(QKeyEvent* event)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::handlePickAction(int winPosX, int winPosY)
|
||||
void RiuViewer::handlePickAction(int winPosX, int winPosY)
|
||||
{
|
||||
RiaApplication* app = RiaApplication::instance();
|
||||
|
||||
RIMainWindow* mainWnd = RIMainWindow::instance();
|
||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||
if (!mainWnd) return;
|
||||
|
||||
QString pickInfo = "No hits";
|
||||
@ -310,7 +310,7 @@ void RIViewer::handlePickAction(int winPosX, int winPosY)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::slotEndAnimation()
|
||||
void RiuViewer::slotEndAnimation()
|
||||
{
|
||||
cvf::Rendering* firstRendering = m_renderingSequence->firstRendering();
|
||||
CVF_ASSERT(firstRendering);
|
||||
@ -328,7 +328,7 @@ void RIViewer::slotEndAnimation()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::slotSetCurrentFrame(int frameIndex)
|
||||
void RiuViewer::slotSetCurrentFrame(int frameIndex)
|
||||
{
|
||||
cvf::Rendering* firstRendering = m_renderingSequence->firstRendering();
|
||||
CVF_ASSERT(firstRendering);
|
||||
@ -343,7 +343,7 @@ void RIViewer::slotSetCurrentFrame(int frameIndex)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
cvf::Vec3d RIViewer::pointOfInterest()
|
||||
cvf::Vec3d RiuViewer::pointOfInterest()
|
||||
{
|
||||
return m_navigationPolicy->pointOfInterest();
|
||||
}
|
||||
@ -351,7 +351,7 @@ cvf::Vec3d RIViewer::pointOfInterest()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setPointOfInterest(cvf::Vec3d poi)
|
||||
void RiuViewer::setPointOfInterest(cvf::Vec3d poi)
|
||||
{
|
||||
m_navigationPolicy->setPointOfInterest(poi);
|
||||
}
|
||||
@ -359,7 +359,7 @@ void RIViewer::setPointOfInterest(cvf::Vec3d poi)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setOwnerReservoirView(RimReservoirView * owner)
|
||||
void RiuViewer::setOwnerReservoirView(RimReservoirView * owner)
|
||||
{
|
||||
m_reservoirView = owner;
|
||||
}
|
||||
@ -367,7 +367,7 @@ void RIViewer::setOwnerReservoirView(RimReservoirView * owner)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setEnableMask(unsigned int mask)
|
||||
void RiuViewer::setEnableMask(unsigned int mask)
|
||||
{
|
||||
m_mainRendering->setEnableMask(mask);
|
||||
}
|
||||
@ -375,7 +375,7 @@ void RIViewer::setEnableMask(unsigned int mask)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Perform picking and return the index of the face that was hit, if a drawable geo was hit
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
cvf::Part* RIViewer::pickPointAndFace(int winPosX, int winPosY, uint* faceHit, cvf::Vec3d* localIntersectionPoint)
|
||||
cvf::Part* RiuViewer::pickPointAndFace(int winPosX, int winPosY, uint* faceHit, cvf::Vec3d* localIntersectionPoint)
|
||||
{
|
||||
CVF_ASSERT(faceHit);
|
||||
|
||||
@ -425,7 +425,7 @@ cvf::Part* RIViewer::pickPointAndFace(int winPosX, int winPosY, uint* faceHit, c
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::paintOverlayItems(QPainter* painter)
|
||||
void RiuViewer::paintOverlayItems(QPainter* painter)
|
||||
{
|
||||
// No support for overlay items using SW rendering yet.
|
||||
//if (!isShadersSupported())
|
||||
@ -475,7 +475,7 @@ void RIViewer::paintOverlayItems(QPainter* painter)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setInfoText(QString text)
|
||||
void RiuViewer::setInfoText(QString text)
|
||||
{
|
||||
m_InfoLabel->setText(text);
|
||||
}
|
||||
@ -483,7 +483,7 @@ void RIViewer::setInfoText(QString text)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::showInfoText(bool enable)
|
||||
void RiuViewer::showInfoText(bool enable)
|
||||
{
|
||||
m_showInfoText = enable;
|
||||
}
|
||||
@ -491,7 +491,7 @@ void RIViewer::showInfoText(bool enable)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setHistogram(double min, double max, const std::vector<size_t>& histogram)
|
||||
void RiuViewer::setHistogram(double min, double max, const std::vector<size_t>& histogram)
|
||||
{
|
||||
m_histogramWidget->setHistogramData(min, max, histogram);
|
||||
}
|
||||
@ -499,7 +499,7 @@ void RIViewer::setHistogram(double min, double max, const std::vector<size_t>& h
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::setHistogramPercentiles(double pmin, double pmax, double mean)
|
||||
void RiuViewer::setHistogramPercentiles(double pmin, double pmax, double mean)
|
||||
{
|
||||
m_histogramWidget->setPercentiles(pmin, pmax);
|
||||
m_histogramWidget->setMean(mean);
|
||||
@ -508,7 +508,7 @@ void RIViewer::setHistogramPercentiles(double pmin, double pmax, double mean)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::showAnimationProgress(bool enable)
|
||||
void RiuViewer::showAnimationProgress(bool enable)
|
||||
{
|
||||
m_showAnimProgress = enable;
|
||||
}
|
||||
@ -516,7 +516,7 @@ void RIViewer::showAnimationProgress(bool enable)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RIViewer::showHistogram(bool enable)
|
||||
void RiuViewer::showHistogram(bool enable)
|
||||
{
|
||||
m_showHistogram = enable;
|
||||
}
|
||||
|
||||
@ -41,13 +41,13 @@ namespace cvf
|
||||
// RIViewer
|
||||
//
|
||||
//==================================================================================================
|
||||
class RIViewer : public caf::Viewer
|
||||
class RiuViewer : public caf::Viewer
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RIViewer(const QGLFormat& format, QWidget* parent);
|
||||
~RIViewer();
|
||||
RiuViewer(const QGLFormat& format, QWidget* parent);
|
||||
~RiuViewer();
|
||||
|
||||
void setColorLegend1(cvf::OverlayScalarMapperLegend* legend);
|
||||
void setColorLegend2(cvf::OverlayScalarMapperLegend* legend);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user