chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

starting to change slide_model to have the logic of changing slides

Browse source 
In order to make slide_object dumber and and not need to keep track of
slide info, we are moving the business logic to slide_model so that
the model can keep track of whether presentations are ready to switch
and don't need to run reveal_next or something.
This commit is contained in:
Chris Cochrun 2024-09-26 14:11:30 -05:00
parent 4c403d9f3c
commit 8c7f2d794f
4 changed files with 84 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/qml/presenter/Presentation.qml
View file

@ -481,21 +481,24 @@ FocusScope {
function nextSlideAction() {
keyHandler.forceActiveFocus();
const nextSlideIdx = SlideObject.html && (SlideObject.innerSlideIndex + 1 < SlideObject.slideSize) ? currentSlide : currentSlide + 1;
const nextSlide = SlideModel.getItem(nextSlideIdx);
if (nextSlideIdx > totalSlides || nextSlideIdx < 0)
return;
console.log("currentServiceItem " + currentServiceItem);
console.log("totalSlides " + totalSlides);
console.log("currentSlide " + currentSlide);
console.log("nextSlideIdx " + nextSlideIdx);
for (var prop in nextSlide)
console.log(prop += " (" + typeof(nextSlide[prop]) + ") = " + nextSlide[prop]);
/* changeSlide(nextSlideIdx); */
if (SlideObject.next(nextSlide)) {
currentSlide = nextSlideIdx;
currentServiceItem = nextSlide.serviceItemId;
if (SlideModel.next()) {
console.log("VICTORY")
}
/* const nextSlideIdx = SlideObject.html && (SlideObject.innerSlideIndex + 1 < SlideObject.slideSize) ? currentSlide : currentSlide + 1; */
/* const nextSlide = SlideModel.getItem(nextSlideIdx); */
/* if (nextSlideIdx > totalSlides || nextSlideIdx < 0) */
/* return; */
/* console.log("currentServiceItem " + currentServiceItem); */
/* console.log("totalSlides " + totalSlides); */
/* console.log("currentSlide " + currentSlide); */
/* console.log("nextSlideIdx " + nextSlideIdx); */
/* for (var prop in nextSlide) */
/* console.log(prop += " (" + typeof(nextSlide[prop]) + ") = " + nextSlide[prop]); */
/* /\* changeSlide(nextSlideIdx); *\/ */
/* if (SlideObject.next(nextSlide)) { */
/* currentSlide = nextSlideIdx; */
/* currentServiceItem = nextSlide.serviceItemId; */
/* } */
}
function nextSlide() {