OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged changes from trunk (//depot/CeeVizFramework/Experiments/CeeAppFramework)

Browse Source 
Removed reference to CeeViz
p4#: 22490
This commit is contained in:
CeetronResInsight
2013-09-20 08:59:56 +02:00
parent 8199273434
commit a6ddfa6aaa
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CommonCode/cvfStructGrid.cpp
View File

@@ -172,12 +172,12 @@ void StructGridInterface::neighborIJKAtCellFace(size_t i, size_t j, size_t k, Fa
//--------------------------------------------------------------------------------------------------
/// Models with large absolute values for coordinate scalars will often end up with z-fighting due
/// to numerical limits in float used by OpenGL. displayModelOffset() is intended
// to be subtracted from a domain model coordinate when building geometry for CeeViz
// to be subtracted from a domain model coordinate when building geometry
//
// Used in StructGridGeometryGenerator::computeArrays()
//
// Vec3d domainModelCoord = ...
// Vec3d coordUsedInCeeViz = domainModelCoord - displayModelOffset();
// Vec3d vizCoord = domainModelCoord - displayModelOffset();
//--------------------------------------------------------------------------------------------------
cvf::Vec3d StructGridInterface::displayModelOffset() const
{

15
cafUserInterface/cafBasicAboutDialog.cpp
View File

@@ -50,7 +50,7 @@ BasicAboutDialog::BasicAboutDialog(QWidget* parent)
//m_appVersion;
//m_appCopyright;
m_showCeeVizVersion = true;
m_showVizLibraryVersion = true;
m_showQtVersion = true;
m_isDebugBuild = false;
@@ -89,12 +89,12 @@ void BasicAboutDialog::setCopyright(const QString& copyright)
//--------------------------------------------------------------------------------------------------
/// Enable display of CeeViz version
/// Enable display of visualization library version
//--------------------------------------------------------------------------------------------------
void BasicAboutDialog::showCeeVizVersion(bool show)
void BasicAboutDialog::showVizLibraryVersion(bool show)
{
assert(!m_isCreated);
m_showCeeVizVersion = show;
m_showVizLibraryVersion = show;
}
@@ -221,7 +221,7 @@ void BasicAboutDialog::create()
// Possibly show extend version info
if (m_showCeeVizVersion ||
if (m_showVizLibraryVersion ||
m_showQtVersion ||
m_verLabels.size() > 0)
{
@@ -230,13 +230,12 @@ void BasicAboutDialog::create()
int insertRow = 0;
// CeeViz version
if (m_showCeeVizVersion)
if (m_showVizLibraryVersion)
{
// QString ver;
// ver.sprintf("%s.%s%s-%s", CVF_MAJOR_VERSION, CVF_MINOR_VERSION, CVF_SPECIAL_BUILD, CVF_BUILD_NUMBER);
//
// addStringPairToVerInfoLayout("CeeViz ver.: ", ver, verInfoLayout, insertRow++);
// addStringPairToVerInfoLayout("Visualization ver.: ", ver, verInfoLayout, insertRow++);
}
// Qt version

4
cafUserInterface/cafBasicAboutDialog.h
View File

@@ -42,7 +42,7 @@ public:
void setApplicationVersion(const QString& ver);
void setCopyright(const QString& copyright);
void showCeeVizVersion(bool show);
void showVizLibraryVersion(bool show);
void showQtVersion(bool show);
void addVersionEntry(const QString& verLabel, const QString& verText);
void setIsDebugBuild(bool isDebugBuild);
@@ -59,7 +59,7 @@ private:
QString m_appVersion; // Application version info. Can be empty
QString m_appCopyright; // Application copyright string. Can be empty
bool m_showCeeVizVersion; // Flags whether CeeViz version info should be shown
bool m_showVizLibraryVersion;
bool m_showQtVersion; // Flags whether Qt version info should be shown
QStringList m_verLabels; // Labels for user specified version entries
QStringList m_verTexts; // The actual version text for user specified version entries