lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-19 19:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

from long long unsigned diff to std:ptr_diff

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2015-09-28 13:56:53 +00:00
parent a803ed2ff8
commit 54daa49a19
4 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/meshlab/mainwindow.h
View File

@ -58,21 +58,21 @@ class QNetworkAccessManager;
class QNetworkReply;
class QToolBar;
class MainWindowSetting
class MainWindowSetting
{
public:
static void initGlobalParameterSet(RichParameterSet* gblset);
static void initGlobalParameterSet(RichParameterSet* gblset);
void updateGlobalParameterSet( RichParameterSet& rps );
long long unsigned int maxgpumem;
inline static QString maximumDedicatedGPUMem() {return "MeshLab::System::maxGPUMem";}
std::ptrdiff_t maxgpumem;
inline static QString maximumDedicatedGPUMem() {return "MeshLab::System::maxGPUMem";}
bool permeshtoolbar;
static QString perMeshRenderingToolBar() {return "MeshLab::GUI::perMeshToolBar";}
bool permeshtoolbar;
static QString perMeshRenderingToolBar() {return "MeshLab::GUI::perMeshToolBar";}
bool highprecision;
static QString highPrecisionRendering() {return "MeshLab::System::highPrecisionRendering";}
bool highprecision;
static QString highPrecisionRendering() {return "MeshLab::System::highPrecisionRendering";}
};
class MainWindow : public QMainWindow, public MainWindowInterface
@ -268,7 +268,7 @@ private:
LayerDialog *layerDialog;
PluginGeneratorGUI* plugingui;
QSignalMapper *windowMapper;
MLThreadSafeMemoryInfo* gpumeminfo;
MLThreadSafeMemoryInfo* gpumeminfo;
//QMap<QThread*,Env*> envtobedeleted;
@ -299,7 +299,7 @@ public:
return &currentViewContainer()->meshDoc;
}
inline MLThreadSafeMemoryInfo* memoryInfoManager() const {return gpumeminfo;}
inline MLThreadSafeMemoryInfo* memoryInfoManager() const {return gpumeminfo;}
const RichParameterSet& currentGlobalPars() const { return currentGlobalParams; }
RichParameterSet& currentGlobalPars() { return currentGlobalParams; }
const RichParameterSet& defaultGlobalPars() const { return defaultGlobalParams; }

24
src/meshlab/mainwindow_Init.cpp
View File

@ -100,7 +100,7 @@ MainWindow::MainWindow()
createActions();
createToolBars();
createMenus();
gpumeminfo = new MLThreadSafeMemoryInfo(mwsettings.maxgpumem);
gpumeminfo = new MLThreadSafeMemoryInfo(mwsettings.maxgpumem);
stddialog = 0;
xmldialog = 0;
setAcceptDrops(true);
@ -136,7 +136,7 @@ MainWindow::MainWindow()
MainWindow::~MainWindow()
{
delete gpumeminfo;
delete gpumeminfo;
}
void MainWindow::createActions()
@ -1302,19 +1302,19 @@ void MainWindowSetting::initGlobalParameterSet(RichParameterSet* glbset)
glbset->addParam(new RichInt(maximumDedicatedGPUMem(),350,"Maximum GPU Memory Dedicated to MeshLab (Mb)","Maximum GPU Memory Dedicated to MeshLab (megabyte) for the rendering process. The dedicated memory must NOT be all the GPU memory presents on the videocard."));
glbset->addParam(new RichBool(perMeshRenderingToolBar() ,true,"Show Per-Mesh Rendering Side ToolBar","If true the per-mesh rendering side toolbar will be redendered inside the layerdialog."));
//WARNING!!!! REMOVE THIS LINE AS SOON AS POSSIBLE! A plugin global variable has been introduced by MeshLab Core!
glbset->addParam(new RichString("MeshLab::Plugins::sketchFabKeyCode","0000000","SketchFab KeyCode",""));
/****************************************************************************************************************/
if (MeshLabScalarTest<Scalarm>::doublePrecision())
glbset->addParam(new RichBool(highPrecisionRendering(),false,"High Precision Rendering","If true all the models in the scene will be rendered at the center of the world"));
//WARNING!!!! REMOVE THIS LINE AS SOON AS POSSIBLE! A plugin global variable has been introduced by MeshLab Core!
glbset->addParam(new RichString("MeshLab::Plugins::sketchFabKeyCode","0000000","SketchFab KeyCode",""));
/****************************************************************************************************************/
if (MeshLabScalarTest<Scalarm>::doublePrecision())
glbset->addParam(new RichBool(highPrecisionRendering(),false,"High Precision Rendering","If true all the models in the scene will be rendered at the center of the world"));
}
void MainWindowSetting::updateGlobalParameterSet( RichParameterSet& rps )
{
maxgpumem = (long long unsigned int)rps.getInt(maximumDedicatedGPUMem()) * 1000000;
maxgpumem = (std::ptrdiff_t) rps.getInt(maximumDedicatedGPUMem()) * 1000000;
permeshtoolbar = rps.getBool(perMeshRenderingToolBar());
highprecision = false;
if (MeshLabScalarTest<Scalarm>::doublePrecision())
highprecision = rps.getBool(highPrecisionRendering());
highprecision = false;
if (MeshLabScalarTest<Scalarm>::doublePrecision())
highprecision = rps.getBool(highPrecisionRendering());
}

