Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #6 Extended processing of nested actions.
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_Tools.cpp
diff --git
a/src/XGUI/XGUI_Tools.cpp
b/src/XGUI/XGUI_Tools.cpp
index ef83b089c674db4b39750e6776401ef73c8876a7..bc462b8000a58e9fc30ff3434adc5824b646a8ce 100644
(file)
--- a/
src/XGUI/XGUI_Tools.cpp
+++ b/
src/XGUI/XGUI_Tools.cpp
@@
-1,77
+1,79
@@
-
#include "XGUI_Tools.h"
#include <QDir>
#include "XGUI_Tools.h"
#include <QDir>
-
//******************************************************************
//******************************************************************
-QString library(
const QString& str
)
+QString library(
const QString& str
)
{
{
- QString path = dir(
str, false
);
- QString name = file(
str, false
);
- QString ext
= extension( str
);
+ QString path = dir(
str, false
);
+ QString name = file(
str, false
);
+ QString ext
= extension(str
);
#ifndef WIN32
if ( !name.startsWith( "lib" ) )
#ifndef WIN32
if ( !name.startsWith( "lib" ) )
-
name = QString( "lib" ) + name;
+ name = QString( "lib" ) + name;
#endif
#ifdef WIN32
#endif
#ifdef WIN32
- QString libExt(
"dll"
);
+ QString libExt(
"dll"
);
#else
QString libExt( "so" );
#endif
#else
QString libExt( "so" );
#endif
- if ( ext.toLower() != QString( "so" ) && ext.toLower() != QString( "dll" ) )
- {
- if ( !name.isEmpty() && !ext.isEmpty() )
- name += QString( "." );
+ if (ext.toLower() != QString("so") && ext.toLower() != QString("dll")) {
+ if (!name.isEmpty() && !ext.isEmpty())
+ name += QString(".");
name += ext;
}
ext = libExt;
name += ext;
}
ext = libExt;
- QString fileName = addSlash(
path ) + name + QString( "."
) + ext;
+ QString fileName = addSlash(
path) + name + QString("."
) + ext;
return fileName;
}
//******************************************************************
return fileName;
}
//******************************************************************
-QString dir(
const QString& path, bool isAbs
)
+QString dir(
const QString& path, bool isAbs
)
{
{
- QDir aDir = QFileInfo(
path
).dir();
+ QDir aDir = QFileInfo(
path
).dir();
QString dirPath = isAbs ? aDir.absolutePath() : aDir.path();
QString dirPath = isAbs ? aDir.absolutePath() : aDir.path();
- if (
dirPath == QString( "." )
)
+ if (
dirPath == QString(".")
)
dirPath = QString();
return dirPath;
}
dirPath = QString();
return dirPath;
}
-
//******************************************************************
//******************************************************************
-QString file(
const QString& path, bool withExt
)
+QString file(
const QString& path, bool withExt
)
{
QString fPath = path;
{
QString fPath = path;
- while
( !fPath.isEmpty() && ( fPath[fPath.length() - 1] =='\\' || fPath[fPath.length() - 1] == '/' )
)
- fPath.remove(
fPath.length() - 1, 1
);
+ while
(!fPath.isEmpty() && (fPath[fPath.length() - 1] == '\\' || fPath[fPath.length() - 1] == '/')
)
+ fPath.remove(
fPath.length() - 1, 1
);
- if (
withExt
)
- return QFileInfo(
fPath
).fileName();
+ if (
withExt
)
+ return QFileInfo(
fPath
).fileName();
else
else
- return QFileInfo(
fPath
).completeBaseName();
+ return QFileInfo(
fPath
).completeBaseName();
}
//******************************************************************
}
//******************************************************************
-QString extension(
const QString& path, bool full
)
+QString extension(
const QString& path, bool full
)
{
{
- return full ? QFileInfo(
path ).completeSuffix() : QFileInfo( path
).suffix();
+ return full ? QFileInfo(
path).completeSuffix() : QFileInfo(path
).suffix();
}
//******************************************************************
}
//******************************************************************
-QString addSlash(
const QString& path
)
+QString addSlash(
const QString& path
)
{
QString res = path;
{
QString res = path;
- if (
!res.isEmpty() && res.at( res.length() - 1 ) != QChar( '/' ) &&
-
res.at( res.length() - 1 ) != QChar( '\\' )
)
- res += QDir::separator();
+ if (
!res.isEmpty() && res.at(res.length() - 1) != QChar('/')
+
&& res.at(res.length() - 1) != QChar('\\')
)
+
res += QDir::separator();
return res;
}
return res;
}
+
+//******************************************************************
+QRect makeRect(const int x1, const int y1, const int x2, const int y2)
+{
+ return QRect(qMin(x1, x2), qMin(y1, y2), qAbs(x2 - x1), qAbs(y2 - y1));
+}