Commit b3d9e312 authored by Marc R.'s avatar Marc R.

skew-T: code refactoring, revised draw calls

parent 8fd8ba34
This diff is collapsed.
......@@ -160,7 +160,6 @@ private:
double diagramWidth3D = 15.;
bool drawDryAdiabates = true;
bool drawMoistAdiabates = true;
bool regenerateAdiabates = true;
bool fullscreen = false;
float isothermSpacing = 10.;
float moistAdiabatSpacing = 10.0;
......@@ -169,7 +168,7 @@ private:
QVector<QVector2D> dryAdiabatesVertices;
QVector<QVector2D> moistAdiabatesVertices;
SkewTCoordinateLinesVertexRanges coordinateGeometryDrawRanges;
SkewTCoordinateLinesVertexRanges highlightGeometryDrawRanges;
SkewTCoordinateLinesVertexRanges mouseOverGeometryDrawRanges;
};
SkewTDiagramConfiguration diagramConfig;
......@@ -205,17 +204,16 @@ private:
int wyomingVerticesCount;
QVector<int> wyomingStations;
void loadObservationalDataFromUWyoming(int stationNum);
void loadListOfAvailableObservationsFromUWyoming();
/**
Copies the current user-defined diagram configuration from the
GUI properties into the @ref SkewTDiagramConfiguration struct.
*/
void copyDiagramConfigurationFromQtProperties();
void drawDiagramGeometryAndLabels(
MSceneViewGLWidget*sceneView,
GL::MVertexBuffer *vbDiagramGeometry,
SkewTCoordinateLinesVertexRanges *vertexRanges);
void generateDiagramGeometry(
GL::MVertexBuffer **vbDiagramGeometry,
SkewTDiagramConfiguration *config);
......@@ -225,13 +223,15 @@ private:
GL::MVertexBuffer** vbDiagramGeometry,
SkewTDiagramConfiguration *config);
void drawDiagram(MSceneViewGLWidget* sceneView);
void drawProfiles(MSceneViewGLWidget* sceneView);
void loadObservationalDataFromUWyoming(int stationNum);
void loadListOfAvailableObservationsFromUWyoming();
void drawDiagramGeometryAndLabels(
MSceneViewGLWidget*sceneView,
GL::MVertexBuffer *vbDiagramGeometry,
SkewTCoordinateLinesVertexRanges *vertexRanges);
void drawDiagramGeometryAndLabelsFullScreen(MSceneViewGLWidget* sceneView);
void drawDiagramGeometryAndLabelsFullScreen(
MSceneViewGLWidget* sceneView);
// Stores the transformation matrix that transforms (T, log(p)) coordinates
// into the diagram's (x, y) coordinates. Computed by
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment