Skip to content

Commit

Permalink
Squashed 'praat/' changes from bad19fd5f..1601ce6b8
Browse files Browse the repository at this point in the history
1601ce6b8 Merge pull request #1469 from PaulBoersma/master
4af7a566a for version 6.1.29
a7ee7cc90 Merge pull request #1468 from PaulBoersma/master
e97597372 rid some null references
e99bffca4 Merge pull request #1467 from davidweenink/master
c69fb50a9 maual page: description of Sound: To FormantPath algorithm
e4529bc73 Merge https://github.com/praat/praat
b70c64988 Merge pull request #1466 from davidweenink/master
e203fd0df Remove old code
ce578ea06 prepare for gtk3 (5): left align dynamic menu items
a316deabe Merge pull request #1465 from davidweenink/master
acea0cd2c different kinds of yellow
80f7255c7 made drawing of ellipse more explicit
1bab13c2c Merge https://github.com/praat/praat
c03dde33f Merge pull request #1376 from dlukes/fix-interactive-shell
a9f15ca5b Merge pull request #1423 from adriaandegroot/reduce-warnings
6ec24c4b8 Merge pull request #1464 from PaulBoersma/master
1d0896b49 for version 6.1.28
b4a658311 for version 6.1.28
258837474 Merge pull request #1463 from PaulBoersma/master
3e7685621 crash in "PitchTier: View & Edit"
8d863efb2 Picture window: prevent multiple history entries when dragging
c896d382b Merge https://github.com/praat/praat
877de6056 Merge pull request #1462 from PaulBoersma/master
0b6e13ca3 multiline text in pause forms (for online exams)
811ff0dee rid some ints
efba27871 prevent some warnings
48ffbaaa2 Merge https://github.com/praat/praat
3262f852d mark selected with other colours
cb7292026 repair pointer and info at bottom
e6cc3f640 Merge pull request #1461 from PaulBoersma/master
9a518bf08 Linux font listing
ba3ac5076 Merge pull request #1460 from davidweenink/master
c88d52085 style, better formant ceiling step size
4e1456390 Merge https://github.com/praat/praat
77a65dc48 Merge pull request #1459 from PaulBoersma/master
8f6b67f0a for version 6.1.27
87a0c5c2e Merge pull request #1458 from davidweenink/master
95d7fa486 Merge https://github.com/praat/praat
d224fc071 prepare for gtk3 (4)
77d869c2d Merge pull request #1457 from PaulBoersma/master
6d3591a13 update Demo window after each "demo" statement in script
98a5ef99d Merge pull request #1456 from PaulBoersma/master
e51037b8c type fixes
6dd40f714 Merge pull request #1455 from davidweenink/master
db576625a style
11689d16d Merge pull request #1454 from davidweenink/master
1ff576714 use stress instead of roughness
d9d18e3bc Merge pull request #1453 from davidweenink/master
0dc1523c3 Merge https://github.com/praat/praat
0b4e601d9 style
e7432211d better area calculations
bb685b06e BURG is default
d70ea78f3 Sound_to_FormantPath: ceilingExtensionFraction
abe353def less compiler warnings
b72c5b137 Merge pull request #1452 from PaulBoersma/master
d119716e2 made formant dots easier to see against backgrounds, and odd/even alternating
4cd0580a2 Merge pull request #1451 from PaulBoersma/master
dc230c45e prevented double drawing of sound when pulses are visible
29252be1a Merge pull request #1450 from PaulBoersma/master
4f199a179 icons
031f2d5a4 Merge pull request #1449 from davidweenink/master
f2a5bd2a6 modify comment in Sound_to_FormantPath_burg form
2f3e55cbc Merge pull request #1448 from davidweenink/master
f32391772 Merge https://github.com/praat/praat
dfe233bdf mark formantsin selection
ec356abc9 Merge pull request #1447 from davidweenink/master
76449d14b change ceiling calculations
5898965f9 Merge pull request #1446 from davidweenink/master
a6e56f164 style
585281d56 Merge pull request #1445 from davidweenink/master
45b9e603f Candidate modelling settings... manual page
d620abc67 Merge pull request #1444 from davidweenink/master
e0ea3c51d Only keep selected formant if selection didn't change
275e194b6 Merge pull request #1443 from davidweenink/master
e75ada23c cleanup
758a4455c Merge pull request #1442 from davidweenink/master
997aee70d Drawing of models possible
e63f1fcea add drawing of models
effb1ec42 draw models
5efbcd2b0 style
bf778a3f4 Merge pull request #1441 from davidweenink/master
dd56caceb style
8ed278fe4 correction of manual page
21a91f635 Merge https://github.com/praat/praat
611c997ac style, remove Tier & Interval menu
2ec5d1e9e Merge pull request #1440 from PaulBoersma/master
c2374a0c6 Merge remote-tracking branch 'refs/remotes/praat/master'
56cd29931 for version 6.1.26
aa107335a Merge pull request #1439 from davidweenink/master
557bb0c09 Linux crash when clicking Change in DataEditor
476a10148 Rafael Laboissières patches for gtk3 (picture window and editors windows are empty)
046ad74e4 rid crash on Windows when dragging out of the window
c303b50e2 Merge https://github.com/praat/praat
a258973a4 prepare for gtk (3), thx Rafael Laboissière
3cd3efb1e Windows for version 6.1.25
3d5e50874 Merge pull request #1437 from PaulBoersma/master
23848a237 FormantPath manual for 6.1.25
096e1beea for version 6.1.25
c792bd6db Merge pull request #1436 from PaulBoersma/master
6c0f5ac00 rid Graphics_mouse
bd24f1bb5 FormantPathEditor resets font size
181a657f2 Merge remote-tracking branch 'refs/remotes/praat/master'
c59ef4269 for version 6.1.25
b4bd87abf Merge pull request #1435 from davidweenink/master
9bd5896ba inset selectionViewer
7c386402f rid crash in CC drawing when no frames
a46f727cd Merge pull request #1434 from PaulBoersma/master
410fe8422 rid crash on zooming in to an empty Sound region when pitch is visible
e7495a5cf Merge pull request #1433 from PaulBoersma/master
85ebaa066 rid crash when pasting into a part of the Sound with no samples
a3c1709b1 Merge https://github.com/praat/praat
abbe2e336 Merge pull request #1432 from PaulBoersma/master
b16e29e0f Windows: implemented vertical wheel scrolling for manual
4efc6d5d0 Merge pull request #1431 from PaulBoersma/master
d9263d6af implemented vertical wheel scrolling in Picture window on Windows
2419fb2fe more consistent mouse messages on Mac
be7f41956 Merge pull request #1430 from PaulBoersma/master
0a53b7c87 Linux rid crash on double click in Sound window
0ca0ff37e DemoEditor single Graphics
9aabcc547 Merge https://github.com/praat/praat
d8b509602 rid v_click
da69ccaec Merge pull request #1427 from PaulBoersma/master
6373ed22c Merge remote-tracking branch 'refs/remotes/praat/master'
83c1e8cd7 clarify Graphics_utils
1ff650d0f Merge https://github.com/praat/praat
6e12b44db Merge pull request #1426 from davidweenink/master
3036715e0 Merge https://github.com/praat/praat
c12d089c2 restructure menu
7a994f7b5 restructure menu
4e642f0d2 Merge pull request #1424 from PaulBoersma/master
0c1f395c6 corrected bolding in drawing of EditDistanceTable
2811776d4 Reduce warnings from MelderString
766340cb8 Merge pull request #1422 from PaulBoersma/master
2eb13f9a9 rid crash when clicking the About box twice
23480da7d create no superfluous graphics contexts
41552c2ca Merge pull request #1421 from davidweenink/master
d88035ff8 prepare for gtk3 (3)
31556c7cc Merge https://github.com/praat/praat
de522d739 prepare for gtk3 (2)
5c471a444 Merge pull request #1419 from PaulBoersma/master
469e5b6e4 for version 6.1.24
4bef6e486 Merge pull request #1418 from PaulBoersma/master
e4a745594 clarified GuiShell
7d9b259dc Merge pull request #1417 from PaulBoersma/master
ab1a25848 Linux: removed all flashing
039762d17 Merge pull request #1416 from davidweenink/master
b3cdef10e Prepare for gtk3: use accessor functions (part)
a7cd0b16a Merge pull request #1415 from PaulBoersma/master
d56be0171 for version 6.1.23
204927afa Merge https://github.com/praat/praat
82a88bc09 Merge pull request #1414 from PaulBoersma/master
38881f48f broken keyboard error
f6bf901cd Merge https://github.com/praat/praat
63e108c1e Merge pull request #1413 from PaulBoersma/master
6ce5baf17 constant overtly real
35c81a7f1 Merge pull request #1412 from PaulBoersma/master
a93510ec5 Windows rid all flashing
764f40389 Merge pull request #1411 from PaulBoersma/master
5a83d0ddd Windows rid most flashing
cfe0945c4 Windows floating point rounding test
02d5f0125 Merge https://github.com/praat/praat
f8e0c822e Merge pull request #1410 from davidweenink/master
06fb37745 Merge https://github.com/praat/praat
15e1821dd remove objects after test
e98397315 Merge pull request #1409 from PaulBoersma/master
86bd17315 for version 6.1.22
545612257 update manual on programming
a85e37b12 corrected a bug introduced in 6.1.17alpha that could cause incorrect line spacing in the Picture window
f687b78d5 rid stray casual messages
f76d5368c remove uncessary code
69f008686 make FormantPath sampling consistant
a85315fe9 Sound_into_LPC
542e505de Merge https://github.com/praat/praat
9bd2defd0 Merge pull request #1408 from PaulBoersma/master
60f3b3144 corrected comment on draining
515406fac Windows: corrected draining when playing
05eff01f5 Merge https://github.com/praat/praat
d20d816ca Merge pull request #1407 from PaulBoersma/master
a9b0537af for version 6.1.21
83fc3a4b5 praatObscured can have a password
2a050d614 more separation between graphics recording and playing
245d6097d Merge https://github.com/praat/praat
0597d69cf Merge pull request #1406 from PaulBoersma/master
164398d53 delete commented out stuff
ed6ce39fe Merge pull request #1405 from PaulBoersma/master
bde52e655 (unstable) much faster minimization mnitoring
29421e21d (unstable) uncrash Melder_monitor in Mimimizer
eb747b5ba Merge https://github.com/praat/praat
6db6dcf88 Merge pull request #1404 from PaulBoersma/master
776946b76 (unstable) movies testing
cd41241f7 Merge pull request #1403 from PaulBoersma/master
a002a7211 (unstable) articulatory synthesizer with spoken movie
f897d4c2c Merge pull request #1402 from PaulBoersma/master
b2f8101e4 (unstable) unquickfix GuiShell_drain
6e3d482ae Merge pull request #1401 from PaulBoersma/master
357f05717 Merge remote-tracking branch 'refs/remotes/praat/master'
19f87c008 (unstable) Matrix movie and Artword-Speaker-movie on Windows
529ab1fdb (unstable) Melder_monitor for OTMulti
1d462edce Merge pull request #1400 from PaulBoersma/master
cc21b9a6f (unstable)  Melder_monitor for OTGrammar on Windows and Linux
1b4cef72d Merge pull request #1399 from PaulBoersma/master
7938a6ca6 (unstable) Melder_monitor for OTGrammar on Mac
182bf7b08 Merge https://github.com/praat/praat
9d67f820b style
ed7ea6dd8 (unstable) accept both dynamically and statically linked Praat on Linux
c0229b6c4 Merge pull request #1398 from PaulBoersma/master
2fc386b3c (unstable) NoulliGridEditor updates selection while playing
a2e0ae7fe Merge pull request #1397 from PaulBoersma/master
d25199097 (unstable) made VowelEditor listen to size preferences
f0b6207b8 (unstable) VowelEditor simplify
498f1320d Merge pull request #1396 from PaulBoersma/master
413976889 (unstable) VowelEditor redraws while dragging
c208a104f (unstable) interpolation bits
0f3c49876 Merge https://github.com/praat/praat
e54f85752 Merge pull request #1395 from PaulBoersma/master
fec03f3e8 (unstable) better checking of interpolation types
f4211c559 (unstable) Mac ensure that message is written even if alert crashes
9f7606bc5 Merge https://github.com/praat/praat
9ee2b7a82 fadeIn/Out change int to bool
508deb7cd Merge pull request #1394 from PaulBoersma/master
f74f91f3f (unstable) manual update
c9ed9b95d (unstable) removed a decades-old bug by which an extremum allegedly computed by cubic interpolation would actually have been computed by sinc700
28e27ad7b Merge pull request #1393 from PaulBoersma/master
bdc824fba (unstable) typos
abed32b4c Merge pull request #1392 from PaulBoersma/master
9569a76fc (unstable:) Linux RunnerMFC blankWhilePlaying
9263ddc2f Merge pull request #1391 from PaulBoersma/master
cdb970bf9 (unstable:) PitchEditor ignores drag and drop after click on point
c0aa83364 Merge pull request #1390 from PaulBoersma/master
babd48612 (unstable:) RunnerMFC draws only on expose event
f49605c7a Merge pull request #1389 from PaulBoersma/master
b0d82928f (unstable:) circumvent new Sound_to_LPC multithreading bug
7f6f5ec81 (unstable:) more radio buttons are lower case
7ab9ced5c (unstable:) comments in Sound: Record fixed time
6586655c3 (unstable:) Sound_getNearestLevelCrossing symmetric logic
5b2d3399c (unstable:) correct logic
93020348d (unstable:) idiomatic isundef
3e37dc5c6 Merge pull request #1387 from PaulBoersma/master
29be9ae1c (unstable:) fix conversions from autoVEC to constVEC
be13e1897 Merge remote-tracking branch 'refs/remotes/praat/master'
934a3f292 (unstable:) RunnerMFC: ignore mouse drags and ups
6fb2d3be0 (unstable:) rid stray message
36272d350 (unstable:) allow statically as well as dynamically linked Linux
3f8edd9d9 (unstable:) autoVEC shan't convert to constVEC
e8e586a09 Merge pull request #1388 from davidweenink/master
b7625e0b2 fix possible seg fault (thx Yannick Yadoul)
bc9d765be remove old virtual routines
d2a6da4ef remove old virtual routines
7e708f438 Merge https://github.com/praat/praat
a3db7f2d3 (unstable:) for version 6.1.20beta
2ef14c97e (unstable:) repaired some cases of different behaviour between "" and null
a58f5ec76 (unstable:) hex$ with key
13be5123e Merge pull request #1386 from PaulBoersma/master
821aed551 (unstable:) drags and mouse-ups in HyperPage ignored
36e958e4c (unstable:) hex$, unhex$
f022286c9 Merge https://github.com/praat/praat
8dd3b3bba Merge pull request #1385 from PaulBoersma/master
b5860b599 (unstable:) for version 6.1.19beta
e487deb6d solve merge conflict
efb817226 Merge pull request #1384 from PaulBoersma/master
68edcbde0 (unstable:) FormantGridEditor draws only on expose
66fba828f Merge pull request #1383 from PaulBoersma/master
295ab1a61 (unstable:) RealTierArea draws selected red points on top of blue dots
7c80d1055 Merge pull request #1382 from PaulBoersma/master
7a9eb6931 (unstable:) consistent naming of accessors
d9e2b1c91 (unstable:) accessors can be lvalues
55a406243 Merge pull request #1381 from PaulBoersma/master
2a593ffb4 (unstable:) accessors; redo Forget
94a8364b3 (unstable:) rid v_clickB and v_clickE
f82239963 Merge pull request #1380 from PaulBoersma/master
bb7e834f4 (unstable:) running cursor at expose time
e2cc70ba4 (unstable:) lowest area snug to rectangles in editors
fb5fad581 (unstable:) rid stray lines though ManipulationEditor's duration area
1347ef97e Merge https://github.com/praat/praat
79de749ba Merge pull request #1379 from PaulBoersma/master
8fbe5a564 (unstable:) for version 6.1.18
3ef2df9d5 (unstable:) better RealTier areas
1616d839e Merge pull request #1378 from PaulBoersma/master
ae51eaf37 (unstable:) ManipulationEditor correct dragging
dcaf03d1f Fix #199
345033ee3 Set correct Formant version in definition
424e1320a Merge https://github.com/praat/praat
181f08d4f Merge pull request #1375 from PaulBoersma/master
9b018c1b5 (unstable) ManipulationEditor uses PitchTierArea
20eeb2b19 Merge https://github.com/praat/praat
91b039c3f style
9e2ed3457 style
a61e10963 Merge pull request #1374 from PaulBoersma/master
ac96bb2ba (unstable) rename view to area, as in manual
f929e2cc5 Merge pull request #1373 from PaulBoersma/master
ef02c2b81 (unstable) PitchTierArea understands semitones
2928755c2 remove merge conflict
32a0022dd Merge pull request #1372 from PaulBoersma/master
f5cae54fc (unstable) fix patest_record
4e8e69069 (unstable) prepare working Manipulation window
e65ded681 style
3ef42b9b8 Merge pull request #1370 from PaulBoersma/master
472a23d0b (unstable) correct descendants of KlattGrid_RealTierView
2034b718f Merge pull request #1369 from PaulBoersma/master
e37a33d65 (unstable) RealTierView
56b9dea95 Merge pull request #1368 from PaulBoersma/master
5b95e768a (unstable) recording with visual feedback
e3416be95 Merge pull request #1367 from PaulBoersma/master
48fccb6d4 (unstable) for version 6.1.17alpha
3675db5e1 Merge pull request #1366 from PaulBoersma/master
15b69f589 (unstable) expose-based dragging
f9e5318b9 Merge pull request #1365 from PaulBoersma/master
aa2a8d86b (unstable) PortAudio update
30583303d also edit FilePath and Sound
99fdc442c rename: now Discriminant_TableOfReal_mahalanobis_all
981022a69 (unstable) more expected behaviour in RealTierEditor
5546d2c9e (unstable) Melder_moveCloserToBy
3da0f7b1f (unstable) again same About box on all platforms
84e92f760 (unstable) event-based logo
90736e10a (unstable) rid highlight direction
5319a940c Merge pull request #1363 from PaulBoersma/master
cc163f8fa (unstable) toward RealTierView (to help e.g. ManipulationEditor)
c4f791303 Merge pull request #1362 from PaulBoersma/master
d55f661c4 (unstable) rid Graphic_initDraw()
364a0da53 Merge pull request #1361 from PaulBoersma/master
d196acc46 (unstable) event-based drawing in Demo window
38167a1ed (unstable) move Graphics_clearWs to expose event time
98da37d08 Merge pull request #1358 from PaulBoersma/master
844000e2f (unstable) event-based PitchEditor and MovieWindow
02446a70e Merge pull request #1357 from PaulBoersma/master
895a360bd (unstable) event-based dragging in RealTierEditor
ac9f1ed15 (unstable) rid TimeSoundEditor::v_click[B]()
edc805af3 Merge pull request #1356 from PaulBoersma/master
b2a53ea1c (unstable) FunctionEditor navigation
f7ef22c58 Merge pull request #1354 from PaulBoersma/master
065e78aaf (unstable, breaking) TextGridEditor better dragging logic
aa0b65574 Merge pull request #1353 from PaulBoersma/master
487be3c37 (unstable, breaking) modernized PointProcess_getWindowPoints
f92304994 Merge pull request #1352 from PaulBoersma/master
13ffb8fbe (unstable, breaking) voice analysis
262bbec54 Merge pull request #1351 from PaulBoersma/master
f4c606c67 (unstable, breaking) rid duringXor for Linux
472971409 Merge pull request #1350 from PaulBoersma/master
585627624 (unstable, breaking) rid duringXor on Mac
6ba5e459f Merge pull request #1349 from PaulBoersma/master
3163a594c (unstable, breaking) rid d_macColour
d9c9bd4c6 Merge pull request #1348 from PaulBoersma/master
1fe49d31e (unstable, breaking) event-based highlighting
cf7e45ae1 Merge pull request #1347 from PaulBoersma/master
3a3f6cc25 (unstable, breaking) rid Graphics_unhighlight
ed2ae22c2 Merge pull request #1346 from PaulBoersma/master
928ad0ca9 (unstable) event-based dragging: SoundEditor; rid v_unhighlightSelection
1159de3f4 Merge pull request #1345 from PaulBoersma/master
67adb6ffa (unstable, breaking) event-based dragging (SoundEditor, TextGridEditor), rest not functional
f12763ce1 repaired parameter interchange bug
ce2767646 refactoring Discriminant
6be03d674 refactoring of Discriminant
5ec7d6cf0 Merge https://github.com/praat/praat
6bedce4c3 path finder
548faf4f8 make sure for FormantPath all analyses use the same sampling
fedacdd89 path finder explicit
b4723ec13 make explicit first and last match
9af8a979e style
c7ae15345 Repaired a bug in Table_lineGraphWhere
a9ec972f4 more TextGridNavigator queries
630f160f0 Improved pathFinder
4766f5f36 style: roughness instead of smoothness
1203b8692 Merge pull request #1341 from PaulBoersma/master
48b75a142 faster pitch testing script
353b46965 introduce smoothness
d893a0f42 remove FormantModelerList from editor (2)
8882fa7b8 remove FormantModelerList from editor (1)
f9e50bf64 INTVEC from string
a4fdbbd07 draw the candidates
3bf3b7aac remove shift of tracks
d86a65ac7 solve merge conflict
a1d11eb0a remove old FormantPath stuff
af467a268 accept less data than parameters in models
51f96cd66 Merge pull request #1338 from PaulBoersma/master
7bdb427b7 "formant ceiling" in manual
5b256977a remove pathTier, step 1
ed39ab1b0 const
d15ee8c02 const
c561018a4 better count of matches
b5980dfa0 Solve merge confict
5b8e8493d Merge pull request #1337 from PaulBoersma/master
80f16915e allow spaces when reading an oo_ENUM
5995ae8e2 Merge pull request #1336 from PaulBoersma/master
a3a9a7f4a for version 6.1.16
f946be5d8 Merge pull request #1335 from PaulBoersma/master
bcf56a108 detect audio output device change
eebb988e2 interfaces for TextGridNavigator
acb9c17c5 correct argument for virtual functions
1bd3b6deb style
aa6be3df4 More functionality
da3173094 TextGridNavigator
776307a55 style
36c589f1f TextGridNavigator first try
97f456bfb NavigationContext
611f17397 style
4d4a0b236 Merge pull request #1334 from PaulBoersma/master
acb547308 the word "auto" is reserved to mean 'automatic'
563355fa3 Merge pull request #1333 from PaulBoersma/master
9d5a86552 corrected FormatPath creation
e98089286 FormantPath uses FunctionList to store names
771e4b8ba revert no match list
1e07398ab solve merge conflict
3b6d0d9a8 Merge pull request #1331 from PaulBoersma/master
eb91415ec integers should be bools
e26dff530 context need not touch navigation interval
16f5797e3 integers should be doubles
41908c2d3 missing prototypes
3acc2fb36 + dwtools/IntervalTierNavigator_enums.h
f476180d6 Merge pull request #1330 from PaulBoersma/master
30f5570a0 reconstruct missing enums file
e10032b4e Merge pull request #1329 from davidweenink/master
4edb12bbe better names
11f0c9df2 Merge pull request #1328 from davidweenink/master
0e028f98f make info override
dfd310aca Merge pull request #1327 from davidweenink/master
3e4f7b941 typo
43ea4cb2e Merge pull request #1326 from davidweenink/master
bdeb972c7 Merge branch 'FormantPathEditor'
202e12e40 manual page
93f0e9a47 Add navigateSettingsButton
5d2fe320e Get STRVEC match ok
66e265838 style
ec6a01a07 style
7f8ce693f set navigation buttons sensitive
0b521fe31 no need for stae, always query
5b8d9152f Navigation with left and right context
95d0e7306 navigation can use context
2dc19bc4f We need navigationTierNumber
1e459c29b FormantPathEditor now allows interval tier navigation
b690eeadb more navigation
485bf0258 IntervalTierNavigator
74c9da795 Merge pull request #1325 from PaulBoersma/master
f9661936c lapack faster compilation
368fc80ae Merge pull request #1324 from PaulBoersma/master
6a0676e32 divide up for speed
7e70cf39a Merge pull request #1323 from PaulBoersma/master
e9ff93fd9 --
4077c4c3e start using textgrid navigation
015a78638 TextGridNavigator
3c7fd514f Merge pull request #1322 from PaulBoersma/master
99572461e collapsed blas
fc22ff8f9 Merge pull request #1321 from PaulBoersma/master
5cab7e5a5 delete superfluous files
bcb596e94 Merge pull request #1320 from PaulBoersma/master
f8aae1ca9 collapse lapack for speed
1716df9a1 more clapack for Mac
44d2d35ea Merge pull request #1319 from PaulBoersma/master
931e992bb allow use of SpeechSynthesizer for Cygwin users
81e1b4f7e Merge pull request #1318 from PaulBoersma/master
96b2d2f40 gave anonymous error a name
324c24cb0 delete obsolete comment
db8e9a58c Merge pull request #1317 from PaulBoersma/master
c8d65be5c lapack statics
71b33199e Merge pull request #1316 from PaulBoersma/master
349d52027 lapack static constants moved into function bodies
ff13e05ef standard libraries always statically linked
70bda4390 Choose formant colours
4f4f7820b find the best model
57adc2ea7 Use of three colours in the editor to also mark a selection
59ebd42ef Editor can now copy data from TextGridView
dca2fef10 TextGridView_to_TextGrid
90faec119 FormantPathEditor runs
464a9e99c Solve merge conflict
f28ba42fc Formant path etc
74e760376 FormantPathEditor
303cfb5bf FormantPath includes Sound and TextGrid
d8f726392 FormantList becomes FormantPath
12b769723 style
b051b17d3 More drawing
2949b47f6 View works ok now
c660fe8f4 Use TextGridView
41a4d4603 prepare for tier selection
ede3890ff style
bc6f13d06 removed bug in Covariances_getMultivariateCentroidDifference
a00f54b2f improved marking of possibly outdated info
c4c431ea3 more drawing possibilities
6dcae3787 refactoring
f24aae898 More consistent style, naming and colouring
22345f14e FormantEditor documentation
57f9d1f3a Improved message
af6831e02 style
e520496e5 detect the log tier
b7c21273f style
a730e1340 Restoring editor state partially
d14555f57 For reconstruction
ac13227ef More info
bb7c99d1a change how FormantEditor is called
d0798b33d menu_cb_BoundariesToNearestZeroCrossing
97869e389 style
d5476f71f Modeler menu is now Formant menu
c617fb29c simplify
a51ed5982 we need v_createMenus_analysis_formant for FormantEditor
f12bf2e6a FormantEditor needs three or four objects
81749777a use VEC
7a116b116 we need v_createMenus_analysis_formant for FormantEditor
1204551e2 FIND_FOUR_WITH_IOBJECT
31b786a50 style
2b538d86b Inverse filtering possible
ef31a1eec typos
fe22302db Remove interval
2d73d7a30 extend functionality
e82794fb7 slave tier is log tier now
7cc0018bd Formant drawing
31102bf1e symmetric ceilings
a939ef8da added v_draw_analysis_formants for use in FormantEditor
bf0cb1948 modify formant frames
ed67d6f69 rename variable
0773ff984 We need identification because object names are not saved
9b704bb18 Thing_implement now corresponds to _def.h
f8399a960 Clear text
2ec553fe3 simplifications
232da0569 master-slave with text
31774379a Merge branch 'master' into FormantEditor
73ad2b1a1 master-slave, master filled
cbf2baad5 master-slave, best3 not functional
a43214f7f selection colour
7c5134a1d better drawings
e5ff4b93e row-column indexing
99e252fd0 offsets in user units
e2ce353c8 offsets in user units
eecdfbdde Merge branch 'master' into FormantEditor
a58234d08 on the way to an editor (2)  does not compile
765d39de7 on the way to an editor (1)
3a59c12fd remove some menu items
9ad2a8595 Include Sounds too
a3a63833b more standardisation of treatment of argument values
61e5a5f40 Merge branch 'master' into FormantEditor
9e93f899b FormantListWithHistory links now
6193bb8d7 FormantEditor not yet functional
44b4d5c02 Merge branch 'master' into FormantEditor
f0bc4e80d Rename
1e461e35d Draw trajectory with colours simplified
6319450f6 solve merge conflict
e8c018cfc DataModeler_enums start
94453047a more prefs
a1284fc3f Merge https://github.com/praat/praat into FormantAnalyzer
70ce0b391 first version of FormantAnalyzer

