-
-
Notifications
You must be signed in to change notification settings - Fork 339
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.
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
Model Labels Selector #1374
Model Labels Selector #1374
Conversation
@kevinkoenig and @dlktdr can you please add to your To Do list Companion changes |
I've not tried this PR yet, so my apologies if this has already been dealt with. Can you also consider how to make it so it is harder to accidentally switch models? i.e. the current model in 2.6 is tap model, menu shows, tap select model. #1467 is a really good step forward, but I think (and it was mentioned in another issue but I can't find it again now) it would be better to make it so double tap is the switch to model trigger. Thus also making the "press/tap and hold shows the menu" a consistent behavior also. |
2e56095
to
c0e7f98
Compare
I have made some modifications to help with this. After some changes a short press on a model does nothing. A long press brings up the selection menu. It used to bring up the labels selector but is now in a sub menu. I feel like you really have to try now to change the model... although I still don't know why you would even try if your model is connected and flying :) You can now also select multiple labels at a time. Still needs work on the hardware keys. I will incorporate PR#1467 as I think this is a good idea too, |
Me also... but it happens, so I'm told. That is perfect! :) Having the Create / New Model broken out of the menu into it's own button also alleviates one of the the other problems... the "accidentally created a new model" one - plus it really didn't make sense when you think of it - since creating a new model is not relevant in the context menu of another model. Looking forward to trying this out in a couple of days. |
As far as I'm concerned, that looks perfect - simple and effective. Do you have it smart enough (yet?) to show when labels are relevant (i.e. colorlcd), but not when it's not (i.e. B&W)? |
Companion looks good to me. |
@elecpower - Can read labels.yml. writing not done and conversions need to be verified. I'll post it soon and let you look at the code for some suggestions.. after I fix up a glaring botch. ;) For conversion testing. Does anyone have a few backups .otx and .etx from various versions and radios I can test with? I'm limited on my backups I have from my 2019x9d+ and tx16s in OTX days. Would be helpful to verify for radio side too. |
Hey @dlktdr @kevinkoenig ... health and wellbeing check :) How are things progressing with this PR? I was hoping this would make 2.7 but it's looking like it might miss that, and be early 2.8? |
Health good. Free time... none. Been on a huge project for work since mid Dec, I'm so over it and would much rather work on this. One week left Mar 22, and I'm out if it's done or not :) then life goes back to normal (whatever that is). But yeah I think it's going to have to be pushed to 2.8. I didn't make to much progress on companion above where I was before. Got stuck trying to decide how to modify the model/view framework to allow edit the labels. Proxy Model / custom view or what I leaned towards was a custom labels model that connects the main. Made some progress on this one but don't know if I love it. I think maybe I'll go back to the radio and polish that off first as there wasn't too much else I needed here. At least it can be tested by users for some feedback. Maybe I'll make a separate PR for the companion changes. What do you think? |
Ah, that elusive creature, free time. No worries, 2.8 it will be... not like I can crack a whip and make you finish it tomorrow 😁 Yeah, splitting it into two parts will be fine... then the nightly testers will be able to poke and prod the radio side while the companion side is brought up to speed. |
Do you still need sample .otx files to test conversions? I've got tons of them. |
Yeah that would be great. Are you on discord can PM them there? Also looks like I set this to the side for too long.. Have to see how to incorporate templates now ;) |
Yup, that's the danger of stepping away here... resolving and managing the PR conflicts can be fun at times 😁 I don't think it will disturb the labels UI though, since it hooked into the "new model" path, as well as adding a context menu option to save as a template... |
That's good. Give it a try deleting the labels.yml and booting your radio too. This is where you might notice that slow down the first time (I only really noticed when I was lots of models (50+). Bitmaps also only load 6 at a time, so still quick opening, but then slowed down the scrolling as new ones are read. Maybe let me know if this was a good idea.
Will have to think about how to implement this with multi-selectable items. Open to thoughts here too.
I can understand why this might be confusing yes. It is like @gagarinlg said more of a filter. So You can pick your Favorite & Drones. Mini & Planes. Broken & Planes ;) for instance @JimB40 brought this one up, maybe he can chime in on thoughts too. I had it before more like you were thinking, but then it's was no different than a category. Maybe a message if there is nothing showing, or a title "Filter" on the checklist. I'm open to ideas here to as it might bring up some questions. Button on the blank section when there are no models (Clear check filter?). Or a checkbutton under the labels to deselect all?
That would be a bug.. :) Duplicate was supposed to have all the previous labels. New should have just showed up under only under Unlabeled.
Had that in there. I'll add it back. Thought this sees kind or redundant but your right, for the non-savvy 👍 |
Hmm thinking about this some more, might be a bit more work but how about if you tap on the label text it checks only that label, clearing all the others. The check box to have a square border added around it, like a classic GUI. If I tap in that box it will select multiple. Edit: Hmm but then what to do about the keys... |
As this is targeted for 2.8, how about getting it merged and let more people check it out and then decide how to continue. |
Sounds good. I'll check out that new label bug, and can add other changes on top in new PR's @pfeerick - I can't seem to get it to add a new model to anything other than un-labeled. Or also shows up when no labels are selected e.g. all models Can you let me know the sequence you used. Could you open that new model under model_settings and see what shows for the labels there? |
Good idea, would be nice to create some TODO list :) |
Hm... Haven't tried with a new model yet, only with already esisting models. Will try that next. And yes, let's do any followup in fututure PRs so this doesn't get any conflicts. It's usable enough now without any major issues so far, and has time to improve before release :) |
Oh, wait, maybe I didnt explain that clearly enough... The new label dialog - when you use it a multiple times it pre-fills with last created label name (as opposed to being blank). I was just checking if deliberate or a bug. |
If that were possible, that would be perfect... As I see that as allowing for you to clearly indicate the intention to have more than one ticked vs just changing views. I did end up adding a few images, and it still loads way faster than the original implementation. And loading images "on demand" sounds perfect :) |
Same with |
That's not quite how it works - that branch has already been merged. I'll cherry-pick the commit into main. Thanks for doing that, was going to chase it up tomorrow. |
btw, Cliff, John from rcmodelreviews had a request that there is a 'new label' button up the top next the new model if it fits/is possible. He's going do a video on this on this new model selector, is really excited about it :) |
Don't we need a backward seup, ie read the old definitions and transfer to the new layout. None of mine models exits with this (good) improvement. And there are a bug, when create new label, and then delete it again, Companion then crash. |
Not sure what you mean by backwards setup... all your existing models should be automatically pulled in, and are in 'Unlabeled' until you assign them to labels. Or do you mean that old categories should be imported as labels? |
None of my existing models are pulled in, not from radio (X10s express) nor stored settings file. |
Thanks, looks like they got added back in there during the rebase. 👍
I can repeat that one. On it. 😆
Yeah we can add a new label button that's easy 👍
@HThuren In companion & radio? Can you post a zip of your RADIO and MODELS folder and upload here to test |
In Companion, post zip and settings file Hope that are what you need |
Yep that works & I see what you mean, will figure that out. |
Found those bugs. dlktdr@648176d @pfeerick Can you review this change and cherry pick it? I haven't ever tried pushing to main & will let you look first |
Just started testing and so far:
|
I have tested reading from X10s express with older version, and noting appear in campanion. |
I have fixed this and another issue here. Will get them added soon
👍 Will fix
👍 Will fix |
Ok found all those ones. Started a new PR #2266 |
This PR brought to you by @kevinkoenig, @raphaelcoeffic and @dlktdr.
Models now have a label associated with them instead of a Category. Each model can belong multiple labels.
Models are now stored in /MODELS/labels.yml
Potential issues I see,
GUI
To Do
Alright here we go all squashed, hopefully ready for some extra testing.
To do, if there is time before 2.8.. if not needs to be completed after