[MOAB-dev] r1228 - MOAB/trunk/tools/qvdual
tautges at mcs.anl.gov
tautges at mcs.anl.gov
Wed Aug 8 03:20:08 CDT 2007
Author: tautges
Date: 2007-08-08 03:20:08 -0500 (Wed, 08 Aug 2007)
New Revision: 1228
Added:
MOAB/trunk/tools/qvdual/SheetDiagramPopup.ui
MOAB/trunk/tools/qvdual/SheetDiagramPopup.ui.h
MOAB/trunk/tools/qvdual/qvdual.pro
Removed:
MOAB/trunk/tools/qvdual/QVDual.pro
Modified:
MOAB/trunk/tools/qvdual/DrawDual.cpp
MOAB/trunk/tools/qvdual/DrawDual.hpp
MOAB/trunk/tools/qvdual/Makefile.am
MOAB/trunk/tools/qvdual/uiQVDual.ui
Log:
Modifications to restore qvdual functionality.
Modified: MOAB/trunk/tools/qvdual/DrawDual.cpp
===================================================================
--- MOAB/trunk/tools/qvdual/DrawDual.cpp 2007-08-02 10:23:08 UTC (rev 1227)
+++ MOAB/trunk/tools/qvdual/DrawDual.cpp 2007-08-08 08:20:08 UTC (rev 1228)
@@ -1,4 +1,5 @@
#include "DrawDual.hpp"
+#include "SheetDiagramPopup.h"
#include "MeshTopoUtil.hpp"
#include "MBTagConventions.hpp"
#include "MBCN.hpp"
@@ -48,7 +49,7 @@
// extern GVC_t *gvContext();
}
-const bool my_debug = true;
+const bool my_debug = false;
const int SHEET_WINDOW_SIZE = 500;
@@ -362,7 +363,7 @@
vtkInteractorStyle *this_style = vtkInteractorStyle::SafeDownCast(
- gw.qvtkWidget->GetRenderWindow()->GetInteractor()->GetInteractorStyle());
+ gw.sheetDiagram->sheet_diagram()->GetRenderWindow()->GetInteractor()->GetInteractorStyle());
this_style->HighlightProp(gw.pickActor);
}
}
@@ -428,8 +429,10 @@
// 3. make a new pd for this drawring
GraphWindows &this_gw = surfDrawrings[dual_surf];
vtkPolyData *pd;
- get_clean_pd(dual_surf, this_gw.qvtkWidget, pd);
+ get_clean_pd(dual_surf, this_gw.sheetDiagram, pd);
+ this_gw.sheetDiagram->show();
+
// 1. gather/construct data for graphviz
MBErrorCode success = construct_graphviz_data(dual_surf);
if (MB_SUCCESS != success) return success;
@@ -456,7 +459,7 @@
if (MB_SUCCESS != success) return success;
vtkRenderer *this_ren =
- this_gw.qvtkWidget->GetRenderWindow()->GetRenderers()->GetFirstRenderer();
+ this_gw.sheetDiagram->sheet_diagram()->GetRenderWindow()->GetRenderers()->GetFirstRenderer();
// 4. create vtk points, cells for this 2d dual surface drawing
success = make_vtk_data(dual_surf, pd, this_ren);
@@ -476,7 +479,7 @@
//this_gw.qvtkWidget->GetRenderWindow()->DebugOn();
// 5. render the window
- this_gw.qvtkWidget->GetRenderWindow()->Render();
+ this_gw.sheetDiagram->sheet_diagram()->GetRenderWindow()->Render();
// now that we've rendered, can get the size of various things
int *tmp_siz = this_ren->GetSize();
@@ -495,11 +498,12 @@
if (my_debug) agwrite(this_gw.gvizGraph, stdout);
- int *old_pos = this_gw.qvtkWidget->GetRenderWindow()->GetPosition();
- int *win_siz = this_gw.qvtkWidget->GetRenderWindow()->GetSize();
+ int old_pos[2] = {0, 0};
+
+ int *win_siz = this_gw.sheetDiagram->sheet_diagram()->GetRenderWindow()->GetSize();
int new_pos[2] = {(int) ((double)old_pos[0] + win_siz[0]*(.1*offset_num)), old_pos[1]};
- this_gw.qvtkWidget->GetRenderWindow()->SetPosition(new_pos);
-
+ this_gw.sheetDiagram->sheet_diagram()->GetRenderWindow()->SetPosition(new_pos);
+
return success;
}
@@ -1069,9 +1073,9 @@
return MB_FAILURE;
}
-vtkPolyData *DrawDual::get_polydata(QVTKWidget *this_wid)
+vtkPolyData *DrawDual::get_polydata(SheetDiagramPopup *this_sdpopup)
{
- vtkRendererCollection *rcoll = this_wid->GetRenderWindow()->GetRenderers();
+ vtkRendererCollection *rcoll = this_sdpopup->sheet_diagram()->GetRenderWindow()->GetRenderers();
assert(rcoll != NULL);
rcoll->InitTraversal();
vtkActorCollection *acoll = rcoll->GetNextItem()->GetActors();
@@ -1081,21 +1085,21 @@
}
void DrawDual::get_clean_pd(MBEntityHandle dual_surf,
- QVTKWidget *&this_wid,
+ SheetDiagramPopup *&this_sdpopup,
vtkPolyData *&pd)
{
- if (NULL != this_wid) {
+ if (NULL != this_sdpopup) {
MBErrorCode result = reset_drawing_data(dual_surf);
if (MB_SUCCESS != result) {
std::cerr << "Trouble resetting drawing data for sheet." << std::endl;
}
}
- if (NULL == this_wid) {
+ if (NULL == this_sdpopup) {
vtkRenderer *this_ren = vtkRenderer::New();
pd = vtkPolyData::New();
- const bool twod = true;
+ const bool twod = false;
if (twod) {
@@ -1153,7 +1157,6 @@
vtkActor *this_actor = vtkActor::New();
this_actor->PickableOn();
vtkMOABUtils::propSetMap[this_actor] = dual_surf;
-// vtkActor *this_actor = vtkActor::New();
this_actor->SetMapper(this_mapper);
this_actor->GetProperty()->SetLineWidth(2.0);
this_ren->AddActor(this_actor);
@@ -1173,17 +1176,22 @@
// camera->SetFocalPoint(72.0,72.0,0);
// camera->SetViewUp(0,1,0);
- this_wid = new QVTKWidget();
- this_wid->GetRenderWindow()->AddRenderer(this_ren);
- this_wid->GetRenderWindow()->SetSize(SHEET_WINDOW_SIZE, SHEET_WINDOW_SIZE);
+ this_sdpopup = new SheetDiagramPopup();
+ if (my_debug) {
+ this_sdpopup->sheet_diagram()->GetRenderWindow()->DebugOn();
+ }
+ this_sdpopup->sheet_diagram()->GetRenderWindow()->AddRenderer(this_ren);
+ this_sdpopup->sheet_diagram()->GetRenderWindow()->SetSize(SHEET_WINDOW_SIZE, SHEET_WINDOW_SIZE);
+ this_sdpopup->show();
+
this_ren->ResetCamera();
return;
}
// trace back until we find the dataset
- pd = get_polydata(this_wid);
+ pd = get_polydata(this_sdpopup);
assert(NULL != pd);
// re-initialize the data, then we're done
// pd->Initialize();
@@ -1551,7 +1559,7 @@
// get the renderer you'll be writing the text to
GraphWindows &this_gw = surfDrawrings[dual_surf];
vtkRenderer *ren =
- this_gw.qvtkWidget->GetRenderWindow()->GetRenderers()->GetFirstRenderer();
+ this_gw.sheetDiagram->sheet_diagram()->GetRenderWindow()->GetRenderers()->GetFirstRenderer();
// sheet id first
char set_name[CATEGORY_TAG_SIZE];
@@ -1810,7 +1818,7 @@
MBErrorCode result = MB_SUCCESS, tmp_result;
for (std::map<MBEntityHandle,GraphWindows>::iterator mit = surfDrawrings.begin();
mit != surfDrawrings.end(); mit++) {
- if (NULL != (*mit).second.qvtkWidget) {
+ if (NULL != (*mit).second.sheetDiagram) {
if (NULL != drawn_sheets) drawn_sheets->insert((*mit).first);
tmp_result = reset_drawing_data((*mit).first);
if (MB_SUCCESS != tmp_result) result = tmp_result;
@@ -1829,7 +1837,7 @@
GraphWindows &this_gw = surfDrawrings[dual_surf];
vtkRenderer *ren =
- this_gw.qvtkWidget->GetRenderWindow()->GetRenderers()->GetFirstRenderer();
+ this_gw.sheetDiagram->sheet_diagram()->GetRenderWindow()->GetRenderers()->GetFirstRenderer();
vtkActorCollection *acoll = ren->GetActors();
assert(NULL != acoll);
@@ -1878,12 +1886,6 @@
this_gw.pickActor = NULL;
}
- if (NULL != this_gw.qvtkWidget) {
-// delete this_gw.qvtkWidget;
-// this_gw.qvtkWidget = NULL;
- }
-
-
return MB_SUCCESS;
}
Modified: MOAB/trunk/tools/qvdual/DrawDual.hpp
===================================================================
--- MOAB/trunk/tools/qvdual/DrawDual.hpp 2007-08-02 10:23:08 UTC (rev 1227)
+++ MOAB/trunk/tools/qvdual/DrawDual.hpp 2007-08-08 08:20:08 UTC (rev 1228)
@@ -5,7 +5,7 @@
class Agedge_t;
class Agraph_t;
-class QVTKWidget;
+class SheetDiagramPopup;
#include "MBInterface.hpp"
#include "MBRange.hpp"
@@ -94,10 +94,10 @@
{
public:
Agraph_t *gvizGraph;
- QVTKWidget *qvtkWidget;
+ SheetDiagramPopup *sheetDiagram;
vtkActor *pickActor;
- GraphWindows() : gvizGraph(NULL), qvtkWidget(NULL), pickActor(NULL) {}
+ GraphWindows() : gvizGraph(NULL), sheetDiagram(NULL), pickActor(NULL) {}
};
//! make sure all dual vertices and edges have graphviz nodes and edges
@@ -127,11 +127,11 @@
vtkFloatArray *color_ids);
//! given a qvtk widget, return the first polydata supplying data to it
- vtkPolyData *get_polydata(QVTKWidget *this_wid);
+ vtkPolyData *get_polydata(SheetDiagramPopup *this_sdpopup);
//! get a clean polydata for this widget
void get_clean_pd(MBEntityHandle dual_surf,
- QVTKWidget *&this_wid, vtkPolyData *&pd);
+ SheetDiagramPopup *&this_sdpopup, vtkPolyData *&pd);
//! draw various labels with the sheet
MBErrorCode draw_labels(MBEntityHandle dual_surf,
Modified: MOAB/trunk/tools/qvdual/Makefile.am
===================================================================
--- MOAB/trunk/tools/qvdual/Makefile.am 2007-08-02 10:23:08 UTC (rev 1227)
+++ MOAB/trunk/tools/qvdual/Makefile.am 2007-08-08 08:20:08 UTC (rev 1228)
@@ -10,6 +10,8 @@
DrawDual.cpp \
DrawDual.hpp \
main.cpp \
+ SheetDiagramPopup.ui.h \
+ SheetDiagramPopup.ui \
uiQVDual.ui \
uiQVDual.ui.h \
vtkMOABReader.cxx \
@@ -21,8 +23,11 @@
uiQVDual.o \
moc_uiQVDual.o \
CropToolpopup.o \
- moc_CropToolpopup.o
+ moc_CropToolpopup.o \
+ SheetDiagramPopup.o \
+ moc_SheetDiagramPopup.o
+
LDADD = $(extra_depends) $(QVDUAL_LIBS) $(top_builddir)/libMOAB.la
AM_LDFLAGS = -R $(VTK_LIB_DIR)
qvdual_DEPENDENCIES = $(extra_depends) $(top_builddir)/libMOAB.la
@@ -33,16 +38,30 @@
CropToolpopup.cpp: CropToolpopup.h CropToolpopup.ui
$(UIC) -impl CropToolpopup.h -o $@ CropToolpopup.ui
+SheetDiagramPopup.cpp: SheetDiagramPopup.h SheetDiagramPopup.ui
+ $(UIC) -impl SheetDiagramPopup.h -o $@ SheetDiagramPopup.ui
+
moc_uiQVDual.cpp: uiQVDual.h
$(MOC) -o $@ uiQVDual.h
moc_CropToolpopup.cpp: CropToolpopup.h
$(MOC) -o $@ CropToolpopup.h
+moc_SheetDiagramPopup.cpp: SheetDiagramPopup.h
+ $(MOC) -o $@ SheetDiagramPopup.h
+
uiQVDual.ui : uiQVDual.ui.h
uiQVDual.o: uiQVDual.cpp
+CropToolpopup.ui : CropToolpopup.ui.h
+
+CropToolpopup.o: CropToolpopup.cpp
+
+SheetDiagramPopup.ui : SheetDiagramPopup.ui.h
+
+SheetDiagramPopup.o: SheetDiagramPopup.cpp
+
.ui.h:
$(UIC) -o $@ $<
Deleted: MOAB/trunk/tools/qvdual/QVDual.pro
===================================================================
--- MOAB/trunk/tools/qvdual/QVDual.pro 2007-08-02 10:23:08 UTC (rev 1227)
+++ MOAB/trunk/tools/qvdual/QVDual.pro 2007-08-08 08:20:08 UTC (rev 1228)
@@ -1,1377 +0,0 @@
-
-
-unix {
- CONFIG += warn_on opengl qt debug
- UI_DIR = .ui
- MOC_DIR = .moc
- OBJECTS_DIR = .obj
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-TEMPLATE = app
-LANGUAGE = C++
-
-CONFIG += qt warn_on release
-
-LIBS += -lQVTK -L/home/tjtautg/vtkSNL/bin -lvtksnlIO -lvtksnlGraphics -L/usr/local/ParaViewComplete/VTK/bin -lvtkCommon -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkImaging -lvtkIO -lvtkRendering -lvtkfreetype -lvtkftgl -L/home/tjtautg/MOAB -lMOAB -L/cubit/netcdf/lib -lnetcdf_c++ -lnetcdf -L/usr/local/lib/graphviz -ldotneato -lgraph
-INCLUDEPATH += /home/tjtautg/MOAB /usr/local/ParaViewComplete/VTK/Common /usr/local/ParaViewComplete/VTK/Rendering /usr/local/ParaViewComplete/VTK/Graphics /usr/local/ParaViewComplete/VTK /home/tjtautg/vtkSNL /home/tjtautg/vtkSNL/IO /usr/local/ParaViewComplete/VTK/Filtering /usr/local/include/graphviz
-
-SOURCES += main.cpp \
- CropTool.cpp \
- DrawDual.cpp
-FORMS = uiQVDual.ui \
- CropToolpopup.ui
-
Added: MOAB/trunk/tools/qvdual/SheetDiagramPopup.ui
===================================================================
--- MOAB/trunk/tools/qvdual/SheetDiagramPopup.ui (rev 0)
+++ MOAB/trunk/tools/qvdual/SheetDiagramPopup.ui 2007-08-08 08:20:08 UTC (rev 1228)
@@ -0,0 +1,62 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>SheetDiagramPopup</class>
+<widget class="QDialog">
+ <property name="name">
+ <cstring>SheetDiagramPopup</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>494</width>
+ <height>484</height>
+ </rect>
+ </property>
+ <property name="caption">
+ <string>Sheet Diagram</string>
+ </property>
+ <property name="mouseTracking">
+ <bool>false</bool>
+ </property>
+ <property name="focusPolicy">
+ <enum>NoFocus</enum>
+ </property>
+ <widget class="QVTKWidget">
+ <property name="name">
+ <cstring>sheetDiagram</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>250</width>
+ <height>250</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="backgroundOrigin">
+ <enum>WindowOrigin</enum>
+ </property>
+ </widget>
+</widget>
+<includes>
+ <include location="local" impldecl="in implementation">QVTKWidget.h</include>
+ <include location="local" impldecl="in implementation">SheetDiagramPopup.ui.h</include>
+</includes>
+<functions>
+ <function>init()</function>
+ <function returnType="QVTKWidget *">sheet_diagram()</function>
+</functions>
+<pixmapinproject/>
+<layoutdefaults spacing="6" margin="11"/>
+<includehints>
+ <includehint>QVTKWidget.h</includehint>
+</includehints>
+</UI>
Added: MOAB/trunk/tools/qvdual/SheetDiagramPopup.ui.h
===================================================================
--- MOAB/trunk/tools/qvdual/SheetDiagramPopup.ui.h (rev 0)
+++ MOAB/trunk/tools/qvdual/SheetDiagramPopup.ui.h 2007-08-08 08:20:08 UTC (rev 1228)
@@ -0,0 +1,23 @@
+/****************************************************************************
+** ui.h extension file, included from the uic-generated form implementation.
+**
+** If you want to add, delete, or rename functions or slots, use
+** Qt Designer to update this file, preserving your code.
+**
+** You should not define a constructor or destructor in this file.
+** Instead, write your code in functions called init() and destroy().
+** These will automatically be called by the form's constructor and
+** destructor.
+*****************************************************************************/
+
+
+void SheetDiagramPopup::init()
+{
+ if (sheetDiagram == NULL) sheetDiagram = new QVTKWidget(0, "sheetDiagram");
+}
+
+
+QVTKWidget* SheetDiagramPopup::sheet_diagram()
+{
+ return sheetDiagram;
+}
Added: MOAB/trunk/tools/qvdual/qvdual.pro
===================================================================
--- MOAB/trunk/tools/qvdual/qvdual.pro (rev 0)
+++ MOAB/trunk/tools/qvdual/qvdual.pro 2007-08-08 08:20:08 UTC (rev 1228)
@@ -0,0 +1,1385 @@
+TEMPLATE = app
+LANGUAGE = C++
+
+CONFIG += qt warn_on release
+
+LIBS += -lQVTK -L/usr/lib/vtk -lvtkCommon -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkImaging -lvtkIO -lvtkRendering -lvtkftgl -L/usr/lib/graphviz -lgvc -lgraph -L${HOME}/MOAB/lib -lMOAB -lnetcdf_c++ -lnetcdf -lhdf5
+
+INCLUDEPATH += /home/tautges/MOAB /usr/include/vtk/Common /usr/include/vtk/Rendering /usr/include/vtk/Graphics /usr/include/vtk /home/tautges/vtkSNL /home/tautges/vtkSNL/IO /usr/include/vtk/Filtering /usr/include/graphviz
+
+SOURCES += main.cpp \
+ CropTool.cpp \
+ DrawDual.cpp \
+ vtkMOABReader.cxx \
+ vtkMOABUtils.cxx
+
+FORMS = uiQVDual.ui \
+ CropToolpopup.ui \
+ SheetDiagramPopup.ui
+
+unix {
+ CONFIG += warn_on opengl qt debug
+ UI_DIR = .ui
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+CONFIG += qt warn_on release
+
+
+
Modified: MOAB/trunk/tools/qvdual/uiQVDual.ui
===================================================================
--- MOAB/trunk/tools/qvdual/uiQVDual.ui 2007-08-02 10:23:08 UTC (rev 1227)
+++ MOAB/trunk/tools/qvdual/uiQVDual.ui 2007-08-08 08:20:08 UTC (rev 1228)
@@ -8,7 +8,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>867</width>
+ <width>1010</width>
<height>771</height>
</rect>
</property>
@@ -23,7 +23,7 @@
<property name="minimumSize">
<size>
<width>21</width>
- <height>166</height>
+ <height>160</height>
</size>
</property>
<property name="caption">
@@ -231,33 +231,6 @@
<string>FS</string>
</property>
</widget>
- <widget class="QVTKWidget">
- <property name="name">
- <cstring>vtkWidget</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>400</x>
- <y>10</y>
- <width>470</width>
- <height>569</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>5</horstretch>
- <verstretch>1</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- </widget>
<widget class="QPushButton">
<property name="name">
<cstring>Create_Dual_Button</cstring>
@@ -451,6 +424,33 @@
</widget>
</hbox>
</widget>
+ <widget class="QVTKWidget">
+ <property name="name">
+ <cstring>vtkWidget</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>400</x>
+ <y>10</y>
+ <width>600</width>
+ <height>569</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
</widget>
<menubar>
<property name="name">
@@ -489,25 +489,6 @@
</menubar>
<toolbars>
</toolbars>
-<customwidgets>
- <customwidget>
- <class>QVTKWidget</class>
- <header location="global">QVTKWidget.h</header>
- <sizehint>
- <width>-1</width>
- <height>-1</height>
- </sizehint>
- <container>0</container>
- <sizepolicy>
- <hordata>5</hordata>
- <verdata>5</verdata>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- <pixmap>image0</pixmap>
- <signal>signal()</signal>
- </customwidget>
-</customwidgets>
<actions>
<action>
<property name="name">
@@ -772,11 +753,6 @@
</property>
</action>
</actions>
-<images>
- <image name="image0">
- <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
- </image>
-</images>
<connections>
<connection>
<sender>ActorListView1</sender>
@@ -1041,6 +1017,6 @@
<pixmapinproject/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>qvtkwidget.h</includehint>
+ <includehint>QVTKWidget.h</includehint>
</includehints>
</UI>
More information about the moab-dev
mailing list