git-subtree-dir: praat
git-subtree-split: 1601ce6b87120d40cdf6151c3906c502c871d0ba
  • Loading branch information
YannickJadoul committed Oct 28, 2020
1 parent 7c1bb7d commit 0d21298
Show file tree
Hide file tree
Showing 815 changed files with 167,223 additions and 166,754 deletions.
40 changes: 12 additions & 28 deletions EEG/praat_EEG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -475,79 +475,63 @@ FORM (REAL_ERP_getMinimum, U"ERP: Get minimum", U"Sound: Get minimum...") {
SENTENCE (channelName, U"Channel name", U"Cz")
REAL (fromTime, U"left Time range (s)", U"0.0")
REAL (toTime, U"right Time range (s)", U"0.0 (= all)")
RADIOx (interpolation, U"Interpolation", 4, 0)
RADIOBUTTON (U"None")
RADIOBUTTON (U"Parabolic")
RADIOBUTTON (U"Cubic")
RADIOBUTTON (U"Sinc70")
RADIOBUTTON (U"Sinc700")
RADIO_ENUM (kVector_peakInterpolation, peakInterpolationType,
U"Interpolation", kVector_peakInterpolation::SINC70)
OK
DO
NUMBER_ONE (ERP)
integer channelNumber = ERP_getChannelNumber (me, channelName);
if (channelNumber == 0) Melder_throw (me, U": no channel named \"", channelName, U"\".");
double result;
Vector_getMinimumAndX (me, fromTime, toTime, channelNumber, interpolation, & result, nullptr);
Vector_getMinimumAndX (me, fromTime, toTime, channelNumber, peakInterpolationType, & result, nullptr);
NUMBER_ONE_END (U" Volt")
}

FORM (REAL_ERP_getTimeOfMinimum, U"ERP: Get time of minimum", U"Sound: Get time of minimum...") {
SENTENCE (channelName, U"Channel name", U"Cz")
REAL (fromTime, U"left Time range (s)", U"0.0")
REAL (toTime, U"right Time range (s)", U"0.0 (= all)")
RADIOx (interpolation, U"Interpolation", 4, 0)
RADIOBUTTON (U"None")
RADIOBUTTON (U"Parabolic")
RADIOBUTTON (U"Cubic")
RADIOBUTTON (U"Sinc70")
RADIOBUTTON (U"Sinc700")
RADIO_ENUM (kVector_peakInterpolation, peakInterpolationType,
U"Interpolation", kVector_peakInterpolation::SINC70)
OK
DO
NUMBER_ONE (ERP)
integer channelNumber = ERP_getChannelNumber (me, channelName);
if (channelNumber == 0) Melder_throw (me, U": no channel named \"", channelName, U"\".");
double result;
Vector_getMinimumAndX (me, fromTime, toTime, channelNumber, interpolation, nullptr, & result);
Vector_getMinimumAndX (me, fromTime, toTime, channelNumber, peakInterpolationType, nullptr, & result);
NUMBER_ONE_END (U" seconds")
}

FORM (REAL_ERP_getMaximum, U"ERP: Get maximum", U"Sound: Get maximum...") {
SENTENCE (channelName, U"Channel name", U"Cz")
REAL (fromTime, U"left Time range (s)", U"0.0")
REAL (toTime, U"right Time range (s)", U"0.0 (= all)")
RADIOx (interpolation, U"Interpolation", 4, 0)
RADIOBUTTON (U"None")
RADIOBUTTON (U"Parabolic")
RADIOBUTTON (U"Cubic")
RADIOBUTTON (U"Sinc70")
RADIOBUTTON (U"Sinc700")
RADIO_ENUM (kVector_peakInterpolation, peakInterpolationType,
U"Interpolation", kVector_peakInterpolation::SINC70)
OK
DO
NUMBER_ONE (ERP)
integer channelNumber = ERP_getChannelNumber (me, channelName);
if (channelNumber == 0) Melder_throw (me, U": no channel named \"", channelName, U"\".");
double result;
Vector_getMaximumAndX (me, fromTime, toTime, channelNumber, interpolation, & result, nullptr);
Vector_getMaximumAndX (me, fromTime, toTime, channelNumber, peakInterpolationType, & result, nullptr);
NUMBER_ONE_END (U" Volt")
}

FORM (REAL_ERP_getTimeOfMaximum, U"ERP: Get time of maximum", U"Sound: Get time of maximum...") {
SENTENCE (channelName, U"Channel name", U"Cz")
REAL (fromTime, U"left Time range (s)", U"0.0")
REAL (toTime, U"right Time range (s)", U"0.0 (= all)")
RADIOx (interpolation, U"Interpolation", 4, 0)
RADIOBUTTON (U"None")
RADIOBUTTON (U"Parabolic")
RADIOBUTTON (U"Cubic")
RADIOBUTTON (U"Sinc70")
RADIOBUTTON (U"Sinc700")
RADIO_ENUM (kVector_peakInterpolation, peakInterpolationType,
U"Interpolation", kVector_peakInterpolation::SINC70)
OK
DO
NUMBER_ONE (ERP)
integer channelNumber = ERP_getChannelNumber (me, channelName);
if (channelNumber == 0) Melder_throw (me, U": no channel named \"", channelName, U"\".");
double result;
Vector_getMaximumAndX (me, fromTime, toTime, channelNumber, interpolation, nullptr, & result);
Vector_getMaximumAndX (me, fromTime, toTime, channelNumber, peakInterpolationType, nullptr, & result);
NUMBER_ONE_END (U" seconds")
}

Expand Down
40 changes: 20 additions & 20 deletions FFNet/praat_FFNet_init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ END }

FORM (NEW1_FFNet_ActivationList_to_Categories, U"FFNet & ActivationList: To Categories", 0) {
RADIO (categorizationgMethod, U"Categorization method", 1)
RADIOBUTTON (U"Winner-takes-all")
RADIOBUTTON (U"Stochastic")
RADIOBUTTON (U"winner-takes-all")
RADIOBUTTON (U"stochastic")
OK
DO
CONVERT_TWO (FFNet, ActivationList)
Expand Down Expand Up @@ -398,8 +398,8 @@ DO

FORM (NEW1_FFNet_PatternList_to_Categories, U"FFNet & PatternList: To Categories", U"FFNet & PatternList: To Categories...") {
RADIO (categorizationgMethod, U"Categorization method", 1)
RADIOBUTTON (U"Winner-takes-all")
RADIOBUTTON (U"Stochastic")
RADIOBUTTON (U"winner-takes-all")
RADIOBUTTON (U"stochastic")
OK
DO
GRAPHICS_TWO (FFNet, PatternList)
Expand All @@ -420,8 +420,8 @@ DO

FORM (REAL_FFNet_PatternList_ActivationList_getTotalCosts, U"FFNet & PatternList & ActivationList: Get total costs", U"FFNet & PatternList & ActivationList: Get total costs...") {
RADIO (costFunctionType, U"Cost function", 1)
RADIOBUTTON (U"Minimum-squared-error")
RADIOBUTTON (U"Minimum-cross-entropy")
RADIOBUTTON (U"minimum-squared-error")
RADIOBUTTON (U"minimum-cross-entropy")
OK
DO
NUMBER_THREE (FFNet, PatternList, ActivationList)
Expand All @@ -431,8 +431,8 @@ DO

FORM (REAL_FFNet_PatternList_ActivationList_getAverageCosts, U"FFNet & PatternList & ActivationList: Get average costs", U"FFNet & PatternList & ActivationList: Get average costs...") {
RADIO (costFunctionType, U"Cost function", 1)
RADIOBUTTON (U"Minimum-squared-error")
RADIOBUTTON (U"Minimum-cross-entropy")
RADIOBUTTON (U"minimum-squared-error")
RADIOBUTTON (U"minimum-cross-entropy")
OK
DO
NUMBER_THREE (FFNet, PatternList, ActivationList)
Expand All @@ -445,8 +445,8 @@ FORM (MODIFY_FFNet_PatternList_ActivationList_learn, U"FFNet & PatternList & Act
NATURAL (maximumNumberOfEpochs, U"Maximum number of epochs", U"100")
POSITIVE (tolerance, U"Tolerance of minimizer", U"1e-7")
RADIO (costFunctionType, U"Cost function", 1)
RADIOBUTTON (U"Minimum-squared-error")
RADIOBUTTON (U"Minimum-cross-entropy")
RADIOBUTTON (U"minimum-squared-error")
RADIOBUTTON (U"minimum-cross-entropy")
OK
DO
MODIFY_FIRST_OF_THREE (FFNet, PatternList, ActivationList)
Expand All @@ -463,8 +463,8 @@ FORM (MODIFY_FFNet_PatternList_ActivationList_learnSlow, U"FFNet & PatternList &
POSITIVE (learningRate, U"Learning rate", U"0.1")
REAL (momentum, U"Momentum", U"0.9")
RADIO (costFunctionType, U"Cost function", 1)
RADIOBUTTON (U"Minimum-squared-error")
RADIOBUTTON (U"Minimum-cross-entropy")
RADIOBUTTON (U"minimum-squared-error")
RADIOBUTTON (U"minimum-cross-entropy")
OK
DO
MODIFY_FIRST_OF_THREE (FFNet, PatternList, ActivationList)
Expand All @@ -476,8 +476,8 @@ DO

FORM (REAL_FFNet_PatternList_Categories_getTotalCosts, U"FFNet & PatternList & Categories: Get total costs", U"FFNet & PatternList & Categories: Get total costs...") {
RADIO (costFunctionType, U"Cost function", 1)
RADIOBUTTON (U"Minimum-squared-error")
RADIOBUTTON (U"Minimum-cross-entropy")
RADIOBUTTON (U"minimum-squared-error")
RADIOBUTTON (U"minimum-cross-entropy")
OK
DO
NUMBER_THREE (FFNet, PatternList, Categories)
Expand All @@ -487,8 +487,8 @@ DO

FORM (REAL_FFNet_PatternList_Categories_getAverageCosts, U"FFNet & PatternList & Categories: Get average costs", U"FFNet & PatternList & Categories: Get average costs...") {
RADIO (costFunctionType, U"Cost function", 1)
RADIOBUTTON (U"Minimum-squared-error")
RADIOBUTTON (U"Minimum-cross-entropy")
RADIOBUTTON (U"minimum-squared-error")
RADIOBUTTON (U"minimum-cross-entropy")
OK
DO
NUMBER_THREE (FFNet, PatternList, Categories)
Expand All @@ -500,8 +500,8 @@ FORM (MODIFY_FFNet_PatternList_Categories_learn, U"FFNet & PatternList & Categor
NATURAL (maximumNumberOfEpochs, U"Maximum number of epochs", U"100")
POSITIVE (tolerance, U"Tolerance of minimizer", U"1e-7")
RADIO (costFunctionType, U"Cost function", 1)
RADIOBUTTON (U"Minimum-squared-error")
RADIOBUTTON (U"Minimum-cross-entropy")
RADIOBUTTON (U"minimum-squared-error")
RADIOBUTTON (U"minimum-cross-entropy")
OK
DO
MODIFY_FIRST_OF_THREE (FFNet, PatternList, Categories)
Expand All @@ -516,8 +516,8 @@ FORM (MODIFY_FFNet_PatternList_Categories_learnSlow, U"FFNet & PatternList & Cat
POSITIVE (learningRate, U"Learning rate", U"0.1")
REAL (momentum, U"Momentum", U"0.9")
RADIO (costFunctionType, U"Cost function", 1)
RADIOBUTTON (U"Minimum-squared-error")
RADIOBUTTON (U"Minimum-cross-entropy")
RADIOBUTTON (U"minimum-squared-error")
RADIOBUTTON (U"minimum-cross-entropy")
OK
DO
MODIFY_FIRST_OF_THREE (FFNet, PatternList, Categories)
Expand Down
Loading

0 comments on commit 0d21298

Please sign in to comment.