36
src/meshlab/ml_thread_safe_memory_info.cpp
View File

@ -23,8 +23,8 @@
#include "ml_thread_safe_memory_info.h"
MLThreadSafeMemoryInfo::MLThreadSafeMemoryInfo( long long unsigned int originalmem )
:vcg::NotThreadSafeMemoryInfo(originalmem),lock(QReadWriteLock::Recursive)
MLThreadSafeMemoryInfo::MLThreadSafeMemoryInfo( std::ptrdiff_t originalmem )
:vcg::NotThreadSafeMemoryInfo(originalmem),lock(QReadWriteLock::Recursive)
{
}
@ -33,33 +33,33 @@ MLThreadSafeMemoryInfo::~MLThreadSafeMemoryInfo()
{
}
void MLThreadSafeMemoryInfo::acquiredMemory(long long unsigned int mem)
void MLThreadSafeMemoryInfo::acquiredMemory(std::ptrdiff_t mem)
{
QWriteLocker locker(&lock);
vcg::NotThreadSafeMemoryInfo::acquiredMemory(mem);
QWriteLocker locker(&lock);
vcg::NotThreadSafeMemoryInfo::acquiredMemory(mem);
}
long long unsigned int MLThreadSafeMemoryInfo::usedMemory() const
std::ptrdiff_t MLThreadSafeMemoryInfo::usedMemory() const
{
QReadLocker locker(&lock);
return vcg::NotThreadSafeMemoryInfo::usedMemory();
QReadLocker locker(&lock);
return vcg::NotThreadSafeMemoryInfo::usedMemory();
}
long long unsigned int MLThreadSafeMemoryInfo::currentFreeMemory() const
std::ptrdiff_t MLThreadSafeMemoryInfo::currentFreeMemory() const
{
QReadLocker locker(&lock);
return vcg::NotThreadSafeMemoryInfo::currentFreeMemory();
QReadLocker locker(&lock);
return vcg::NotThreadSafeMemoryInfo::currentFreeMemory();
}
void MLThreadSafeMemoryInfo::releasedMemory(long long unsigned int mem)
void MLThreadSafeMemoryInfo::releasedMemory(std::ptrdiff_t mem)
{
QWriteLocker locker(&lock);
vcg::NotThreadSafeMemoryInfo::releasedMemory(mem);
QWriteLocker locker(&lock);
vcg::NotThreadSafeMemoryInfo::releasedMemory(mem);
}
bool MLThreadSafeMemoryInfo::isAdditionalMemoryAvailable( long long unsigned int mem )
bool MLThreadSafeMemoryInfo::isAdditionalMemoryAvailable( std::ptrdiff_t mem )
{
QReadLocker locker(&lock);
return vcg::NotThreadSafeMemoryInfo::isAdditionalMemoryAvailable(mem);
QReadLocker locker(&lock);
return vcg::NotThreadSafeMemoryInfo::isAdditionalMemoryAvailable(mem);
}

24
src/meshlab/ml_thread_safe_memory_info.h
View File

@ -32,24 +32,24 @@
class MLThreadSafeMemoryInfo : public vcg::NotThreadSafeMemoryInfo
{
public:
MLThreadSafeMemoryInfo(long long unsigned int originalmem);
MLThreadSafeMemoryInfo(std::ptrdiff_t originalmem);
~MLThreadSafeMemoryInfo();
~MLThreadSafeMemoryInfo();
void acquiredMemory(long long unsigned int mem);
void acquiredMemory(std::ptrdiff_t mem);
long long unsigned int usedMemory() const;
std::ptrdiff_t usedMemory() const;
long long unsigned int currentFreeMemory() const;
std::ptrdiff_t currentFreeMemory() const;
void releasedMemory(long long unsigned int mem = 0);
bool isAdditionalMemoryAvailable(long long unsigned int mem);
void releasedMemory(std::ptrdiff_t mem = 0);
bool isAdditionalMemoryAvailable(std::ptrdiff_t mem);
private:
//mutable objects can be modified from the declared const functions
//in this way we have not to modified the basic vcg::MemoryInfo interface for the logically const functions
//whose need to lock the mutex for a simple reading operation
mutable QReadWriteLock lock;
//mutable objects can be modified from the declared const functions
//in this way we have not to modified the basic vcg::MemoryInfo interface for the logically const functions
//whose need to lock the mutex for a simple reading operation
mutable QReadWriteLock lock;
};
#endif