Sean's Optimum Branch Merge

[ChuckSK]

Dave

Here is a patch to restore GPS offsets to ownship rendering.

diff --git a/include/chcanv.h b/include/chcanv.h
index 882cf2b..c7bc9a8 100644
--- a/include/chcanv.h
+++ b/include/chcanv.h
@@ -289,8 +289,8 @@ private:
 
       void ComputeShipScaleFactor(float icon_hdt,
                                   int ownShipWidth, int ownShipLength, 
-                                  wxPoint lShipMidPoint,
-                                  wxPoint GpsOffsetPixels, wxPoint lGPSPoint,
+                                  wxPoint &lShipMidPoint,
+                                  wxPoint &GpsOffsetPixels, wxPoint lGPSPoint,
                                   float &scale_factor_x, float &scale_factor_y);
 
       void ShipDrawLargeScale( ocpnDC& dc, wxPoint lShipMidPoint );
diff --git a/src/chcanv.cpp b/src/chcanv.cpp
index 8b982cb..5dc470b 100644
--- a/src/chcanv.cpp
+++ b/src/chcanv.cpp
@@ -3503,8 +3503,8 @@ void ChartCanvas::ShipIndicatorsDraw( ocpnDC& dc, float lpp,
         ll_gc_ll( gLat, gLon, 0, factor, &tlat, &tlon );
         GetCanvasPointPix( tlat, tlon, &r );
 
-        double lpp = sqrt( pow( (double) (lShipMidPoint.x - r.x), 2) +
-                           pow( (double) (lShipMidPoint.y - r.y), 2 ) );
+        double lpp = sqrt( pow( (double) (lGPSPoint.x - r.x), 2) +
+                           pow( (double) (lGPSPoint.y - r.y), 2 ) );
         int pix_radius = (int) lpp;
 
         wxPen ppPen1( GetGlobalColor( _T ( "URED" ) ), 2 );
@@ -3512,14 +3512,14 @@ void ChartCanvas::ShipIndicatorsDraw( ocpnDC& dc, float lpp,
         dc.SetBrush( wxBrush( GetGlobalColor( _T ( "URED" ) ), wxTRANSPARENT ) );
 
         for( int i = 1; i <= g_iNavAidRadarRingsNumberVisible; i++ )
-            dc.StrokeCircle( lShipMidPoint.x, lShipMidPoint.y, i * pix_radius );
+            dc.StrokeCircle( lGPSPoint.x, lGPSPoint.y, i * pix_radius );
     }
 }
 
 void ChartCanvas::ComputeShipScaleFactor(float icon_hdt,
                                          int ownShipWidth, int ownShipLength, 
-                                         wxPoint lShipMidPoint,
-                                         wxPoint GPSOffsetPixels, wxPoint lGPSPoint,
+                                         wxPoint &lShipMidPoint,
+                                         wxPoint &GPSOffsetPixels, wxPoint lGPSPoint,
                                          float &scale_factor_x, float &scale_factor_y)
 {
     float screenResolution = (float) ::wxGetDisplaySize().y / ::wxGetDisplaySizeMM().y;
@@ -3541,7 +3541,7 @@ void ChartCanvas::ComputeShipScaleFactor(float icon_hdt,
     //  Set minimum ownship drawing size
     float ownship_min_mm = g_n_ownship_min_mm;
     ownship_min_mm = wxMax(ownship_min_mm, 1.0);
-    
+
     //  Calculate Nautical Miles distance from midships to gps antenna
     float hdt_ant = icon_hdt + 180.;
     float dy = ( g_n_ownship_length_meters / 2 - g_n_gps_antenna_offset_y ) / 1852.;
@@ -3559,7 +3559,7 @@ void ChartCanvas::ComputeShipScaleFactor(float icon_hdt,
     }
 
     double ship_mid_lat, ship_mid_lon, ship_mid_lat1, ship_mid_lon1;
-    
+
     ll_gc_ll( gLat, gLon, hdt_ant, dy, &ship_mid_lat, &ship_mid_lon );
     ll_gc_ll( ship_mid_lat, ship_mid_lon, icon_hdt - 90., dx, &ship_mid_lat1, &ship_mid_lon1 );
 
diff --git a/src/glChartCanvas.cpp b/src/glChartCanvas.cpp
index 5b35121..35bf11e 100755
--- a/src/glChartCanvas.cpp
+++ b/src/glChartCanvas.cpp
@@ -1865,16 +1865,15 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
 
     ll_gc_ll( gLat, gLon, pCog, pSog * g_ownship_predictor_minutes / 60., &pred_lat, &pred_lon );
 
-    cc1->GetCanvasPointPix( gLat, gLon, &lGPSPoint );
-    lShipMidPoint = lGPSPoint;
+    cc1->GetCanvasPointPix( gLat, gLon, &lGPSPoint );    
     cc1->GetCanvasPointPix( pred_lat, pred_lon, &lPredPoint );
 
-    float cog_rad = atan2f( (float) ( lPredPoint.y - lShipMidPoint.y ),
-                            (float) ( lPredPoint.x - lShipMidPoint.x ) );
+    float cog_rad = atan2f( (float) ( lPredPoint.y - lGPSPoint.y ),
+                            (float) ( lPredPoint.x - lGPSPoint.x ) );
     cog_rad += PI;
 
-    float lpp = sqrtf( powf( (float) (lPredPoint.x - lShipMidPoint.x), 2) +
-                       powf( (float) (lPredPoint.y - lShipMidPoint.y), 2) );
+    float lpp = sqrtf( powf( (float) (lPredPoint.x - lGPSPoint.x), 2) +
+                       powf( (float) (lPredPoint.y - lGPSPoint.y), 2) );
 
     //  Draw the icon rotated to the COG
     //  or to the Hdt if available
@@ -1889,12 +1888,11 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
     wxPoint osd_head_point;
 
     ll_gc_ll( gLat, gLon, icon_hdt, pSog * 10. / 60., &osd_head_lat, &osd_head_lon );
-
-    cc1->GetCanvasPointPix( gLat, gLon, &lShipMidPoint );
+    
     cc1->GetCanvasPointPix( osd_head_lat, osd_head_lon, &osd_head_point );
 
-    float icon_rad = atan2( (float) ( osd_head_point.y - lShipMidPoint.y ),
-                            (float) ( osd_head_point.x - lShipMidPoint.x ) );
+    float icon_rad = atan2( (float) ( osd_head_point.y - lGPSPoint.y ),
+                            (float) ( osd_head_point.x - lGPSPoint.x ) );
     icon_rad += PI;
 
     if( pSog < 0.2 ) icon_rad = ( ( icon_hdt + 90. ) * PI / 180. ) + cc1->GetVP().rotation;
@@ -1905,7 +1903,6 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
     ll_gc_ll( gLat, gLon, icon_hdt, pSog * g_ownship_predictor_minutes / 60., &hdg_pred_lat,
               &hdg_pred_lon );
 
-    cc1->GetCanvasPointPix( gLat, gLon, &lShipMidPoint );
     cc1->GetCanvasPointPix( hdg_pred_lat, hdg_pred_lon, &lHeadPoint );
 
 //    Should we draw the Head vector?
@@ -1929,16 +1926,15 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
         int list = cc1->m_ownship_state == SHIP_NORMAL;
 
         glPushMatrix();
-        glTranslatef(lShipMidPoint.x, lShipMidPoint.y, 0);
+        glTranslatef(lGPSPoint.x, lGPSPoint.y, 0);
             
         if(ownship_large_scale_display_lists[list])
             glCallList(ownship_large_scale_display_lists[list]);
         else {
             ownship_large_scale_display_lists[list] = glGenLists(1);
             glNewList(ownship_large_scale_display_lists[list], GL_COMPILE_AND_EXECUTE);
-            lShipMidPoint.x = lShipMidPoint.y = 0;
-                
-            cc1->ShipDrawLargeScale(dc, lShipMidPoint);
+                            
+            cc1->ShipDrawLargeScale(dc, wxPoint(0,0));
             glEndList();
         }
         glPopMatrix();
@@ -1990,22 +1986,18 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
         /* scaled ship? */
         float scale_factor_y = 1, scale_factor_x = 1;
         int ownShipWidth = 22; // Default values from s_ownship_icon
-        int ownShipLength= 84;
-
-        if( g_n_ownship_beam_meters > 0.0 &&
-            g_n_ownship_length_meters > 0.0 &&
-            g_OwnShipIconType > 0 )
-        {            
-            if( g_OwnShipIconType == 1 ) {
-                ownShipWidth = ownship_size.x;
-                ownShipLength= ownship_size.y;
-            }
-
+        int ownShipLength = 84;
+        lShipMidPoint = lGPSPoint;
+        if( g_OwnShipIconType == 1 )
+        {
+              ownShipWidth = ownship_size.x;
+              ownShipLength= ownship_size.y;
+        }
+        if( g_OwnShipIconType != 0 )
             cc1->ComputeShipScaleFactor
                 (icon_hdt, ownShipWidth, ownShipLength, lShipMidPoint,
-                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);
-        }
-
+                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);    
+        
         glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_HINT_BIT);
         glEnable( GL_LINE_SMOOTH );
         glEnable( GL_POLYGON_SMOOTH );
@@ -2052,7 +2044,7 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
                 glVertex2f(s_ownship_icon[i], s_ownship_icon[i + 1] );
             glEnd();
             
-            glColor3ub(0, 0, 0);
+            glColor4ub(0, 0, 0, 255);
             glLineWidth(1);
 
             glBegin(GL_LINE_LOOP);

Chuck

[seandepagnier]

Originally Posted by cagney

Dave
The way a dashed line is drawn between light sectors, seems flawed.
Attachment 81818
A dashed line is drawn for each bearing defining a sector. When there are contiguous sectors this leads to a double dashed line, where one sector ends and the next starts. This is clearly visible in the picture. This was not present before the merge.

Thomas

I would like to try to tackle this. The reason for the change, is before the sector lines did not end at exactly the correct angle (which was a bug which is more difficult to notice) So before even though two lines were drawn, they probably exactly overlapped

I think maybe currently the result is technically correct as where one sector ends, another does not begin for a fraction of a radian as defined by the vector chart, but maybe not. In any case, I would like to verify this, and analyse it. Are these the cm93 charts? What lat and longitude?

[seandepagnier]

As always, thanks again for fixing my bugs...

[QUOTE=ChuckSK;1548961]

@@ -1990,22 +1986,18 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
         /* scaled ship? */
         float scale_factor_y = 1, scale_factor_x = 1;
         int ownShipWidth = 22; // Default values from s_ownship_icon
-        int ownShipLength= 84;
-
-        if( g_n_ownship_beam_meters > 0.0 &&
-            g_n_ownship_length_meters > 0.0 &&
-            g_OwnShipIconType > 0 )
-        {            
-            if( g_OwnShipIconType == 1 ) {
-                ownShipWidth = ownship_size.x;
-                ownShipLength= ownship_size.y;
-            }
-
+        int ownShipLength = 84;
+        lShipMidPoint = lGPSPoint;
+        if( g_OwnShipIconType == 1 )
+        {
+              ownShipWidth = ownship_size.x;
+              ownShipLength= ownship_size.y;
+        }
+        if( g_OwnShipIconType != 0 )
             cc1->ComputeShipScaleFactor
                 (icon_hdt, ownShipWidth, ownShipLength, lShipMidPoint,
-                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);
-        }
-
+                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);    
+        
         glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_HINT_BIT);
         glEnable( GL_LINE_SMOOTH );
         glEnable( GL_POLYGON_SMOOTH );

This does not do the same thing. Because
ownShipWidth and ownShipLength
now may be set when g_n_ownship_beam_meters and g_n_ownship_length_meters are zero. Before, they are kept at default values if these two globals are zero.

@@ -2052,7 +2044,7 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
                 glVertex2f(s_ownship_icon[i], s_ownship_icon[i + 1] );
             glEnd();
             
-            glColor3ub(0, 0, 0);
+            glColor4ub(0, 0, 0, 255);
             glLineWidth(1);
 
             glBegin(GL_LINE_LOOP);

Chuck

This should not make any difference. glColor3ub uses an alpha of 255 doesn't it?

[bcn]

Two steps forward, one step back...

We are getting this now on our A20/ARMhf system:

