Text archives Help

---

Author: brownlee
Date: Tue Apr  7 10:46:56 2009
New Revision: 2395

Modified:
   trunk/Core/Math/Trig.h
   trunk/Model/Materials/Volume.cc
   trunk/scenes/csafe/python/Histogram.py
   trunk/scenes/csafe/python/SceneMenus.py
   trunk/scenes/csafe/python/csafe_scene.py
Log:
cenes/csafe/python/Histogram.py
        renaming scaling colormap field
        you can no longer color spheres by volume colormap
M    scenes/csafe/python/csafe_scene.py
        renaming addremove data files to addremove nrrd files
M    scenes/csafe/python/SceneMenus.py
        fixing formatting issues
M    Core/Math/Trig.h
        fixing issue with GNU_SOURCE on mac
M    Model/Materials/Volume.cc
        swapping rainbow colormap and invrainbow colormap




Modified: trunk/Core/Math/Trig.h
==============================================================================
--- trunk/Core/Math/Trig.h      (original)
+++ trunk/Core/Math/Trig.h      Tue Apr  7 10:46:56 2009
@@ -106,7 +106,7 @@
   }
 
   inline void SinCos(double d, double &s, double &c) {
-#if defined(_GNU_SOURCE)
+#if defined(_GNU_SOURCE) && !(__APPLE__)
       sincos(d, &s, &c);
 #else
       s = Sin(d);
@@ -160,7 +160,7 @@
   }
 
   inline void SinCos(float d, float &s, float &c) {
-#if defined(_GNU_SOURCE)
+#if defined(_GNU_SOURCE) && !(__APPLE__)
       sincosf(d, &s, &c);
 #else
       s = Sin(d);

Modified: trunk/Model/Materials/Volume.cc
==============================================================================
--- trunk/Model/Materials/Volume.cc     (original)
+++ trunk/Model/Materials/Volume.cc     Tue Apr  7 10:46:56 2009
@@ -28,7 +28,7 @@
   {
     // Add colors base on color map type
     switch (type) {
-    case InvRainbow:
+    case Rainbow:
       {
         float p = 1.0f/11.0f;
         _slices.push_back(ColorSlice(p*0, RGBAColor(Color(RGB(0, 0, 1)), 
1)));
@@ -45,7 +45,7 @@
         _slices.push_back(ColorSlice(p*11, RGBAColor(Color(RGB(1, 0, 0)), 
1)));
         break;
       }
-    case Rainbow:
+    case InvRainbow:
       {
         float p = 1.0f/11.0f;
         _slices.push_back(ColorSlice(p*0, RGBAColor(Color(RGB(1, 0, 0)), 
1)));

Modified: trunk/scenes/csafe/python/Histogram.py
==============================================================================
--- trunk/scenes/csafe/python/Histogram.py      (original)
+++ trunk/scenes/csafe/python/Histogram.py      Tue Apr  7 10:46:56 2009
@@ -799,7 +799,7 @@
         self.transferFPanel.transferFPanel.SetHistogramGroup(self)
         self.transferFPanel.SetTransferF(self.transferF)
         self.transferFPanel.SetUpdateFunction(self.Update())
-        if self.varIndex != self.scene.volVar:
+        if self.group == 0:
             self.scene.test.setCidx(self.varIndex)        
             if (self.transferF != None):
                 self.scene.test.setSphereCMap(self.transferF.cmap)
@@ -889,7 +889,7 @@
         self.Bind(FS.EVT_FLOATSPIN, self.OnCropMaxFS, self.cropMaxFS )
         
         #if (group == 0): # Particles
-        self.colorText = wx.StaticText(panel, -1, "Crop color values: ", 
(20, 10))
+        self.colorText = wx.StaticText(panel, -1, "Rescale colormap: ", (20, 
10))
         spin = self.colorMinFS =self. addSpinner(panel,colorMin);
         self.Bind(FS.EVT_FLOATSPIN, self.OnColorMinFS, self.colorMinFS )
         spin = self.colorMaxFS = self.addSpinner(panel,colorMax);

Modified: trunk/scenes/csafe/python/SceneMenus.py
==============================================================================
--- trunk/scenes/csafe/python/SceneMenus.py     (original)
+++ trunk/scenes/csafe/python/SceneMenus.py     Tue Apr  7 10:46:56 2009
@@ -213,25 +213,29 @@
        sizer = wx.BoxSizer(wx.VERTICAL)
        hSizer = wx.BoxSizer(wx.HORIZONTAL)
        hSizer.Add(wx.StaticText(self,-1,"minBound: "))
-       self.minXSP = self.addSpinner(self,scene.minX)
-       self.minYSP = self.addSpinner(self,scene.minY)
-       self.minZSP = self.addSpinner(self,scene.minZ)
+       self.minXSP = self.addSpinner(panel,scene.minX)
+       self.minYSP = self.addSpinner(panel,scene.minY)
+       self.minZSP = self.addSpinner(panel,scene.minZ)
        hSizer.Add(self.minXSP,0,wx.ALL,3)
        hSizer.Add(self.minYSP,0,wx.ALL,3)
        hSizer.Add(self.minZSP,0,wx.ALL,3)
        sizer.Add(hSizer, 0, wx.ALL|wx.ALIGN_LEFT, 10)
 
        hSizer2 = wx.BoxSizer(wx.HORIZONTAL)
-       hSizer2.Add(wx.StaticText(self,-1,"maxBound: "))
-       self.maxXSP = self.addSpinner(self,scene.maxX)
-       self.maxYSP = self.addSpinner(self,scene.maxY)
-       self.maxZSP = self.addSpinner(self,scene.maxZ)
+       hSizer2.Add(wx.StaticText(panel,-1,"maxBound: "))
+       self.maxXSP = self.addSpinner(panel,scene.maxX)
+       self.maxYSP = self.addSpinner(panel,scene.maxY)
+       self.maxZSP = self.addSpinner(panel,scene.maxZ)
        hSizer2.Add(self.maxXSP,0,wx.ALL,3)
        hSizer2.Add(self.maxYSP,0,wx.ALL,3)
        hSizer2.Add(self.maxZSP,0,wx.ALL,3)
        sizer.Add(hSizer2,0, wx.ALL|wx.ALIGN_LEFT, 10)
 
-       panel.SetSizer(sizer)
+       panel.SetSizerAndFit(sizer)
+       vs3 = wx.BoxSizer(wx.VERTICAL)
+       vs3.Add(panel,0, wx.EXPAND)
+       self.SetSizerAndFit(vs3)
+       self.SetAutoLayout(True)
        panel.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
        panel.SetFocus()
 
@@ -329,7 +333,11 @@
        sizer.Add(hSizer4,0, wx.ALL|wx.ALIGN_LEFT, 10)
 
        sizer.Layout()
-       panel.SetSizer(sizer)
+       panel.SetSizerAndFit(sizer)
+       vs3 = wx.BoxSizer(wx.VERTICAL)
+       vs3.Add(panel,0, wx.EXPAND)
+       self.SetSizerAndFit(vs3)
+       self.SetAutoLayout(True)
 
        panel.SetFocus()
        panel.Bind( wx.EVT_CLOSE, self.OnCloseWindow )
@@ -569,9 +577,13 @@
        hSizer10.Add(self.cancelButton, 0, wx.ALL,3)
        sizer.Add(hSizer10, 0, wx.ALL|wx.ALIGN_CENTER, 5)
 
-       panel.SetSizer(sizer)
+       panel.SetSizerAndFit(sizer)
 
        panel.SetupScrolling()
+       vs3 = wx.BoxSizer(wx.VERTICAL)
+       vs3.Add(panel,0, wx.EXPAND)
+       self.SetSizerAndFit(vs3)
+       self.SetAutoLayout(True)
 
        self.Bind(wx.EVT_BUTTON, self.OnClickTime, self.frameButton)
        self.Bind(wx.EVT_BUTTON, self.OnClickGoToFrame, self.frameButton2)

Modified: trunk/scenes/csafe/python/csafe_scene.py
==============================================================================
--- trunk/scenes/csafe/python/csafe_scene.py    (original)
+++ trunk/scenes/csafe/python/csafe_scene.py    Tue Apr  7 10:46:56 2009
@@ -95,7 +95,7 @@
         menuFile.Append(104, "Load Configuration", "")
         loadUDA = menuFile.Append(110, "Load UDA", "Uintah Dataset")
         loadUDA.Enable(False)
-        self.addRemoveDataFilesMenu = menuFile.Append(201, "&Add/Remove Data 
Files", "Add and remove Nrrd files for the scene")
+        self.addRemoveDataFilesMenu = menuFile.Append(201, "&Add/Remove NRRD 
Files", "Add and remove Nrrd files for the scene")
         menuFile.Append(107, "Import NrrdList")
         menuFile.Append(108, "Export NrrdList")
         menuFile.Append(106, "Import Transfer Function")
@@ -305,7 +305,7 @@
 
     ################ Add/Remove Files #################
     def Menu201(self, evt):
-        frame = SceneMenus.AddRemoveFilesFrame(self, -1, "Add/Remove Data 
Files", self.scene)
+        frame = SceneMenus.AddRemoveFilesFrame(self, -1, "Add/Remove NRRD 
Files", self.scene)
         frame.Show(True)
 
     ################ Scene Properties #################

---

• [Manta] r2395 - in trunk: Core/Math Model/Materials scenes/csafe/python, brownlee, 04/07/2009

---

Archive powered by MHonArc 2.6.16.