[cig-commits] r11269 - in cs/benchmark/cigma/trunk/scratch/cg: . CMake src
luis at geodynamics.org
luis at geodynamics.org
Wed Feb 27 04:58:33 PST 2008
Author: luis
Date: 2008-02-27 04:58:33 -0800 (Wed, 27 Feb 2008)
New Revision: 11269
Added:
cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.cpp
cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.h
cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.ui
cs/benchmark/cigma/trunk/scratch/cg/src/testapp.cpp
Modified:
cs/benchmark/cigma/trunk/scratch/cg/CMake/FindCigma.cmake
cs/benchmark/cigma/trunk/scratch/cg/CMakeLists.txt
cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp
Log:
Added TestWindow for graphical debugging of Cigma data structures
Modified: cs/benchmark/cigma/trunk/scratch/cg/CMake/FindCigma.cmake
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/CMake/FindCigma.cmake 2008-02-27 07:42:44 UTC (rev 11268)
+++ cs/benchmark/cigma/trunk/scratch/cg/CMake/FindCigma.cmake 2008-02-27 12:58:33 UTC (rev 11269)
@@ -4,12 +4,14 @@
#
FIND_PATH(CIGMA_INCLUDE_DIR CompareCmd.h
+ $ENV{HOME}/cigma/src
$ENV{CIGMA_HOME}/src
/usr/local/include
/usr/include
)
FIND_LIBRARY(CIGMA_LIBRARY cigma
+ $ENV{HOME}/cigma/src
$ENV{CIGMA_HOME}/src
/usr/local/lib
/usr/lib
Modified: cs/benchmark/cigma/trunk/scratch/cg/CMakeLists.txt
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/CMakeLists.txt 2008-02-27 07:42:44 UTC (rev 11268)
+++ cs/benchmark/cigma/trunk/scratch/cg/CMakeLists.txt 2008-02-27 12:58:33 UTC (rev 11269)
@@ -31,7 +31,7 @@
# ----------------------------------------------------------------------------
-# Input files
+# Input files for cg project
SET(cg_UIS
src/MainWindow.ui
)
@@ -43,7 +43,6 @@
src/MainWindow.h
)
-
# ----------------------------------------------------------------------------
# Configure Cigma
INCLUDE(${cg_SOURCE_DIR}/CMake/FindCigma.cmake)
@@ -66,12 +65,7 @@
FIND_PACKAGE(Qt4 REQUIRED)
INCLUDE(${QT_USE_FILE})
-# Qt4 definitions
-QT4_WRAP_UI(cg_UIS_H ${cg_UIS})
-QT4_WRAP_CPP(cg_MOC_SOURCES ${cg_MOC_HEADERS})
-QT4_AUTOMOC(${cg_SOURCES})
-
# ----------------------------------------------------------------------------
# Definitions
ADD_DEFINITIONS(
@@ -79,6 +73,7 @@
${QT_DEFINITIONS}
)
+# ----------------------------------------------------------------------------
# Include directories
INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}
@@ -86,6 +81,12 @@
src
)
+# ----------------------------------------------------------------------------
+# Qt4 definitions
+QT4_WRAP_UI(cg_UIS_H ${cg_UIS})
+QT4_WRAP_CPP(cg_MOC_SOURCES ${cg_MOC_HEADERS})
+QT4_AUTOMOC(${cg_SOURCES})
+
# The main build target
ADD_EXECUTABLE(cigma-gui
${cg_SOURCES}
@@ -106,4 +107,37 @@
)
+# ----------------------------------------------------------------------------
+# Build instructions for test application
+#SET(cgt_UIS
+# src/TestWindow.ui
+#)
+#SET(cgt_SOURCES
+# src/testapp.cpp
+# src/TestWindow.cpp
+#)
+#SET(cgt_MOC_HEADERS
+# src/TestWindow.h
+#)
+#QT4_WRAP_UI(cgt_UIS_H ${cgt_UIS})
+#QT4_WRAP_CPP(cgt_MOC_SOURCES ${cgt_MOC_HEADERS})
+#QT4_AUTOMOC(${cgt_SOURCES})
+#ADD_EXECUTABLE(cgt
+# ${cgt_SOURCES}
+# ${cgt_UIS_H}
+# ${cgt_MOC_SOURCES}
+# ${cgt_UIS}
+#)
+#TARGET_LINK_LIBRARIES(cgt
+# ${QT_LIBRARIES}
+# QVTK
+# vtkCommon
+# vtkIO
+# vtkRendering
+# vtkGraphics
+# vtkWidgets
+#)
+
+
+# ----------------------------------------------------------------------------
#EOF
Modified: cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp 2008-02-27 07:42:44 UTC (rev 11268)
+++ cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp 2008-02-27 12:58:33 UTC (rev 11269)
@@ -31,11 +31,11 @@
qvtkWidget->GetRenderWindow()->AddRenderer(ren);
AddOrientationAxes(qvtkWidget);
- //RenderPoints(ren);
+ RenderPoints(ren);
//RenderTetrahedron(ren);
//RenderHexahedron(ren);
//RenderQuadrangle(ren);
- RenderTriangle(ren);
+ //RenderTriangle(ren);
}
Copied: cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.cpp (from rev 11259, cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp)
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.cpp (rev 0)
+++ cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.cpp 2008-02-27 12:58:33 UTC (rev 11269)
@@ -0,0 +1,42 @@
+#include <iostream>
+#include "TestWindow.h"
+
+#include "vtkRenderer.h"
+#include "vtkRenderWindow.h"
+
+#include "OrientationAxes.h"
+#include "RenderPoints.h"
+
+
+// ---------------------------------------------------------------------------
+
+TestWindow::TestWindow(QWidget *parent)
+ : QMainWindow(parent)
+{
+ setupUi(this);
+
+ connect(actionExit, SIGNAL(triggered()), this, SLOT(fileExit()));
+
+ // renderer
+ ren = vtkRenderer::New();
+ ren->SetBackground(25./256, 51./256, 102./256);
+ qvtkWidget->GetRenderWindow()->AddRenderer(ren);
+ AddOrientationAxes(qvtkWidget);
+
+ RenderPoints(ren);
+}
+
+
+TestWindow::~TestWindow()
+{
+}
+
+
+// ---------------------------------------------------------------------------
+
+void TestWindow::fileExit()
+{
+ qApp->exit();
+}
+
+// ---------------------------------------------------------------------------
Added: cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.h
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.h (rev 0)
+++ cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.h 2008-02-27 12:58:33 UTC (rev 11269)
@@ -0,0 +1,27 @@
+#ifndef __TEST_WINDOW_H__
+#define __TEST_WINDOW_H__
+
+#include <QtGui>
+#include "ui_TestWindow.h"
+
+class vtkRenderer;
+
+class TestWindow : public QMainWindow, Ui::TestWindow
+{
+ Q_OBJECT
+
+//----------------------------------------------------------------------------
+public:
+ TestWindow(QWidget *parent = 0);
+ ~TestWindow();
+
+//----------------------------------------------------------------------------
+public slots:
+ void fileExit();
+
+//----------------------------------------------------------------------------
+public:
+ vtkRenderer *ren;
+};
+
+#endif
Added: cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.ui
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.ui (rev 0)
+++ cs/benchmark/cigma/trunk/scratch/cg/src/TestWindow.ui 2008-02-27 12:58:33 UTC (rev 11269)
@@ -0,0 +1,126 @@
+<ui version="4.0" >
+ <class>TestWindow</class>
+ <widget class="QMainWindow" name="TestWindow" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>789</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>TestWindow</string>
+ </property>
+ <widget class="QWidget" name="centralwidget" >
+ <widget class="QVTKWidget" name="qvtkWidget" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>441</width>
+ <height>521</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="lineEdit" >
+ <property name="geometry" >
+ <rect>
+ <x>520</x>
+ <y>20</y>
+ <width>113</width>
+ <height>20</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="lineEdit_2" >
+ <property name="geometry" >
+ <rect>
+ <x>520</x>
+ <y>50</y>
+ <width>113</width>
+ <height>20</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QTableView" name="tableView" >
+ <property name="geometry" >
+ <rect>
+ <x>480</x>
+ <y>120</y>
+ <width>256</width>
+ <height>161</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QTableView" name="tableView_2" >
+ <property name="geometry" >
+ <rect>
+ <x>480</x>
+ <y>290</y>
+ <width>256</width>
+ <height>192</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label" >
+ <property name="geometry" >
+ <rect>
+ <x>470</x>
+ <y>20</y>
+ <width>44</width>
+ <height>14</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_2" >
+ <property name="geometry" >
+ <rect>
+ <x>470</x>
+ <y>50</y>
+ <width>44</width>
+ <height>14</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QMenuBar" name="menubar" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>26</height>
+ </rect>
+ </property>
+ <widget class="QMenu" name="menuFile" >
+ <property name="title" >
+ <string>File</string>
+ </property>
+ <addaction name="actionExit" />
+ </widget>
+ <addaction name="menuFile" />
+ </widget>
+ <widget class="QStatusBar" name="statusbar" />
+ <action name="actionExit" >
+ <property name="text" >
+ <string>Exit</string>
+ </property>
+ </action>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>QVTKWidget</class>
+ <extends>QWidget</extends>
+ <header>QVTKWidget.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
Added: cs/benchmark/cigma/trunk/scratch/cg/src/testapp.cpp
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/src/testapp.cpp (rev 0)
+++ cs/benchmark/cigma/trunk/scratch/cg/src/testapp.cpp 2008-02-27 12:58:33 UTC (rev 11269)
@@ -0,0 +1,10 @@
+#include <QApplication>
+#include "TestWindow.h"
+
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+ TestWindow *win = new TestWindow;
+ win->show();
+ return app.exec();
+}
More information about the cig-commits
mailing list