Configuring with Cmake.....
Configuring with cmake of opencpn was Successful...
Doing make... This may take a while.....
c++: internal compiler error: Killed (program cc1plus)
Please submit a full bug report,
with preprocessed source if appropriate.
See <file:///usr/share/doc/gcc-4.6/README.Bugs> for instructions.
make[2]: *** [CMakeFiles/opencpn.dir/src/navutil.cpp.o] Error 4
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/opencpn.dir/all] Error 2
make: *** [all] Error 2
OpenCPN make failed

Any quick idea?

[sbfreddie]

Originally Posted by bcn

Two steps forward, one step back...

We are getting this now on our A20/ARMhf system:

Configuring with Cmake.....
Configuring with cmake of opencpn was Successful...
Doing make... This may take a while.....
c++: internal compiler error: Killed (program cc1plus)
Please submit a full bug report,
with preprocessed source if appropriate.
See <file:///usr/share/doc/gcc-4.6/README.Bugs> for instructions.
make[2]: *** [CMakeFiles/opencpn.dir/src/navutil.cpp.o] Error 4
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/opencpn.dir/all] Error 2
make: *** [all] Error 2
OpenCPN make failed

Any quick idea?

bcn:
This error in the past has almost always meant that you are running out of memory during the compiling process, and there is not enough cache or none at all.
What board are you compiling on? How much memory does it have.
This was a common problem on the RasberryPi until an on disk cache was set up.

Thanks,
Freddie

[ChuckSK]

Originally Posted by ChuckSK

@@ -1990,22 +1986,18 @@ void glChartCanvas::ShipDraw(ocpnDC& dc)
         /* scaled ship? */
         float scale_factor_y = 1, scale_factor_x = 1;
         int ownShipWidth = 22; // Default values from s_ownship_icon
-        int ownShipLength= 84;
-
-        if( g_n_ownship_beam_meters > 0.0 &&
-            g_n_ownship_length_meters > 0.0 &&
-            g_OwnShipIconType > 0 )
-        {            
-            if( g_OwnShipIconType == 1 ) {
-                ownShipWidth = ownship_size.x;
-                ownShipLength= ownship_size.y;
-            }
-
+        int ownShipLength = 84;
+        lShipMidPoint = lGPSPoint;
+        if( g_OwnShipIconType == 1 )
+        {
+              ownShipWidth = ownship_size.x;
+              ownShipLength= ownship_size.y;
+        }
+        if( g_OwnShipIconType != 0 )
             cc1->ComputeShipScaleFactor
                 (icon_hdt, ownShipWidth, ownShipLength, lShipMidPoint,
-                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);
-        }
-
+                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);    
+        
         glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_HINT_BIT);
         glEnable( GL_LINE_SMOOTH );
         glEnable( GL_POLYGON_SMOOTH );

This does not do the same thing. Because
ownShipWidth and ownShipLength
now may be set when g_n_ownship_beam_meters and g_n_ownship_length_meters are zero. Before, they are kept at default values if these two globals are zero.

These globals are always set if g_OwnShipIconType == 1. It doesn't hurt to add a test though. How about this.

        /* scaled ship? */
         float scale_factor_y = 1, scale_factor_x = 1;
         int ownShipWidth = 22; // Default values from s_ownship_icon
         int ownShipLength = 84;
+        lShipMidPoint = lGPSPoint;
 
         if( g_n_ownship_beam_meters > 0.0 &&
             g_n_ownship_length_meters > 0.0 &&
-            g_OwnShipIconType > 0 )
-        {            
-            if( g_OwnShipIconType == 1 ) {
-                ownShipWidth = ownship_size.x;
-                ownShipLength= ownship_size.y;
-            }
-
+            g_OwnShipIconType == 1 )
+        {
+            ownShipWidth = ownship_size.x;
+            ownShipLength= ownship_size.y;
+        }
+        if( g_OwnShipIconType != 0 )
             cc1->ComputeShipScaleFactor
                 (icon_hdt, ownShipWidth, ownShipLength, lShipMidPoint,
-                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);
-        }
-
+                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);    
+        
         glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_HINT_BIT);
         glEnable( GL_LINE_SMOOTH );
         glEnable( GL_POLYGON_SMOOTH );

