Skip to content

Commit 22eabd0

Browse files
committed
adds waveform_view_show()
1 parent 25e4682 commit 22eabd0

File tree

4 files changed

+35
-9
lines changed

4 files changed

+35
-9
lines changed

ARM.Arm-2D.pdsc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,11 +1003,11 @@
10031003
</RTE_Components_h>
10041004
</component>
10051005

1006-
<component Cclass="Acceleration" Cgroup="Arm-2D Demos" Csub="Waveform" Cversion="1.2.0" condition="Arm-2D-Demos">
1006+
<component Cclass="Acceleration" Cgroup="Arm-2D Demos" Csub="Waveform" Cversion="1.3.0" condition="Arm-2D-Demos">
10071007
<description>A demo of showing a waveform diagram.</description>
10081008
<files>
1009-
<file category="sourceC" name="examples/demos/arm_2d_scene_waveform.c" attr="config" version="1.2.0" />
1010-
<file category="header" name="examples/demos/arm_2d_scene_waveform.h" attr="config" version="1.2.0" />
1009+
<file category="sourceC" name="examples/demos/arm_2d_scene_waveform.c" attr="config" version="1.3.0" />
1010+
<file category="header" name="examples/demos/arm_2d_scene_waveform.h" attr="config" version="1.3.0" />
10111011
</files>
10121012
<RTE_Components_h>
10131013
#define RTE_Acceleration_Arm_2D_Demos_Waveform

examples/common/controls/waveform_view.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,28 @@ void waveform_view_on_frame_complete( waveform_view_t *ptThis)
200200
arm_generic_loader_on_frame_complete(&this.use_as__arm_generic_loader_t);
201201
}
202202

203+
ARM_NONNULL(1,2)
204+
void waveform_view_show(waveform_view_t *ptThis,
205+
const arm_2d_tile_t *ptTile,
206+
const arm_2d_region_t *ptRegion,
207+
bool bIsNewFrame)
208+
{
209+
assert(NULL!= ptThis);
210+
if (-1 == (intptr_t)ptTile) {
211+
ptTile = arm_2d_get_default_frame_buffer();
212+
}
213+
214+
215+
arm_2d_container(ptTile, __waveform_panel, ptRegion) {
216+
217+
arm_2d_tile_copy_only( &this.tTile,
218+
&__waveform_panel,
219+
NULL);
220+
221+
}
222+
223+
}
224+
203225
ARM_NONNULL(1)
204226
static
205227
arm_2d_err_t __waveform_view_decoder_init(arm_generic_loader_t *ptObj)

examples/common/controls/waveform_view.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,12 @@ extern
134134
ARM_NONNULL(1)
135135
void waveform_view_on_frame_complete( waveform_view_t *ptThis);
136136

137-
138-
137+
extern
138+
ARM_NONNULL(1,2)
139+
void waveform_view_show(waveform_view_t *ptThis,
140+
const arm_2d_tile_t *ptTile,
141+
const arm_2d_region_t *ptRegion,
142+
bool bIsNewFrame);
139143
#if defined(__clang__)
140144
# pragma clang diagnostic pop
141145
#endif

examples/demos/arm_2d_scene_waveform.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,11 @@ IMPL_PFB_ON_DRAW(__pfb_draw_scene_waveform_handler)
277277

278278
arm_2d_align_centre(__item_region, this.tWaveform.tTile.tRegion.tSize) {
279279

280-
/* draw waveform as a normal tile */
281-
arm_2d_tile_copy( &this.tWaveform.tTile,
280+
waveform_view_show( &this.tWaveform,
282281
ptTile,
283-
&__centre_region);
282+
&__centre_region,
283+
bIsNewFrame);
284+
284285
}
285286
}
286287

@@ -426,7 +427,6 @@ user_scene_waveform_t *__arm_2d_scene_waveform_init( arm_2d_scene_player_t *pt
426427
.u2SampleSize = WAVEFORM_SAMPLE_SIZE_HWORD,
427428
.u5DotHeight = 2,
428429
.bUnsigned = false,
429-
430430

431431
.tBrushColour.tColour = GLCD_COLOR_NIXIE_TUBE,
432432
.tBackgroundColour.tColour = this.use_as__arm_2d_scene_t.tCanvas.wColour,

0 commit comments

Comments
 (0)