OCPN Beta 4.8.1 PreAlpha

[bdbcat]

bcn...

Corrected ChartInfoWindow position logic. Please check.

Thanks
Dave

[Hakan]

Build error in VS 2013
PR #955 and #956

Error    30    error C2065: 'PLUGIN_CATALOG_NAME' : undeclared identifier    C:\Builds\OCPN\OpenCPN\plugins\wmm_pi\src\wmm_pi.cpp    127    1    wmm_pi
Error    31    error C2065: 'PLUGIN_CATALOG_NAME' : undeclared identifier    C:\Builds\OCPN\OpenCPN\plugins\chartdldr_pi\src\chartdldr_pi.cpp    160    1    chartdldr_pi

Setting back to previous is a temporary fix:

int wmm_pi::Init(void)
{
    //AddLocaleCatalog( PLUGIN_CATALOG_NAME );
    AddLocaleCatalog(_T("opencpn-wmm_pi"));

Håkan

[did-g]

Originally Posted by Hakan

Build error in VS 2013
PR #955 and #956

Error    30    error C2065: 'PLUGIN_CATALOG_NAME' : undeclared identifier    C:\Builds\OCPN\OpenCPN\plugins\wmm_pi\src\wmm_pi.cpp    127    1    wmm_pi
Error    31    error C2065: 'PLUGIN_CATALOG_NAME' : undeclared identifier    C:\Builds\OCPN\OpenCPN\plugins\chartdldr_pi\src\chartdldr_pi.cpp    160    1    chartdldr_pi

Setting back to previous is a temporary fix:

int wmm_pi::Init(void)
{
    //AddLocaleCatalog( PLUGIN_CATALOG_NAME );
    AddLocaleCatalog(_T("opencpn-wmm_pi"));

Håkan

You have to remove wmm_pi/src/version.h same for chartdlr_pi

After CMakeList changes best is to delete build tree and look at git status in source tree looking for 'Untracked files:'.

[Hakan]

Jon...
Thanks, my fault!
A clean /build and rerun of cmake was done before but I wasn't aware of that "git merge" did not deleted the files in my working branch but told me to do so. I fixed some conflicts but was probably lazy and didn't read all notes before commit. - Sorry
Håkan

[Hakan]

Originally Posted by bdbcat

bcn...
Corrected ChartInfoWindow position logic. Please check.
Thanks
Dave

Although not Hubert; For info are my pop-ups fine as before but ther's still no ChartInfoWindow pop-up when only one single CM93 bar is present, intentionally or not.
Håkan

[bcn]

Chart information for me ok now. Raster and S-57. With one single chart as well.

Hubert

[Hakan]

Dave..
I'm trying to debug why the chartinfo pop-up isn't shown when I've one single CM93 bar.
The ChInfoWin::SetBitmap() does run fine when there are two or more bars but not when only one single CM93.
When I make the change below the chartinfo is there also when only one single CM93 bar is present. But I'm not sure if my change may have other implications. (Hubert says it's working for him??) Pls have a look.
Håkan

@@ -7676,7 +7676,7 @@ void MyFrame::HandlePianoRollover( int selected_index, int selected_dbIndex )
     } else {
         ArrayOfInts piano_chart_index_array = cc1->GetQuiltExtendedStackdbIndexArray();
 
-        if( ( pCurrentStack->nEntry > 1 ) || ( piano_chart_index_array.GetCount() > 1 ) ) {
+        if( ( pCurrentStack->nEntry > 1 ) || ( piano_chart_index_array.GetCount() >= 1 ) ) {
             cc1->ShowChartInfoWindow( key_location.x, selected_dbIndex );

[CarCode]

Originally Posted by Hakan

Dave..
I'm trying to debug why the chartinfo pop-up isn't shown when I've one single CM93 bar.
The ChInfoWin::SetBitmap() does run fine when there are two or more bars but not when only one single CM93.
When I make the change below the chartinfo is there also when only one single CM93 bar is present. But I'm not sure if my change may have other implications. (Hubert says it's working for him??) Pls have a look.
Håkan

@@ -7676,7 +7676,7 @@ void MyFrame::HandlePianoRollover( int selected_index, int selected_dbIndex )
     } else {
         ArrayOfInts piano_chart_index_array = cc1->GetQuiltExtendedStackdbIndexArray();
 
-        if( ( pCurrentStack->nEntry > 1 ) || ( piano_chart_index_array.GetCount() > 1 ) ) {
+        if( ( pCurrentStack->nEntry > 1 ) || ( piano_chart_index_array.GetCount() >= 1 ) ) {
             cc1->ShowChartInfoWindow( key_location.x, selected_dbIndex );

Yes, confirmed. Your patch is OK. No other side effects.
Huberts screenshot has not a single CM93 but an ES ENC chart in his chartinfo window.

Gerhard

[bdbcat]

Hakan...

re:
"ther's still no ChartInfoWindow pop-up when only one single CM93 bar is present, intentionally or not"

I think this was intentional, but I cannot recall the logic of the decision. Perhaps some ancient problem with ChartInfoWindow implementation, long since fixed.

Anyway, your patch looks OK, and I will incorporate it.

Thanks
Dave

[did-g]

Dave
On linux now I have to use
adjust = 2;
in
ChInfoWin::FitToChars

Or the last line isn't fully displayed.

[bdbcat]

did-g...

Interesting.

What happens if you set the font in the constructor, like this:

ChInfoWin::ChInfoWin( wxWindow *parent )
{
    
    long style = wxSIMPLE_BORDER | wxCLIP_CHILDREN;
#ifdef __WXOSX__
    style |= wxSTAY_ON_TOP;
#endif

    wxDialog::Create( parent, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, style );

    wxFont *dFont = FontMgr::Get().GetFont( _("Dialog") );
    SetFont(*dFont);
    
    int ststyle = wxALIGN_LEFT | wxST_NO_AUTORESIZE;
    m_pInfoTextCtl = new wxStaticText( this, -1, _T ( "" ), wxDefaultPosition, wxDefaultSize,
                                       ststyle );

    dbIndex = -1;
    Hide();
}

Of course, you need to include:
#include "FontMgr.h"

Dave

[did-g]

Originally Posted by bdbcat

did-g...

Interesting.

What happens if you set the font in the constructor, like this:

ChInfoWin::ChInfoWin( wxWindow *parent )
{
    
    long style = wxSIMPLE_BORDER | wxCLIP_CHILDREN;
#ifdef __WXOSX__
    style |= wxSTAY_ON_TOP;
#endif

    wxDialog::Create( parent, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, style );

    wxFont *dFont = FontMgr::Get().GetFont( _("Dialog") );
    SetFont(*dFont);
    
    int ststyle = wxALIGN_LEFT | wxST_NO_AUTORESIZE;
    m_pInfoTextCtl = new wxStaticText( this, -1, _T ( "" ), wxDefaultPosition, wxDefaultSize,
                                       ststyle );

    dbIndex = -1;
    Hide();
}

Of course, you need to include:
#include "FontMgr.h"

Dave

Nothing, same behavior.

But adding SetClientSize in ChInfoWin::SetBitmap seems to work, at least for me...

SetSize( top_position.x, top_position.y, m_size.x, m_size.y );
SetClientSize( m_size.x, m_size.y );

Could be a bug in xfce window manager for undecorated windows.

[bdbcat]

did-g...

OK, probably you are right on the window manager bug.

Anyway, I have already started final Beta builds, so would you send a Pull Request for this fix so that it won't be lost?

Thanks
Dave