Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dtk
dtk
Commits
980162e1
Commit
980162e1
authored
Aug 25, 2014
by
Julien Wintz
Browse files
Fixed use of deprecated xarch int type.
parent
6e1a3511
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/dtkComposerSupport/dtkComposerNodeMetaScalarArrayReplace.cpp
View file @
980162e1
// dtkComposerNodeMetaScalarArrayReplace.cpp ---
//
// Author: Régis Duvigneau
// Copyright (C) 2008 - Regis Duvigneau, Inria.
// Created: Thu Jul 19 10:28:54 2012 (+0200)
// Version: $Id$
// Last-Updated: mar. févr. 4 17:40:55 2014 (+0100)
// By: Nicolas Niclausse
// Update #: 26
//
//
//
// Commentary:
//
//
// Commentary:
//
//
// Change log:
//
//
// Change Log:
//
//
// Code:
#include "dtkComposerNodeMetaScalarArrayReplace.h"
...
...
@@ -61,7 +56,7 @@ dtkComposerNodeMetaScalarArrayReplace::dtkComposerNodeMetaScalarArrayReplace(voi
dtkComposerNodeMetaScalarArrayReplace
::~
dtkComposerNodeMetaScalarArrayReplace
(
void
)
{
delete
d
;
d
=
NULL
;
}
...
...
@@ -78,11 +73,14 @@ void dtkComposerNodeMetaScalarArrayReplace::run(void)
d
->
arrays
=
d
->
receiver_arrays
.
data
();
dtkxarch_int
size
=
d
->
arrays
->
count
();
qlonglong
size
=
d
->
arrays
->
count
();
qlonglong
index
=
(
*
(
d
->
receiver_index
.
data
()));
for
(
qlonglong
i
=
0
;
i
<
size
;
i
++
)
(
*
d
->
arrays
->
at
(
i
))[
index
]
=
(
*
(
d
->
receiver_vector
.
data
()))[
i
];
d
->
emitter_arrays
.
setData
(
d
->
arrays
);
}
//
// dtkComposerNodeMetaScalarArrayReplace.cpp ends here
src/dtkComposerSupport/dtkComposerNodeNumberOperator.cpp
View file @
980162e1
...
...
@@ -27,7 +27,9 @@
#include <dtkLog/dtkLog>
#include <dtkMathSupport/dtkMath.h>
#include <QtCore/qmath.h>
#include <math.h>
// /////////////////////////////////////////////////////////////////
...
...
@@ -197,7 +199,7 @@ void dtkComposerNodeNumberAlmosteq::run(void)
if
(
d
->
receiver_lhs
.
dataType
()
==
QMetaType
::
LongLong
&&
d
->
receiver_rhs
.
dataType
()
==
QMetaType
::
LongLong
)
{
d
->
value
=
(
*
(
d
->
receiver_lhs
.
data
<
qlonglong
>
())
==
*
(
d
->
receiver_rhs
.
data
<
qlonglong
>
()));
}
else
{
double
lhs
=
*
(
d
->
receiver_lhs
.
data
<
double
>
());
...
...
@@ -257,7 +259,7 @@ void dtkComposerNodeNumberNotalmosteq::run(void)
if
(
d
->
receiver_lhs
.
dataType
()
==
QMetaType
::
LongLong
&&
d
->
receiver_rhs
.
dataType
()
==
QMetaType
::
LongLong
)
{
d
->
value
=
(
*
(
d
->
receiver_lhs
.
data
<
qlonglong
>
())
!=
*
(
d
->
receiver_rhs
.
data
<
qlonglong
>
()));
}
else
{
double
lhs
=
*
(
d
->
receiver_lhs
.
data
<
double
>
());
...
...
@@ -591,7 +593,7 @@ void dtkComposerNodeNumberOperatorBinaryEucldiv::run(void)
qlonglong
*
rhs
=
d
->
receiver_rhs
.
data
<
qlonglong
>
();
d
->
value_i
=
(
*
lhs
)
/
(
*
rhs
);;
d
->
emitter
.
setData
<
qlonglong
>
(
&
d
->
value_i
);
}
...
...
@@ -605,7 +607,7 @@ void dtkComposerNodeNumberOperatorBinaryLogn::run(void)
double
*
rhs
=
d
->
receiver_rhs
.
data
<
double
>
();
d
->
value_r
=
qLn
(
*
lhs
)
/
qLn
(
*
rhs
);
d
->
emitter
.
setData
<
double
>
(
&
d
->
value_r
);
}
...
...
@@ -619,7 +621,7 @@ void dtkComposerNodeNumberOperatorBinaryMin::run(void)
double
*
rhs
=
d
->
receiver_rhs
.
data
<
double
>
();
d
->
value_r
=
(
*
lhs
)
<
(
*
rhs
)
?
(
*
lhs
)
:
(
*
rhs
);
d
->
emitter
.
setData
<
double
>
(
&
d
->
value_r
);
}
...
...
@@ -647,7 +649,7 @@ void dtkComposerNodeNumberOperatorBinaryMax::run(void)
double
*
rhs
=
d
->
receiver_rhs
.
data
<
double
>
();
d
->
value_r
=
(
*
lhs
)
>
(
*
rhs
)
?
(
*
lhs
)
:
(
*
rhs
);
d
->
emitter
.
setData
<
double
>
(
&
d
->
value_r
);
}
...
...
@@ -672,7 +674,7 @@ void dtkComposerNodeNumberOperatorBinaryMult::run(void)
double
*
rhs
=
d
->
receiver_rhs
.
data
<
double
>
();
d
->
value_r
=
(
*
lhs
)
*
(
*
rhs
);
d
->
emitter
.
setData
<
double
>
(
&
d
->
value_r
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment