Ticket #43: survexred2.patch

src/gfxcore.cc

@@ -272 +272 @@
 //  Recalculating methods
 //
 
+void GfxCore::DoMyBidding(void)
+{
+        static LabelInfo *(*evil)[300];
+        static double minz = 9999999, maxz=-9999999;
+
+        if (!evil) {
+                evil = (LabelInfo *(*)[300])calloc(300 * 300, sizeof(LabelInfo *));
+                if (!evil) {
+                        fprintf(stderr, "ARRGH\n");
+                        return;
+                }
+                list<LabelInfo*>::iterator pos = m_Parent->m_Labels.begin();
+                while (pos != m_Parent->m_Labels.end()) {
+                        LabelInfo* label = *pos++;
+
+                        const wchar_t *str = label->GetText().c_str();
+                        int n, e, rv;
+                        //rv = swscanf(str, L"srtm-7x9-m31-482-279-offset.n%de%d", &n, &e);
+                        rv = swscanf(str, L"srtm.n%de%d", &n, &e);
+                        if (rv < 2)
+                                continue;
+                        evil[n][e] = label;
+                        if (label->GetZ() > -1000 && label->GetZ() < minz)
+                                minz = label->GetZ();
+                        if (label->GetZ() > maxz)
+                                maxz = label->GetZ();
+                }
+        }
+
+        double zrange = maxz - minz;
+        for (int n = 0; n < 299; n++)
+                for (int e = 0; e < 299; e++)
+                        if (evil[n][e] && evil[n][e + 1] && evil[n + 1][e] && evil[n + 1][e + 1]) {
+                                if (evil[n][e]->GetZ() < -1000 || evil[n][e+1]->GetZ() < -1000 || evil[n+1][e]->GetZ() < -1000 || evil[n+1][e+1]->GetZ() < -1000)
+                                        continue;
+                                glBegin(GL_QUADS);
+                                glColor4f(.01f + (evil[n][e]->GetZ() - minz) * .99f / zrange, 0.f, 0.f, 0.67f);
+                                glVertex3d(evil[n][e]->GetX(), evil[n][e]->GetY(), evil[n][e]->GetZ());
+                                glColor4f(.01f + (evil[n][e+1]->GetZ() - minz) * .99f / zrange, 0.f, 0.f, 0.67f);
+                                glVertex3d(evil[n][e+1]->GetX(), evil[n][e+1]->GetY(), evil[n][e+1]->GetZ());
+                                glColor4f(.01f + (evil[n+1][e+1]->GetZ() - minz) * .99f / zrange, 0.f, 0.f, 0.67f);
+                                glVertex3d(evil[n+1][e+1]->GetX(), evil[n+1][e+1]->GetY(), evil[n+1][e+1]->GetZ());
+                                glColor4f(.01f + (evil[n+1][e]->GetZ() - minz) * .99f / zrange, 0.f, 0.f, 0.67f);
+                                glVertex3d(evil[n+1][e]->GetX(), evil[n+1][e]->GetY(), evil[n+1][e]->GetZ());
+                                glEnd();
+                        }
+}
+
 void GfxCore::SetScale(Double scale)
 {
     // Fill the plot data arrays with screen coordinates, scaling the survey
@@ -386 +434 @@
             DrawList(LIST_CROSSES);
         }
 
+        DoMyBidding();
+
         SetIndicatorTransform();
 
         // Draw station names.

src/gfxcore.h

@@ -264 +264 @@
     void Initialise(bool same_file);
     void InitialiseTerrain();
 
+    void DoMyBidding();
+
     void UpdateBlobs();
     void ForceRefresh();
 

src/mainfrm.h

@@ -210 +210 @@
     list<traverse> traverses;
     list<traverse> surface_traverses;
     list<vector<XSect> > tubes;
-    list<LabelInfo*> m_Labels;
     Vector3 m_Ext;
     Double m_DepthMin, m_DepthExt;
     int m_DateMin, m_DateExt;
@@ -270 +269 @@
 
     void InitialiseAfterLoad(const wxString & file);
 
+    list<LabelInfo*> m_Labels;
+
     void OnMRUFile(wxCommandEvent& event);
     void OpenFile(const wxString& file, wxString survey = wxString());