Optimize track and column creation

Author: juzzlin

CHANGELOG

@@ -15,6 +15,8 @@ Bug fixes:
 
 Other:
 
+* Optimize track and column creation
+
 1.8.0
 =====
 

src/view/qml/Editor/EditorView.qml

@@ -313,10 +313,21 @@ FocusScope {
         lineNumberColumnLeft.setPosition(newPosition);
         lineNumberColumnRight.setPosition(newPosition);
     }
+    function _refreshPattern(pattern) {
+        uiLogger.debug(_tag, `Refreshing pattern index=${pattern.index()}`);
+        _createTracks(pattern);
+        pattern.updateTrackDimensions(trackArea.width, trackArea.height);
+        _setPosition(editorService.position);
+    }
     function _updatePatternVisibility() {
         const currentPatternIndex = editorService.currentPattern;
         _patterns.forEach(pattern => {
-            pattern.visible = pattern.index() === currentPatternIndex;
+            const isVisible = pattern.index() === currentPatternIndex;
+            pattern.visible = isVisible;
+            if (isVisible && pattern._dirty) {
+                _refreshPattern(pattern);
+                pattern._dirty = false;
+            }
         });
     }
     function _updateTracksOnHorizontalScroll() {
@@ -326,46 +337,32 @@ FocusScope {
         _updatePatternVisibility();
         _updateCurrentTrackDimensions();
     }
-    function _addColumn(trackIndex) {
-        _patterns.forEach(pattern => {
-            pattern.addColumn(trackIndex);
-        });
-        _updateCurrentTrackDimensions();
-    }
-    function _addTrack(trackIndex) {
+    function _refreshLayout() {
+        uiLogger.debug(_tag, "Refreshing layout..");
+        noteColumnModelHandler.clear();
+        const currentPatternIndex = editorService.currentPattern;
         _patterns.forEach(pattern => {
-            const track = pattern.addTrack(trackIndex);
-            if (track) {
-                _connectTrack(track);
+            if (pattern.index() === currentPatternIndex) {
+                _refreshPattern(pattern);
+                _updateFocus(editorService.position, editorService.position);
+            } else {
+                pattern._dirty = true;
             }
         });
-        _updateCurrentTrackDimensions();
-    }
-    function _deleteColumn(trackIndex) {
-        _patterns.forEach(pattern => {
-            pattern.deleteColumn(trackIndex);
-        });
-        _updateCurrentTrackDimensions();
-    }
-    function _deleteTrack(trackIndex) {
-        _patterns.forEach(pattern => {
-            pattern.deleteTrack(trackIndex);
-        });
-        _updateCurrentTrackDimensions();
     }
     function _clearMixerSettings() {
         _patterns.forEach(pattern => {
             pattern.clearMixerSettings();
         });
     }
     function _connectSignals() {
-        editorService.columnAdded.connect(trackIndex => _addColumn(trackIndex));
-        editorService.columnDeleted.connect(trackIndex => _deleteColumn(trackIndex));
+        editorService.columnAdded.connect(_refreshLayout);
+        editorService.columnDeleted.connect(_refreshLayout);
         editorService.columnNameChanged.connect(_updateColumnHeaders);
         editorService.horizontalScrollChanged.connect(_updateTracksOnHorizontalScroll);
         editorService.songChanged.connect(_changeSong);
-        editorService.trackAdded.connect(_addTrack);
-        editorService.trackDeleted.connect(_deleteTrack);
+        editorService.trackAdded.connect(_refreshLayout);
+        editorService.trackDeleted.connect(_refreshLayout);
         editorService.trackNameChanged.connect(_updateTrackHeaders);
         editorService.patternCreated.connect(patternIndex => _createPattern(patternIndex));
         editorService.positionChanged.connect((newPosition, oldPosition) => {

src/view/qml/Editor/NoteColumn_LineContainer.qml

@@ -32,7 +32,9 @@ Item {
         _patternIndex = patternIndex;
         _trackIndex = trackIndex;
         _index = columnIndex;
-        _listView = listViewComponent.createObject(rootItem);
+        if (!_listView) {
+            _listView = listViewComponent.createObject(rootItem);
+        }
         _listView.model = noteColumnModelHandler.columnModel(_patternIndex, _trackIndex, _index);
         _scrollOffset = editorService.position.line;
         _lastTriggeredLine = -1;

src/view/qml/Editor/Pattern.qml

@@ -5,10 +5,12 @@ Item {
     property int _index: 0
     property var _tracks: []
     property var _positionBar
+    property bool _dirty: false
     readonly property string _tag: "Pattern"
     function createTracks(positionBar: var, trackAreaWidth: int, trackAreaHeight: int): void {
         _positionBar = positionBar
-        _tracks.length = 0;
+        _clearTracks();
+        const unitWidth = trackAreaWidth / editorService.visibleUnitCount();
         for (let trackIndex of editorService.trackIndices()) {
             const track = trackComponent.createObject(this);
             if (track) {
@@ -18,52 +20,17 @@ Item {
                 track.nameChanged.connect(name => {
                     editorService.setTrackName(trackIndex, name);
                 });
+                track.setDimensions(trackAreaWidth, trackAreaHeight, unitWidth);
                 track.updateData();
                 _tracks.push(track);
                 uiLogger.trace(_tag, `Added track index=${trackIndex}, width=${track.width}, height=${track.height}, x=${track.x}, y=${track.y}`);
             }
         }
-        updateTrackDimensions(trackAreaWidth, trackAreaHeight);
         updateColumnHeaders();
     }
-    function addTrack(trackIndex: int): var {
-        const track = trackComponent.createObject(this);
-        if (track) {
-            track.setLocation(_index, trackIndex);
-            track.setName(editorService.trackName(trackIndex));
-            track.setPositionBar(_positionBar);
-            track.nameChanged.connect(name => {
-                editorService.setTrackName(trackIndex, name);
-            });
-            track.updateData();
-            const position = editorService.trackPositionByIndex(trackIndex);
-            _tracks.splice(position, 0, track);
-            uiLogger.trace(_tag, `Added track index=${trackIndex} at position=${position}`);
-            return track;
-        }
-        return null;
-    }
-    function addColumn(trackIndex: int): void {
-        const track = trackByIndex(trackIndex);
-        if (track) {
-            track.addColumn();
-        }
-    }
-    function deleteColumn(trackIndex: int): void {
-        const track = trackByIndex(trackIndex);
-        if (track) {
-            track.deleteColumn();
-        }
-    }
-    function deleteTrack(trackIndex: int): void {
-        const track = trackByIndex(trackIndex);
-        if (track) {
-            _tracks = _tracks.filter(t => t !== track); // Remove the track from the array
-            track.destroy(); // Destroy the track object
-            uiLogger.debug(_tag, `Deleted track index=${trackIndex}`);
-        } else {
-            uiLogger.error(_tag, `No such track: index=${trackIndex}`);
-        }
+    function _clearTracks(): void {
+        _tracks.forEach(track => track.destroy());
+        _tracks.length = 0;
     }
     function index(): int {
         return _index;