Skip to content

Added text field and visibility selection for frequency to signal generator #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added text field and visibility selection for frequency to signal generator #290

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03c99bc
Added text field and visibility selection for frequency
MrF83 May 2, 2024
36bef17
Fixed text offsets
MrF83 May 2, 2024
4ccd869
Fixed name and code from development
MrF83 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions misc/signal_generator/signal_generator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,30 @@

<declaration>
<meta name="name" value="Signal Generator" />
<meta name="version" value="1.0.0" />
<meta name="author" value="Corsaka" />
<meta name="version" value="2.0.0" />
<meta name="author" value="Corsaka, MrF83" />
<meta name="guid" value="ca532248-3591-4776-9876-0772783669e9" />
<meta name="minsize" value="60" />

<property name="Type" type="enum" default="Sine" serialize="t" display="Type">
<option>Sine</option>
<option>Square</option>
<option>Triangle</option>
<option>Saw</option>
</property>

<property name="Text" type="string" default="" serialize="text" display="Text" />

<property name="Frequency" type="decimal" default="120" serialize="frequency" display="Frequency">
<formatting>
<format conditions="$Frequency[lt]1000" value="$Frequency Hz" />
<format conditions="$Frequency[lt]1000000" value="$Frequency(div_1000)(round_1) kHz" />
<format value="$Frequency(div_1000000)(round_1) MHz" />
</formatting>
</property>

<property name="ShowFrequency" type="bool" default="true" serialize="showFrequency" display="Show Frequency" />

</declaration>
<connections>
<group conditions="horizontal">
Expand All @@ -33,12 +40,26 @@
</connections>
<render>
<!-- text -->
<g conditions="horizontal">
<g conditions="horizontal,$ShowFrequency,!$Text">
<text value="$Frequency" x="_Middle" y="_Start+30" align="CentreCentre" />
</g>
<g conditions="!horizontal">
<g conditions="!horizontal,$ShowFrequency,!$Text">
<text value="$Frequency" x="_Middle+30" y="_Start" align="CentreLeft" />
</g>
<g conditions="horizontal,!$ShowFrequency,$Text">
<text value="$Text" x="_Middle" y="_Start+30" align="CentreCentre" />
</g>
<g conditions="!horizontal,!$ShowFrequency,$Text">
<text value="$Text" x="_Middle+30" y="_Start" align="CentreLeft" />
</g>
<g conditions="horizontal,$ShowFrequency,$Text">
<text value="$Text" x="_Middle" y="_Start+30" align="CentreCentre" />
<text value="$Frequency" x="_Middle" y="_Start+42" align="CentreCentre" />
</g>
<g conditions="!horizontal,$ShowFrequency,$Text">
<text value="$Text" x="_Middle+30" y="_Start-6" align="CentreLeft" />
<text value="$Frequency" x="_Middle+30" y="_Start+6" align="CentreLeft" />
</g>
<!-- circle -->
<ellipse centre="_Middle" rx="20" ry="20" />
<!-- connection lines -->
Expand Down