Skip to content
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

Force all left hand side boxes the same width. #613

Merged
merged 9 commits into from
Dec 5, 2023
Merged

Conversation

tmiw
Copy link
Collaborator

@tmiw tmiw commented Nov 25, 2023

This resolves #610 by doing the following:

  1. Forces the widths of all the boxes on the left hand side to be the same.
  2. Changes main screen gauges from vertical to horizontal. (Additionally resolves macOS 10.13: vertical gauges on main screen render incorrectly #303.)
  3. Rearranges boxes on main window to better utilize available space on shorter displays.

@Tyrbiter
Copy link

Not sure why, but seeing a build error now, didn't happen with my initial build of 1.9.6-devel:

/home/bdm/rpmbuild/BUILD/freedv-gui-1.9.6/src/rig_control/HamlibRigController.cpp: In static member function ‘static void HamlibRigController::InitializeHamlibLibrary()’:
/home/bdm/rpmbuild/BUILD/freedv-gui-1.9.6/src/rig_control/HamlibRigController.cpp:127:26: error: invalid conversion from ‘int ()(const rig_caps, void*)’ to ‘int ()(rig_caps, void*)’ [-fpermissive]
127 | rig_list_foreach(&HamlibRigController::BuildRigList_, &RigList_);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| int ()(const rig_caps, void*)
In file included from /home/bdm/rpmbuild/BUILD/freedv-gui-1.9.6/src/rig_control/HamlibRigController.h:36,
from /home/bdm/rpmbuild/BUILD/freedv-gui-1.9.6/src/rig_control/HamlibRigController.cpp:31:
/usr/include/hamlib/rig.h:3686:18: note: initializing argument 1 of ‘int rig_list_foreach(int ()(rig_caps, void*), void*)’
3686 | rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(struct rig_caps *, rig_ptr_t),
| ^~~~~~~~~~~~~
gmake[2]: *** [src/rig_control/CMakeFiles/fdv_rig_control.dir/build.make:79: src/rig_control/CMakeFiles/fdv_rig_control.dir/HamlibRigController.cpp.o] Error 1
gmake[2]: Leaving directory '/home/bdm/rpmbuild/BUILD/freedv-gui-1.9.6/redhat-linux-build'
gmake[1]: *** [CMakeFiles/Makefile2:514: src/rig_control/CMakeFiles/fdv_rig_control.dir/all] Error 2
gmake[1]: *** Waiting for unfinished jobs....

@Tyrbiter
Copy link

Looks like Mike changed some stuff in hamlib:

https://github.com/Hamlib/Hamlib/blob/master/include/hamlib/rig.h

@tmiw
Copy link
Collaborator Author

tmiw commented Nov 29, 2023

Looks like Mike changed some stuff in hamlib:

https://github.com/Hamlib/Hamlib/blob/master/include/hamlib/rig.h

Unfortunately, fixing this for 4.6~git breaks it for 4.5.5. I'm very hesitant to force usage of the former given that it's not exactly stable. Let me see if I can detect 4.6 somehow during compile time.

@tmiw
Copy link
Collaborator Author

tmiw commented Nov 29, 2023

I created a Hamlib issue to see if we can get that reversed (or if Mike can recommend a workaround that will work on both 4.5 and 4.6).

@tmiw
Copy link
Collaborator Author

tmiw commented Nov 29, 2023

Looks like there'll be a fix on Hamlib's side, but since it'll also require FreeDV changes, I created #614 to track this.

@Tyrbiter
Copy link

OK, I now have a build of hamlib-4.6~git that contains Mike's fix.

When you have new code to test I will try it out.

@tmiw
Copy link
Collaborator Author

tmiw commented Nov 30, 2023

OK, I now have a build of hamlib-4.6~git that contains Mike's fix.

When you have new code to test I will try it out.

#615, but I was able to check here on 4.5.5 and 4.6 and both worked fine with that change. Will merge into master as soon as GitHub finishes CI.

@Tyrbiter
Copy link

Now have a build with current code @tmiw, it is all looking very good.

@tmiw tmiw merged commit e7847a1 into master Dec 5, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants