Commit d8c4ecbe authored by bharatak's avatar bharatak
Browse files

Updated the monkey and fixed some issues

parent 9bb71130
......@@ -10,8 +10,8 @@ Image{
signal clicked
onWeightChanged: {
ball.width=30*weight/100;
ball.height=30*weight/100;
ball.width=20*weight/100;
ball.height=20*weight/100;
}
MouseArea{
......
......@@ -3,7 +3,7 @@ import QtQuick 2.0
Rectangle{
id: root
color: "#49BAB6"
property int duration
property int duration: 0
property string medium
property alias ball: ball
property alias ballWeight : ball.weight
......
.pragma library
var monkeyTreeSource = "images/NewMonkeyTree.png";
var monkeyTailSource = "images/NewMonkeyTail.png";
var monkeySource = "images/NewMonkey.png";//"images/Monkey2.png"
var weighingMachineSource = "images/scale2.png";
var rulerSource = "images/Ruler.png";
var footBallSource = "images/football.png";
......
......@@ -12,10 +12,10 @@ Rectangle {
TableView {
width: parent.width
height: parent.height
TableViewColumn{ role: "objects" ; title: "Objects" ; width: parent.width*.20 }
TableViewColumn{ role: "mass" ; title: "Mass" ; width: parent.width*.20 }
TableViewColumn{ role: "height" ; title: "Height in Meters" ; width: parent.width*.20 }
TableViewColumn{ role: "time_taken" ; title: "Time in Milli Secs" ; width: parent.width*.20 }
TableViewColumn{ role: "objects" ; title: "Object" ; width: parent.width*.20 }
TableViewColumn{ role: "mass" ; title: "Mass (g)" ; width: parent.width*.20 }
TableViewColumn{ role: "height" ; title: "Height (m)" ; width: parent.width*.20 }
TableViewColumn{ role: "time_taken" ; title: "Time (ms)" ; width: parent.width*.20 }
TableViewColumn{ role: "medium" ; title: "Medium" ; width: parent.width*.20 }
model: results
......
import QtQuick 2.2
import "Constants.js" as Constants
Rectangle {
id:root
property int totalMonkeyHeight:monkeyTail.height+tree.height+monkey.height
......@@ -10,19 +11,19 @@ Rectangle {
property int currentHeight: (15/(parent.height *.78))*ballContainer.height
clip:true
border.color: "black"
Image{
id:tree
width: parent.width
height: parent.height * .1
anchors.top: parent.top
source: "images/Tree.jpg"
source: Constants.monkeyTreeSource//"images/Tree.jpg"
}
Image {
id: monkeyTail
width: parent.width
anchors.top: tree.bottom
source: "images/MonkeyTail.jpg"
source: Constants.monkeyTailSource//"images/MonkeyTail.jpg"
height: monkey.y - tree.height
}
Image {
......@@ -31,7 +32,7 @@ Rectangle {
height: parent.height * .1
anchors.left:parent.left
anchors.right:parent.right
source: "images/Monkey.jpg"
source: Constants.monkeySource//"images/Monkey2.png"
MouseArea{
id:dragMonkey
......
......@@ -13,5 +13,7 @@ OTHER_FILES += \
qml/main.qml \
qml/Ball.qml
CONFIG-=app_bundle
# Default rules for deployment.
include(deployment.pri)
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.2, 2014-10-17T10:50:36. -->
<!-- Written by QtCreator 3.1.2, 2014-10-20T17:37:17. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......@@ -57,7 +57,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.3 clang 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.3 clang 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.53.clang_64_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
......@@ -181,7 +181,20 @@
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
<value type="QString">-w</value>
<value type="QString">-r</value>
</valuelist>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
......@@ -231,8 +244,8 @@
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">FreeFallTower</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/bharatak/Documents/Balaswecha/Qt-Samples/FreeFallTower/FreeFallTower.pro</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">FreeFallTower2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/bharatak/Documents/Balaswecha/Qt-Samples/free-fall-tower/FreeFallTower.pro</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">FreeFallTower.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
......
......@@ -249,7 +249,7 @@ ApplicationWindow {
MonkeyTree{
id:rightTree
height: parent.height
color:"blue"
color:root.color
width: parent.width*.35
anchors.left : scale.right
anchors.right: parent.right
......
......@@ -3,7 +3,6 @@
<file>main.qml</file>
<file>BallContainer.qml</file>
<file>ExperimentTable.qml</file>
<file>FreeFallTowerSwathi.qml</file>
<file>MonkeyTree.qml</file>
<file>Ball.qml</file>
<file>BallsKit.qml</file>
......@@ -23,6 +22,9 @@
<file>images/scale2.png</file>
<file>images/Tree.jpg</file>
<file>images/scale.png</file>
<file>images/NewMonkey.png</file>
<file>images/NewMonkeyTail.png</file>
<file>images/NewMonkeyTree.png</file>
</qresource>
<qresource prefix="/images"/>
</RCC>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment