Text archives Help

---

Author: abe
Date: Tue Aug 23 15:55:40 2005
New Revision: 495

Added:
   branches/fire/Core/Color/Colorimetry.cc
      - copied unchanged from r488, trunk/Core/Color/Colorimetry.cc
   branches/fire/Core/Color/Colorimetry.h
      - copied unchanged from r488, trunk/Core/Color/Colorimetry.h
   branches/fire/Core/Math/Physics.cc
      - copied unchanged from r488, trunk/Core/Math/Physics.cc
   branches/fire/Core/Math/Physics.h
      - copied unchanged from r488, trunk/Core/Math/Physics.h
   branches/fire/Core/Util/ColorMap.cc
      - copied unchanged from r488, trunk/Core/Util/ColorMap.cc
   branches/fire/Core/Util/ColorMap.h
      - copied unchanged from r488, trunk/Core/Util/ColorMap.h
   branches/fire/Core/XUtils/
      - copied from r494, trunk/Core/XUtils/
   branches/fire/Core/XUtils/XHelper.cc
      - copied unchanged from r494, trunk/Core/XUtils/XHelper.cc
   branches/fire/Core/XUtils/XHelper.h
      - copied unchanged from r494, trunk/Core/XUtils/XHelper.h
   branches/fire/Model/Readers/VolumeReader.cc
      - copied unchanged from r488, trunk/Model/Readers/VolumeReader.cc
   branches/fire/Model/Readers/VolumeReader.h
      - copied unchanged from r488, trunk/Model/Readers/VolumeReader.h
Removed:
   branches/fire/Engine/Display/XHelper.cc
   branches/fire/Engine/Display/XHelper.h
Modified:
   branches/fire/Core/CMakeLists.txt
   branches/fire/Engine/Display/CMakeLists.txt
   branches/fire/Engine/Display/OpenGLDisplay.cc
   branches/fire/Engine/ImageTraversers/AFImageTraverser.cc
   branches/fire/Model/Readers/CMakeLists.txt
   branches/fire/StandAlone/CMakeLists.txt
   branches/fire/UserInterface/CMakeLists.txt
   branches/fire/UserInterface/XWindowUI.cc
Log:
Merged XHelper changes back into fire/ from trunk/

Modified: branches/fire/Core/CMakeLists.txt
==============================================================================
--- branches/fire/Core/CMakeLists.txt   (original)
+++ branches/fire/Core/CMakeLists.txt   Tue Aug 23 15:55:40 2005
@@ -3,7 +3,9 @@
 SET (CORE_SOURCES ${CORE_SOURCES}
      Color/ColorDB.cc
      Color/RGBColor.cc
-     Color/GrayColor.cc)
+     Color/GrayColor.cc
+     Color/Colorimetry.cc
+     )
 SET (CORE_SOURCES ${CORE_SOURCES}
      Geometry/PointVector.cc
      )
@@ -13,10 +15,13 @@
      Exceptions/UnknownColor.cc
      )
 SET (CORE_SOURCES ${CORE_SOURCES}
+     Math/Physics.cc
      Math/MT_RNG.cc
      Math/Noise.cc)
 SET (CORE_SOURCES ${CORE_SOURCES}
-     Util/Args.cc)
+     Util/Args.cc
+     Util/ColorMap.cc
+     )
 SET (CORE_SOURCES ${CORE_SOURCES}
   Geometry/AffineTransform.cc
   )
@@ -24,3 +29,9 @@
 ADD_LIBRARY (Manta_Core ${CORE_SOURCES})
 
 TARGET_LINK_LIBRARIES(Manta_Core SCIRun_Core)
+
+# The Manta_Core_XUtils library
+ADD_LIBRARY (Manta_Core_XUtils XUtils/XHelper.cc)
+TARGET_LINK_LIBRARIES(Manta_Core_XUtils SCIRun_Core Manta_Core)
+TARGET_LINK_LIBRARIES(Manta_Core_XUtils ${OPENGL_LIBRARIES} ${X11_LIBRARIES})
+

Modified: branches/fire/Engine/Display/CMakeLists.txt
==============================================================================
--- branches/fire/Engine/Display/CMakeLists.txt (original)
+++ branches/fire/Engine/Display/CMakeLists.txt Tue Aug 23 15:55:40 2005
@@ -3,5 +3,4 @@
      Display/NullDisplay.cc
      Display/OpenGLDisplay.cc
      Display/FileDisplay.cc
-     Display/XHelper.cc
      )

