Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
BalaSwecha
Density
Commits
fb3a9c0d
Commit
fb3a9c0d
authored
Jan 09, 2015
by
animesh
Browse files
added feature of accepting rounded off result to 1 decimal place
parent
349ac529
Changes
26
Hide whitespace changes
Inline
Side-by-side
qml
/view/DensityWin.qml
→
QML
/view/DensityWin.qml
View file @
fb3a9c0d
File moved
qml
/view/FormulaWin.qml
→
QML
/view/FormulaWin.qml
View file @
fb3a9c0d
...
...
@@ -284,8 +284,9 @@ Item {
function
densityMatching
()
{
if
(
Number
(
densityInput
.
text
)
>
0
&&
Number
(
massResultText
.
text
)
>
0
&&
Number
(
volumeResultText
.
text
)
>
0
)
{
var
calculatedDensity
=
Number
(
massResultText
.
text
)
/
Number
(
volumeResultText
.
text
)
calculatedDensity
=
Math
.
floor
((
calculatedDensity
*
10
*
10
))
/
100
var
inputDensity
=
Number
(
densityInput
.
text
)
calculatedDensity
=
Math
.
round
(
Math
.
floor
(
calculatedDensity
*
100
)
/
10
)
/
10
var
inputDensity
=
Number
(
densityInput
.
text
);
inputDensity
=
Math
.
round
(
Math
.
floor
(
inputDensity
*
100
)
/
10
)
/
10
if
(
inputDensity
==
calculatedDensity
)
return
true
}
...
...
qml
/view/LiquidTypeList.qml
→
QML
/view/LiquidTypeList.qml
View file @
fb3a9c0d
File moved
qml
/view/Main.qml
→
QML
/view/Main.qml
View file @
fb3a9c0d
File moved
qml
/view/Note.qml
→
QML
/view/Note.qml
View file @
fb3a9c0d
File moved
qml
/view/ObjImage.qml
→
QML
/view/ObjImage.qml
View file @
fb3a9c0d
File moved
qml
/view/ObjectCollectionWin.qml
→
QML
/view/ObjectCollectionWin.qml
View file @
fb3a9c0d
File moved
qml
/view/ObjectList.qml
→
QML
/view/ObjectList.qml
View file @
fb3a9c0d
File moved
qml
/view/ResultsView.qml
→
QML
/view/ResultsView.qml
View file @
fb3a9c0d
File moved
qml
/view/VolumeWin.qml
→
QML
/view/VolumeWin.qml
View file @
fb3a9c0d
File moved
qml
/view/WeightWin.qml
→
QML
/view/WeightWin.qml
View file @
fb3a9c0d
File moved
qml
/view/images/apple-slice.png
→
QML
/view/images/apple-slice.png
View file @
fb3a9c0d
File moved
qml
/view/images/background.jpeg
→
QML
/view/images/background.jpeg
View file @
fb3a9c0d
File moved
qml
/view/images/beaker.png
→
QML
/view/images/beaker.png
View file @
fb3a9c0d
File moved
qml
/view/images/coin.png
→
QML
/view/images/coin.png
View file @
fb3a9c0d
File moved
qml
/view/images/cotton-ball.png
→
QML
/view/images/cotton-ball.png
View file @
fb3a9c0d
File moved
qml
/view/images/egg.png
→
QML
/view/images/egg.png
View file @
fb3a9c0d
File moved
qml
/view/images/gold-nugget.png
→
QML
/view/images/gold-nugget.png
View file @
fb3a9c0d
File moved
qml
/view/images/golden-crown.png
→
QML
/view/images/golden-crown.png
View file @
fb3a9c0d
File moved
qml
/view/images/golf-ball.png
→
QML
/view/images/golf-ball.png
View file @
fb3a9c0d
File moved
Prev
1
2
Next
Write
Preview
Supports
Markdown
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