Fixed issue with rendering grid axes when using different conventions.

Author: SteveMaas1978

FEBioStudio/GLView.cpp

@@ -809,7 +809,7 @@ void CGLView::mouseMoveEvent(QMouseEvent* ev)
 				}
 				update();
 			}
-			else m_view.m_nview = VIEW_USER;
+			else SetViewMode(VIEW_USER);
 		}
 		else if ((but2 || (but3 && balt)) && !m_bsel)
 		{

FEBioStudio/GLView.h

@@ -60,13 +60,6 @@ class GLRenderEngine;
 #define COORD_LOCAL		1
 #define COORD_SCREEN	2
 
-// view conventions
-enum View_Convention {
-	CONV_FR_XZ,
-	CONV_FR_XY,
-	CONV_US_XY
-};
-
 // snap modes
 enum Snap_Mode
 {

GLLib/GLGrid.cpp

@@ -92,16 +92,48 @@ void GLGrid::Render(GLRenderEngine& re, GLContext& renderContext)
 	// determine the colors for the major axis
 	GLColor cx, cy;
 	View_Mode view = renderContext.m_settings.m_nview;
-	switch (view)
+	int conv = renderContext.m_settings.m_nconv;
+	if (conv == CONV_FR_XZ)
 	{
-	case VIEW_USER:
-    case VIEW_ISOMETRIC:
-	case VIEW_TOP: 
-	case VIEW_BOTTOM: cx = GLColor(200, 0, 0); cy = GLColor(0, 200, 0); break;
-	case VIEW_RIGHT: 
-	case VIEW_LEFT:  cx = GLColor(0, 200, 0); cy = GLColor(0, 0, 255); break;
-	case VIEW_FRONT:
-	case VIEW_BACK:  cx = GLColor(200, 0, 0); cy = GLColor(0, 0, 255); break;
+		switch (view)
+		{
+		case VIEW_USER:
+		case VIEW_ISOMETRIC:
+		case VIEW_TOP:
+		case VIEW_BOTTOM: cx = GLColor(200, 0, 0); cy = GLColor(0, 200, 0); break;
+		case VIEW_RIGHT:
+		case VIEW_LEFT:  cx = GLColor(0, 200, 0); cy = GLColor(0, 0, 255); break;
+		case VIEW_FRONT:
+		case VIEW_BACK:  cx = GLColor(200, 0, 0); cy = GLColor(0, 0, 255); break;
+		}
+	}
+	else if (conv == CONV_FR_XY)
+	{
+		switch (view)
+		{
+		case VIEW_USER:
+		case VIEW_ISOMETRIC:
+		case VIEW_FRONT:
+		case VIEW_BACK:  cx = GLColor(200, 0, 0); cy = GLColor(0, 200, 0); break;
+		case VIEW_RIGHT:
+		case VIEW_LEFT:  cx = GLColor(0, 0, 255); cy = GLColor(0, 200, 0); break;
+		case VIEW_TOP:
+		case VIEW_BOTTOM: cx = GLColor(200, 0, 0); cy = GLColor(0, 0, 255); break;
+		}
+	}
+	else // US_XY
+	{
+		switch (view)
+		{
+		case VIEW_USER:
+		case VIEW_ISOMETRIC:
+		case VIEW_FRONT:
+		case VIEW_BACK:  cx = GLColor(200, 0, 0); cy = GLColor(0, 200, 0); break;
+		case VIEW_RIGHT:
+		case VIEW_LEFT:  cx = GLColor(0, 0, 255); cy = GLColor(0, 200, 0); break;
+		case VIEW_TOP:
+		case VIEW_BOTTOM: cx = GLColor(200, 0, 0); cy = GLColor(0, 0, 255); break;
+		}
 	}
 
 	// get the camera position

GLLib/GLViewSettings.h

@@ -68,6 +68,13 @@ enum View_Mode {
 	VIEW_ISOMETRIC
 };
 
+// view conventions
+enum View_Convention {
+	CONV_FR_XZ,
+	CONV_FR_XY,
+	CONV_US_XY
+};
+
 enum Planecut_Mode
 {
 	PLANECUT,