Modified: branches/fire/Engine/Display/OpenGLDisplay.cc
==============================================================================
--- branches/fire/Engine/Display/OpenGLDisplay.cc       (original)
+++ branches/fire/Engine/Display/OpenGLDisplay.cc       Tue Aug 23 15:55:40 
2005
@@ -2,7 +2,7 @@
 #include <Core/Thread/Thread.h>
 
 #include <Engine/Display/OpenGLDisplay.h>
-#include <Engine/Display/XHelper.h>
+#include <Core/XUtils/XHelper.h>
 #include <Core/Exceptions/IllegalArgument.h>
 #include <Core/Util/Args.h>
 #include <Image/NullImage.h>

Modified: branches/fire/Engine/ImageTraversers/AFImageTraverser.cc
==============================================================================
--- branches/fire/Engine/ImageTraversers/AFImageTraverser.cc    (original)
+++ branches/fire/Engine/ImageTraversers/AFImageTraverser.cc    Tue Aug 23 
15:55:40 2005
@@ -14,7 +14,7 @@
 #include <Core/Util/Args.h>
 #include <Core/Util/NotFinished.h>
 #include <Core/Thread/Mutex.h>
-#include <Engine/Display/XHelper.h>
+#include <Core/XUtils/XHelper.h>
 
 #include <SCIRun/Core/Thread/Time.h>
 

Modified: branches/fire/Model/Readers/CMakeLists.txt
==============================================================================
--- branches/fire/Model/Readers/CMakeLists.txt  (original)
+++ branches/fire/Model/Readers/CMakeLists.txt  Tue Aug 23 15:55:40 2005
@@ -1,4 +1,5 @@
-
-SET (Manta_Readers_SRCS
-     Readers/PlyReader.cc
-     Readers/rply/rply.c)
+
+SET (Manta_Readers_SRCS
+     Readers/VolumeReader.cc
+     Readers/PlyReader.cc
+     Readers/rply/rply.c)

Modified: branches/fire/StandAlone/CMakeLists.txt
==============================================================================
--- branches/fire/StandAlone/CMakeLists.txt     (original)
+++ branches/fire/StandAlone/CMakeLists.txt     Tue Aug 23 15:55:40 2005
@@ -1,11 +1,12 @@
 
 ADD_EXECUTABLE(manta manta.cc)
-TARGET_LINK_LIBRARIES(manta Manta_Engine 
-                            Manta_UserInterface 
-                            Manta_Model 
-                            Manta_Image 
-                            Manta_Interface 
-                            Manta_Core 
+TARGET_LINK_LIBRARIES(manta Manta_Engine
+                            Manta_UserInterface
+                            Manta_Model
+                            Manta_Image
+                            Manta_Interface
+                            Manta_Core
+                            Manta_Core_XUtils
                             SCIRun_Core)
 
  TARGET_LINK_LIBRARIES(manta ${CMAKE_THREAD_LIBS_INIT}

Modified: branches/fire/UserInterface/CMakeLists.txt
==============================================================================
--- branches/fire/UserInterface/CMakeLists.txt  (original)
+++ branches/fire/UserInterface/CMakeLists.txt  Tue Aug 23 15:55:40 2005
@@ -1,4 +1,5 @@
 
-ADD_LIBRARY (Manta_UserInterface PromptUI.cc XWindowUI.cc 
../Engine/Display/XHelper.cc)
-TARGET_LINK_LIBRARIES(Manta_UserInterface Manta_Core Manta_Interface)
+ADD_LIBRARY (Manta_UserInterface PromptUI.cc XWindowUI.cc)
+TARGET_LINK_LIBRARIES(Manta_UserInterface Manta_Interface
+                      Manta_Core_XUtils Manta_Core)
 TARGET_LINK_LIBRARIES(Manta_UserInterface ${OPENGL_LIBRARIES} 
${X11_LIBRARIES})

Modified: branches/fire/UserInterface/XWindowUI.cc
==============================================================================
--- branches/fire/UserInterface/XWindowUI.cc    (original)
+++ branches/fire/UserInterface/XWindowUI.cc    Tue Aug 23 15:55:40 2005
@@ -12,7 +12,7 @@
 #include <Core/Math/Trig.h>
 #include <Core/Thread/Runnable.h>
 #include <Core/Thread/Thread.h>
-#include <Engine/Display/XHelper.h>
+#include <Core/XUtils/XHelper.h>
 
 #include <X11/Xutil.h>
 #include <X11/keysym.h>

---

• [MANTA] r495 - in branches/fire: Core Core/Color Core/Math Core/Util Core/XUtils Engine/Display Engine/ImageTraversers Model/Readers StandAlone UserInterface, abe, 08/23/2005

---

Archive powered by MHonArc 2.6.16.