Commit ba25d977 authored by Bharat Akkinepalli's avatar Bharat Akkinepalli
Browse files

Added drop

parent bc2459c4
......@@ -11,3 +11,5 @@ QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
#QMAKE_MAC_SDK = macosx10.9
......@@ -3,8 +3,8 @@ import QtQuick.Controls 1.2
Item {
id : densityWin
width: densityWin.width
height: densityWin.height
//width: densityWin.width
//height: densityWin.height
property ObjImage droppedObject
property double beakerPointHt : (densityExperimentArea.height / 1.20) / 50
property double liquidLevel : 30 * beakerPointHt
......@@ -100,7 +100,10 @@ Item {
height: (4 * densityWin.height)/10
anchors {
left : liquidTypeArea.left
//TODO:
top : liquidTypeArea.bottom
//leftMargin: 20
//bottomMargin: 20
}
}
......
......@@ -10,10 +10,25 @@ Item {
TableView {
anchors.fill : resultsTable
TableViewColumn{ role: "objectName" ; title: "Object Name" ; width: resultsTable.width/4 }
TableViewColumn{ role: "objectName" ; title: "Object Name" ; width: resultsTable.width/4; }
TableViewColumn{ role: "liquidType" ; title: "Liquid Type" ; width: resultsTable.width/4 }
TableViewColumn{ role: "liquidDensity" ; title: "Liquid Density" ; width: resultsTable.width/4 }
TableViewColumn{ role: "observation" ; title: "Observation" ; width: resultsTable.width/4 }
TableViewColumn{
role: "observation"
title: "Observation"
width: resultsTable.width/4
delegate: Item {
ComboBox{
anchors.verticalCenter: parent.verticalCenter
model: ListModel{
ListElement {text: "Select"}
ListElement{ text: "Sinks"}
ListElement{ text: "Floats"}
}
}
}
}
model: resultsModel
}
......
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