As for the glColor3ub problem, it seems that some graphics drivers become confused when glColor3ub and glColor4ub are mixed. We should use one or the other, but not both.

Chuck

[seandepagnier]

Originally Posted by ChuckSK

These globals are always set if g_OwnShipIconType == 1. It doesn't hurt to add a test though. How about this.

        /* scaled ship? */
         float scale_factor_y = 1, scale_factor_x = 1;
         int ownShipWidth = 22; // Default values from s_ownship_icon
         int ownShipLength = 84;
+        lShipMidPoint = lGPSPoint;
 
         if( g_n_ownship_beam_meters > 0.0 &&
             g_n_ownship_length_meters > 0.0 &&
-            g_OwnShipIconType > 0 )
-        {            
-            if( g_OwnShipIconType == 1 ) {
-                ownShipWidth = ownship_size.x;
-                ownShipLength= ownship_size.y;
-            }
-
+            g_OwnShipIconType == 1 )
+        {
+            ownShipWidth = ownship_size.x;
+            ownShipLength= ownship_size.y;
+        }
+        if( g_OwnShipIconType != 0 )
             cc1->ComputeShipScaleFactor
                 (icon_hdt, ownShipWidth, ownShipLength, lShipMidPoint,
-                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);
-        }
-
+                 GPSOffsetPixels, lGPSPoint, scale_factor_x, scale_factor_y);    
+        
         glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_HINT_BIT);
         glEnable( GL_LINE_SMOOTH );
         glEnable( GL_POLYGON_SMOOTH );

As for the glColor3ub problem, it seems that some graphics drivers become confused when glColor3ub and glColor4ub are mixed. We should use one or the other, but not both.

Chuck

That sounds like a buggy graphics driver, but if it fixes your issues then we must make the change.

[bcn]

Originally Posted by sbfreddie

bcn:
This error in the past has almost always meant that you are running out of memory during the compiling process, and there is not enough cache or none at all.
What board are you compiling on? How much memory does it have.
This was a common problem on the RasberryPi until an on disk cache was set up.

Thanks,
Freddie

Freddie,

that did the trick - 3.3.1715 is up and running.
Closing the browser with several windows.....
The system is an OLIMEX A20, a platform very similar to the Cubies.
1GB RAM, so I'm surprised that it hangs from missing memory.

Thanks

Hubert

[CarCode]

Originally Posted by bcn

1GB RAM, so I'm surprised that it hangs from missing memory.

1GB RAM might just be enough for the operating system itself.

Gerhard

[seandepagnier]

Actually you should be fine running linux with much less ram (ie: 16MB or less) but applications like xorg use a lot more, and the gcc compiler is going to need a certain amount of ram to compile certain source files. Without optimizations and certain options is likely to require significantly less memory. To allow this, you can use virtual memory (swap partition or file)

[bdbcat]

ChuckSK...

OK, I'm confused and conflicted.

Will you send me a patch against the current github for the ownship GPS offset correction?

Thanks
Dave

[ChuckSK]

Originally Posted by bdbcat

ChuckSK...

OK, I'm confused and conflicted.

Will you send me a patch against the current github for the ownship GPS offset correction?

Thanks
Dave

On the way.

Chuck

[bdbcat]

The way a dashed line is drawn between light sectors, seems flawed.
sector-d.png
A dashed line is drawn for each bearing defining a sector. When there  are contiguous sectors this leads to a double dashed line, where one  sector ends and the next starts. This is clearly visible in the picture.  This was not present before the merge.

Fixed in github now.

Last call, Beta coming!

Thanks
Dave

[seandepagnier]

I managed to find someone here with a mac who could compile latest git from source. It was relatively straightforward (one define needed to be added to CMakeLists.txt to fix some obscure wcsstr string errors) It seems there are a several bugs. The arrow keys don't work, and smooth zooming/panning doesn't work. In any case he is too busy working on his engine for 3 days now to do anything else. (I'm glad I don't have one)

One problem I noticed, is after compiling in xcode, it did not install the plugins, or any other files.. does anyone know how to do this on the mac?

[Baikal]

3.3.1715 assembly problems with chart Quilting
OpenGL - ON