|
@@ -158,6 +158,7 @@ const tranTime = (str: string = '') => {
|
|
|
return `1970-01-01 00:${result}0`
|
|
|
}
|
|
|
export const getAllNodes = (osmd: any) => {
|
|
|
+ console.log(9999, osmd)
|
|
|
const detailId = getLinkId()
|
|
|
let fixtime = browserInfo.huawei ? 0.08 : 0 //getFixTime()
|
|
|
const allNotes: any[] = []
|
|
@@ -635,34 +636,35 @@ export const getAllNodes = (osmd: any) => {
|
|
|
} catch (error) {}
|
|
|
}
|
|
|
// 按照时间轴排序
|
|
|
+ // console.log('看看👀', allNotes)
|
|
|
const sortArray = allNotes
|
|
|
.sort((a, b) => a.relativeTime - b.relativeTime)
|
|
|
.map((item, index) => ({ ...item, i: index }))
|
|
|
- for (let i = 0; i < sortArray.length; i++) {
|
|
|
- const note = { ...sortArray[i] }
|
|
|
- const prevNote = sortArray[i - 1]
|
|
|
- const isNotNeedStop = note.noteElement.tie && prevNote?.noteElement.tie && note.halfTone === prevNote?.halfTone
|
|
|
- const isOvertone = false
|
|
|
- if (prevNote) {
|
|
|
- if (isNotNeedStop || isOvertone) {
|
|
|
- note.sourceStartTime = note.time
|
|
|
- note.sourceRelativeTime = note.relativeTime
|
|
|
- note.sourceRealValue = note.realValue
|
|
|
- note.sourceEndTime = note.endtime
|
|
|
- note.sourceRelaEndtime = note.relaEndtime
|
|
|
- note.relativeTime = prevNote.relativeTime
|
|
|
- note.realValue = prevNote.realValue
|
|
|
- note.time = prevNote.time
|
|
|
- note.endtime = prevNote.endtime
|
|
|
- note.relaEndtime = prevNote.relaEndtime
|
|
|
- }
|
|
|
- // 此处会导致休止符继续上一个音的指法
|
|
|
- if (note.halfTone === 0) {
|
|
|
- note.realKey = prevNote.realKey
|
|
|
- }
|
|
|
- }
|
|
|
- sortArray[i] = note
|
|
|
- }
|
|
|
+ // for (let i = 0; i < sortArray.length; i++) {
|
|
|
+ // const note = { ...sortArray[i] }
|
|
|
+ // const prevNote = sortArray[i - 1]
|
|
|
+ // const isNotNeedStop = note.noteElement.tie && prevNote?.noteElement.tie && note.halfTone === prevNote?.halfTone
|
|
|
+ // const isOvertone = false
|
|
|
+ // if (prevNote) {
|
|
|
+ // if (isNotNeedStop || isOvertone) {
|
|
|
+ // note.sourceStartTime = note.time
|
|
|
+ // note.sourceRelativeTime = note.relativeTime
|
|
|
+ // note.sourceRealValue = note.realValue
|
|
|
+ // note.sourceEndTime = note.endtime
|
|
|
+ // note.sourceRelaEndtime = note.relaEndtime
|
|
|
+ // note.relativeTime = prevNote.relativeTime
|
|
|
+ // note.realValue = prevNote.realValue
|
|
|
+ // note.time = prevNote.time
|
|
|
+ // note.endtime = prevNote.endtime
|
|
|
+ // note.relaEndtime = prevNote.relaEndtime
|
|
|
+ // }
|
|
|
+ // // 此处会导致休止符继续上一个音的指法
|
|
|
+ // if (note.halfTone === 0) {
|
|
|
+ // note.realKey = prevNote.realKey
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // sortArray[i] = note
|
|
|
+ // }
|
|
|
// console.log(sortArray)
|
|
|
return sortArray
|
|
|
}
|