Skip to content

Commit 73e7993

Browse files
quantum-leapsquantum-leaps
committed
7.0.0
1 parent 79ca3d9 commit 73e7993

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1089
-713
lines changed

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@ underlying QP framework, for which the code has been generated. Please
148148
refer to the QP licensing (https://www.state-machine.com/licensing/ )
149149
for more information.
150150

151+
> NOTE: QM models without a valid QP license certificate (assumed to be
152+
covered by GPL) can only generate **up to 20 states**. The limitation has
153+
been introduced to reduce the widespread GPL infringement with respect
154+
to the QP/C and QP/C++ real-time embedded frameworks that underline the
155+
code generation in QM.
156+
151157

152158
# Support and Issue Resolution
153159
Support for QM is provided in the Free Support forum at:

‎linux64/Resources/qm_dark.qss‎ renamed to ‎linux/Resources/qm_dark.qss‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*****************************************************************************
22
* QM Style Sheet for Linux "Dark"
3-
* Last Updated for Version: 6.0.0
4-
* Date of the Last Update: 2023-09-20
3+
* Last Updated for Version: 7.0.0
4+
* Date of the Last Update: 2024-09-12
55
*
66
* Q u a n t u m L e a P s
77
* ------------------------
88
* Modern Embedded Software
99
*
10-
* Copyright (C) 2005-2023 Quantum Leaps, LLC. All rights reserved.
10+
* Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
1111
*
1212
* Contact information:
1313
* https://www.state-machine.com
@@ -23,10 +23,10 @@ MainWindow {
2323
qproperty-windowColor: black;
2424

2525
/* background for code edit area */
26-
qproperty-codeBaseColor: #1A1E24;
26+
qproperty-codeBaseColor: #1a1e24;
2727

2828
/* background for doc edit area */
29-
qproperty-docBaseColor: #2A2E24;
29+
qproperty-docBaseColor: #2a2e24;
3030

3131
/* syntax highlighting styles */
3232
qproperty-comment: "#5B6A7E, transparent, italic";
@@ -45,43 +45,48 @@ MainWindow {
4545
/* ExplorerView ..............................................................
4646
*/
4747
ExplorerView {
48-
color: #E1E1E1;
48+
color: #e1e1e1;
4949
background-color: #252A34;
50-
alternate-background-color: #1A1E24;
50+
alternate-background-color: #1a1e24;
5151
}
52-
ExplorerView:hover {
53-
background-color: #353A44;
54-
alternate-background-color: #2A2E34;
52+
ExplorerView::item:hover {
53+
background-color: #006666;
5554
}
5655
ExplorerView::item:selected {
57-
background-color: #AA0000;
56+
background-color: #aa0000;
5857
}
5958
/* SearchView ................................................................
6059
*/
6160
SearchView {
6261
font-style: italic;
63-
color: #E1E1E1;
64-
background-color: #3B4453;
62+
color: #e1e1e1;
63+
background-color: #3b4453;
6564
alternate-background-color: #304050;
6665
}
67-
SearchView:hover {
68-
background-color: #4B5463;
69-
alternate-background-color: #3F4F5F;
66+
SearchView:item:hover {
67+
background-color: #4b5463;
7068
}
7169
SearchView::item:selected {
72-
background-color: #0000AA;
70+
background-color: #0000aa;
7371
}
7472
/* DiagramView ...............................................................
73+
* Used in state diagrams
7574
*/
7675
DiagramView {
7776
font-family: "Nimbus Sans L";
7877
font-size: 12px;
7978

80-
qproperty-canvasColor: #252A34;
81-
qproperty-birdsEyeViewColor: #FFFFFF;
82-
qproperty-nodePenColor: #77FFFF;
83-
qproperty-nodeBrushColor: #777777;
84-
qproperty-connPenColor: #FFFF77;
79+
qproperty-canvasColor: #15181e;
80+
81+
qproperty-nodeColor: #0000cc;
82+
qproperty-nodeColor1: #00cc00;
83+
qproperty-nodeColor2: #cc0000;
84+
qproperty-nodeColor3: #666666;
85+
86+
qproperty-connColor: #ffcccc;
87+
qproperty-connColor1: #ccffcc;
88+
qproperty-connColor2: #ccccff;
89+
qproperty-connColor3: #ffffff;
8590
}
8691

8792
/* CodeEdit ..................................................................
@@ -91,9 +96,10 @@ CodeEdit {
9196
font-family: "DejaVu Sans Mono";
9297
font-size: 8pt;
9398

94-
color: #D8DEEA;
95-
selection-color: #CDD3DF;
96-
selection-background-color: #3B4453;
99+
color: #e8eeea;
100+
selection-color: #cdd3df;
101+
selection-background-color: #3b4453;
102+
/* NOTE: set the background with MainWindow::qproperty-codeBaseColor */
97103
}
98104

99105
/* DocEdit ...................................................................
@@ -104,7 +110,7 @@ DocEdit {
104110
font-size: 8pt;
105111
font-style: italic;
106112

107-
color: #E1E1E1;
113+
color: #e1e1e1;
108114
/* NOTE: set the background with MainWindow::qproperty-docBaseColor */
109115
}
110116

@@ -114,8 +120,8 @@ Log {
114120
font-family: "DejaVu Sans Mono";
115121
font-size: 8pt;
116122

117-
color: #E1E1E1;
118-
background-color: #252A34;
123+
color: #e1e1e1;
124+
background-color: #252a34;
119125
selection-color: darkRed;
120126
selection-background-color: yellow;
121127
}

‎linux64/Resources/qm_icon128.png‎ renamed to ‎linux/Resources/qm_icon128.png‎

File renamed without changes.

‎linux64/Resources/qm_icon16.png‎ renamed to ‎linux/Resources/qm_icon16.png‎

File renamed without changes.

‎linux64/Resources/qm_icon32.png‎ renamed to ‎linux/Resources/qm_icon32.png‎

File renamed without changes.

‎linux64/Resources/qm_icon48.png‎ renamed to ‎linux/Resources/qm_icon48.png‎

File renamed without changes.

‎linux64/Resources/qm_icon512.png‎ renamed to ‎linux/Resources/qm_icon512.png‎

File renamed without changes.

‎linux64/Resources/qm_icon64.png‎ renamed to ‎linux/Resources/qm_icon64.png‎

File renamed without changes.

‎linux64/Resources/qm_light.qss‎ renamed to ‎linux/Resources/qm_light.qss‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*****************************************************************************
22
* QM Style Sheet for Linux "Light"
3-
* Last Updated for Version: 6.0.0
4-
* Date of the Last Update: 2023-09-20
3+
* Last Updated for Version: 7.0.0
4+
* Date of the Last Update: 2024-09-12
55
*
66
* Q u a n t u m L e a P s
77
* ------------------------
88
* Modern Embedded Software
99
*
10-
* Copyright (C) 2005-2023 Quantum Leaps, LLC. All rights reserved.
10+
* Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
1111
*
1212
* Contact information:
1313
* https://www.state-machine.com
@@ -26,7 +26,7 @@ MainWindow {
2626
qproperty-codeBaseColor: white;
2727

2828
/* background for doc edit area */
29-
qproperty-docBaseColor: #FFFFDD; /* light yellow */
29+
qproperty-docBaseColor: #ffffdd; /* light yellow */
3030

3131
/* syntax highlighting styles */
3232
qproperty-comment: "green, #F7F7F7, italic";
@@ -47,41 +47,46 @@ MainWindow {
4747
ExplorerView {
4848
color: black;
4949
background-color: white;
50-
alternate-background-color: #E0E0E0;
50+
alternate-background-color: #e6e6e6;
5151
}
52-
ExplorerView:hover {
53-
background-color: #FFFFDD;
54-
alternate-background-color: #EEEEDD;
52+
ExplorerView::item:hover {
53+
background-color: #ffcccc;
5554
}
5655
ExplorerView::item:selected {
57-
background-color: darkRed;
56+
background-color: #cc0000;
5857
}
5958
/* SearchView ................................................................
6059
*/
6160
SearchView {
6261
font-style: italic;
63-
color: blue;
64-
background-color: lightBlue;
65-
alternate-background-color: #EEEEFF;
62+
color: #000066;
63+
background-color: #e6e6ff;
64+
alternate-background-color: #ccccff;
6665
}
67-
SearchView:hover {
68-
background-color: #DDDDFF;
69-
alternate-background-color: #BBBBEE;
66+
SearchView:item:hover {
67+
background-color: #9999ff;
7068
}
7169
SearchView::item:selected {
72-
background-color: darkBlue;
70+
background-color: #000066;
7371
}
7472
/* DiagramView ...............................................................
73+
* Used in state diagrams
7574
*/
7675
DiagramView {
7776
font-family: "Nimbus Sans L";
7877
font-size: 12px;
7978

8079
qproperty-canvasColor: white;
81-
qproperty-birdsEyeViewColor: #FFFF77;
82-
qproperty-nodePenColor: darkBlue;
83-
qproperty-nodeBrushColor: #E0E0FF;
84-
qproperty-connPenColor: darkRed;
80+
81+
qproperty-nodeColor: #2222ff;
82+
qproperty-nodeColor1: #00ff00;
83+
qproperty-nodeColor2: #ff0000;
84+
qproperty-nodeColor3: #808080;
85+
86+
qproperty-connColor: #e60000;
87+
qproperty-connColor1: #008000;
88+
qproperty-connColor2: #0000cc;
89+
qproperty-connColor3: #000000;
8590
}
8691

8792
/* CodeEdit ..................................................................

‎win64/Resources/qpc/blinky_console.qm‎ renamed to ‎linux/Resources/qpc/blinky_console.qm‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model version="6.2.0" links="1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.state-machine.com/qm/qm.xsd">
2+
<model version="7.0.0" links="1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.state-machine.com/qm/qm7.xsd">
33
<documentation>About this example:
44
-------------------
55
Simple &quot;Blinky&quot; console application for workstations (Windows, Linux, MacOS)
@@ -15,7 +15,9 @@ This example demonstrates:
1515

1616
Building the example:
1717
---------------------
18-
To build this example, you will need the QP/C framework installed on your computer and the GNU-GCC compiler. Both of them will be available if you install the QP-bundle from:
18+
To build this example, you will need the QP/C framework installed on your
19+
computer and the GNU-GCC compiler. Both of them will be available if you
20+
install the QP-bundle from:
1921

2022
https://www.state-machine.com/#Downloads
2123

@@ -63,7 +65,7 @@ QTimeEvt_ctorX(&amp;me-&gt;timeEvt, &amp;me-&gt;super, TIMEOUT_SIG, 0U);</code>
6365
<action>(void)par; // unused parameter
6466
QTimeEvt_armX(&amp;me-&gt;timeEvt,
6567
BSP_TICKS_PER_SEC/2, BSP_TICKS_PER_SEC/2);</action>
66-
<initial_glyph conn="2,3,5,1,20,4,-4">
68+
<initial_glyph color="3" conn="2,3,5,1,20,6,-4">
6769
<action box="0,-2,6,2"/>
6870
</initial_glyph>
6971
</initial>
@@ -72,28 +74,28 @@ BSP_TICKS_PER_SEC/2, BSP_TICKS_PER_SEC/2);</action>
7274
<entry>BSP_ledOff();</entry>
7375
<!--${AOs::Blinky::SM::off::TIMEOUT}-->
7476
<tran trig="TIMEOUT" target="../../2">
75-
<tran_glyph conn="2,13,3,1,18,6,-2">
77+
<tran_glyph color="1" conn="2,16,3,1,18,7,-2">
7678
<action box="0,-2,8,2"/>
7779
</tran_glyph>
7880
</tran>
79-
<state_glyph node="2,5,16,10">
80-
<entry box="1,2,12,4"/>
81+
<state_glyph node="2,6,16,12">
82+
<entry box="0,3,16,4"/>
8183
</state_glyph>
8284
</state>
8385
<!--${AOs::Blinky::SM::on}-->
8486
<state name="on">
8587
<entry>BSP_ledOn();</entry>
8688
<!--${AOs::Blinky::SM::on::TIMEOUT}-->
8789
<tran trig="TIMEOUT" target="../../1">
88-
<tran_glyph conn="2,25,3,1,20,-15,-4">
90+
<tran_glyph color="1" conn="2,30,3,1,20,-19,-4">
8991
<action box="0,-2,8,2"/>
9092
</tran_glyph>
9193
</tran>
92-
<state_glyph node="2,17,16,10">
93-
<entry box="1,2,12,4"/>
94+
<state_glyph color="2" node="2,20,16,12">
95+
<entry box="0,3,16,4"/>
9496
</state_glyph>
9597
</state>
96-
<state_diagram size="24,29"/>
98+
<state_diagram size="30,34"/>
9799
</statechart>
98100
</class>
99101
</package>

0 commit comments

Comments
 (0)