Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qt3dstudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
public-demos
qt3dstudio
Commits
0f92fa83
Commit
0f92fa83
authored
Apr 26, 2018
by
Tomi Korpipää
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update HomeAutomation to 2.0 API
parent
9786f3aa
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
225 additions
and
224 deletions
+225
-224
HomeAutomation/HomeAutom.pro
HomeAutomation/HomeAutom.pro
+2
-0
HomeAutomation/housemodel.cpp
HomeAutomation/housemodel.cpp
+4
-4
HomeAutomation/qml/HomeAutom/HomeView.qml
HomeAutomation/qml/HomeAutom/HomeView.qml
+143
-111
HomeAutomation/uip/houseStudio.uia
HomeAutomation/uip/houseStudio.uia
+25
-15
HomeAutomation/uip/houseStudio.uip
HomeAutomation/uip/houseStudio.uip
+51
-94
No files found.
HomeAutomation/HomeAutom.pro
View file @
0f92fa83
...
...
@@ -14,6 +14,8 @@ KNX_BOARD {
QT
+=
qml
quick
CONFIG
+=
resources_big
target
.
path
=
$$
[
QT_INSTALL_EXAMPLES
]
/
studio3d
/
$$
TARGET
INSTALLS
+=
target
...
...
HomeAutomation/housemodel.cpp
View file @
0f92fa83
...
...
@@ -132,10 +132,10 @@ void HouseModel::generateRooms()
{
removeRows
(
0
,
m_rooms
.
length
());
// Position of labels is defined from the center point of window
addRoom
(
QStringLiteral
(
"Living Room"
),
QStringLiteral
(
"Living
r
oom"
),
21
,
0.8
,
120
,
200
);
addRoom
(
QStringLiteral
(
"Master Bedroom"
),
QStringLiteral
(
"Master
bedr
oom"
),
18
,
0.8
,
-
380
,
-
290
);
addRoom
(
QStringLiteral
(
"Bedroom"
),
QStringLiteral
(
"Bed
r
oom"
),
15
,
0.0
,
-
405
,
170
);
addRoom
(
QStringLiteral
(
"Bath Room"
),
QStringLiteral
(
"Bath
r
oom"
),
30
,
1.0
,
-
20
,
-
320
);
addRoom
(
QStringLiteral
(
"Living Room"
),
QStringLiteral
(
"Living
R
oom"
),
21
,
0.8
,
120
,
200
);
addRoom
(
QStringLiteral
(
"Master Bedroom"
),
QStringLiteral
(
"Master
BedR
oom"
),
18
,
0.8
,
-
380
,
-
290
);
addRoom
(
QStringLiteral
(
"Bedroom"
),
QStringLiteral
(
"Bed
R
oom"
),
15
,
0.0
,
-
405
,
170
);
addRoom
(
QStringLiteral
(
"Bath Room"
),
QStringLiteral
(
"Bath
R
oom"
),
30
,
1.0
,
-
20
,
-
320
);
#if !defined(KNX_BACKEND)
addRoom
(
QStringLiteral
(
"Entrance"
),
QStringLiteral
(
"Entrance"
),
20
,
0.6
,
-
450
,
-
70
);
#endif
...
...
HomeAutomation/qml/HomeAutom/HomeView.qml
View file @
0f92fa83
This diff is collapsed.
Click to expand it.
HomeAutomation/uip/houseStudio.uia
View file @
0f92fa83
<?xml version="1.0" encoding="UTF-8"?>
<application
xmlns=
"http://qt.io/qt3dstudio/uia"
>
<assets
initial=
"houseStudio"
>
<presentation
id=
"houseStudio"
src=
"houseStudio.uip"
/>
<dataInput
name=
"slideInput"
type=
"String"
/>
</assets>
<statemachine
ref=
"#logic"
>
<visual-states>
<state
ref=
"Initial"
>
<enter>
<goto-slide
element=
"main:Scene"
rel=
"next"
/>
</enter>
</state>
</visual-states>
</statemachine>
<?xml version="1.0" encoding="UTF-8" ?>
<application>
<assets
initial=
"houseStudio"
>
<presentation
id=
"houseStudio"
src=
"houseStudio.uip"
/>
<dataInput
name=
"slideInput"
type=
"String"
/>
<dataInput
name=
"lightEntrance"
type=
"Ranged Number"
min=
"0"
max=
"100"
/>
<dataInput
name=
"lightBathRoom"
type=
"Ranged Number"
min=
"0"
max=
"100"
/>
<dataInput
name=
"lightLivingRoom"
type=
"Ranged Number"
min=
"0"
max=
"100"
/>
<dataInput
name=
"lightMasterBedRoom"
type=
"Ranged Number"
min=
"0"
max=
"100"
/>
<dataInput
name=
"lightBedRoom"
type=
"Ranged Number"
min=
"0"
max=
"100"
/>
<dataInput
name=
"heatEntrance"
type=
"Vector3"
/>
<dataInput
name=
"heatBathRoom"
type=
"Vector3"
/>
<dataInput
name=
"heatLivingRoom"
type=
"Vector3"
/>
<dataInput
name=
"heatMasterBedRoom"
type=
"Vector3"
/>
<dataInput
name=
"heatBedRoom"
type=
"Vector3"
/>
</assets>
<statemachine
ref=
"#logic"
>
<visual-states>
<state
ref=
"Initial"
>
<enter>
<goto-slide
element=
"main:Scene"
rel=
"next"
/>
</enter>
</state>
</visual-states>
</statemachine>
</application>
HomeAutomation/uip/houseStudio.uip
View file @
0f92fa83
This diff is collapsed.
Click to expand it.
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