Commit e435aa61 authored by franjo's avatar franjo

Replaced all tab characters with spaces


git-svn-id: https://pl5.projectlocker.com/igui/meshGeneration/svn@5 fdcce57e-7e00-11e2-b579-49867b4cea03
parent 21a6de1d
This diff is collapsed.
......@@ -30,57 +30,57 @@
<property name="enable_popup">False</property>
<child>
<placeholder/>
<placeholder/>
</child>
<child>
<widget class="GtkLabel" id="label_localRefinement">
<property name="visible">True</property>
<property name="label" translatable="yes">Local refinement</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
<widget class="GtkLabel" id="label_localRefinement">
<property name="visible">True</property>
<property name="label" translatable="yes">Local refinement</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<placeholder/>
<placeholder/>
</child>
<child>
<widget class="GtkLabel" id="label_keepBoxesIntersectingPatches">
<property name="visible">True</property>
<property name="label" translatable="yes">Keep octree boxes intersecting patches</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
<widget class="GtkLabel" id="label_keepBoxesIntersectingPatches">
<property name="visible">True</property>
<property name="label" translatable="yes">Keep octree boxes intersecting patches</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
</widget>
</child>
......
This diff is collapsed.
EXE_INC = \
-g -ggdb -DFULLDEBUG -O0 -Wno-old-style-cast \
-g -ggdb -DFULLDEBUG -O0 -Wno-old-style-cast \
-I$(FOAM_USER_LIB)/meshGeneration/meshLibrary/lnInclude \
-I$(FOAM_USER_LIB)/meshGeneration/GUI/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I/usr/include/cairo \
-I/usr/include/freetype2 \
-I/usr/include/libpng12 \
-I/opt/gnome/include/gtk-2.0 \
-I/opt/gnome/lib64/gtk-2.0/include \
-I/opt/gnome/include/atk-1.0 \
-I/opt/gnome/include/pango-1.0 \
-I/opt/gnome/include/glib-2.0 \
-I/opt/gnome/lib64/glib-2.0/include \
-I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui \
-I$(QTDIR)/include/QtOpenGL
-I$(FOAM_USER_LIB)/meshGeneration/GUI/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I/usr/include/cairo \
-I/usr/include/freetype2 \
-I/usr/include/libpng12 \
-I/opt/gnome/include/gtk-2.0 \
-I/opt/gnome/lib64/gtk-2.0/include \
-I/opt/gnome/include/atk-1.0 \
-I/opt/gnome/include/pango-1.0 \
-I/opt/gnome/include/glib-2.0 \
-I/opt/gnome/lib64/glib-2.0/include \
-I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui \
-I$(QTDIR)/include/QtOpenGL
MOC = $(QTDIR)/bin/moc
EXE_LIBS = \
-lMeshLibrary \
-ltriSurface \
-L/opt/gnome/lib64 \
-lgtk-x11-2.0 \
-lgdk-x11-2.0 \
-latk-1.0 \
-lgdk_pixbuf-2.0 \
-lpangocairo-1.0 \
-lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl \
-lglib-2.0 -lfreetype -lz -lfontconfig -lexpat -lglitz \
-lm -lpng12 -lXrender -lX11 -lpthread -lXau -lXdmcp \
-L/usr/local/lib -L/usr/X11R6/lib \
-L$(QTDIR)/lib \
-lGL -lGLU -lqt-mt
-ltriSurface \
-L/opt/gnome/lib64 \
-lgtk-x11-2.0 \
-lgdk-x11-2.0 \
-latk-1.0 \
-lgdk_pixbuf-2.0 \
-lpangocairo-1.0 \
-lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl \
-lglib-2.0 -lfreetype -lz -lfontconfig -lexpat -lglitz \
-lm -lpng12 -lXrender -lX11 -lpthread -lXau -lXdmcp \
-L/usr/local/lib -L/usr/X11R6/lib \
-L$(QTDIR)/lib \
-lGL -lGLU -lqt-mt
......@@ -20,44 +20,44 @@
GtkWidget* lookup_widget
(
GtkWidget* widget,
const gchar* widget_name
GtkWidget* widget,
const gchar* widget_name
)
{
GtkWidget *parent, *found_widget;
GtkWidget *parent, *found_widget;
for(;;)
for(;;)
{
if( GTK_IS_MENU(widget) )
{
parent = gtk_menu_get_attach_widget(GTK_MENU(widget));
std::cout << "Here!" << std::endl;
}
else
{
parent = widget->parent;
std::cout << "Parent " << parent << std::endl;
}
if( !parent )
{
parent =
(GtkWidget*)g_object_get_data
(
G_OBJECT(widget),
"GladeParentKey"
);
}
if( parent == NULL )
break;
widget = parent;
if( GTK_IS_MENU(widget) )
{
parent = gtk_menu_get_attach_widget(GTK_MENU(widget));
std::cout << "Here!" << std::endl;
}
else
{
parent = widget->parent;
std::cout << "Parent " << parent << std::endl;
}
if( !parent )
{
parent =
(GtkWidget*)g_object_get_data
(
G_OBJECT(widget),
"GladeParentKey"
);
}
if( parent == NULL )
break;
widget = parent;
}
std::cout << "Start " << widget << std::endl;
found_widget = (GtkWidget*)g_object_get_data(G_OBJECT(widget), widget_name);
if( !found_widget )
g_warning("Widget not found: %s", widget_name);
std::cout << "Start " << widget << std::endl;
found_widget = (GtkWidget*)g_object_get_data(G_OBJECT(widget), widget_name);
if( !found_widget )
g_warning("Widget not found: %s", widget_name);
return found_widget;
}
......@@ -43,38 +43,38 @@ meshGenGTK::meshGenGTK
label argc, char* argv[], const objectRegistry& reg
)
:
meshGui_(reg),
generalPageFramePtr_(NULL),
mainWindowPtr_(NULL),
localRefinementFramePtr_(NULL),
keepCellsIntersectingPatchesFramePtr_(NULL),
bndLayersFramePtr_(NULL),
localSettingsMainFramePtr_(NULL),
boxRefinementFramePtr_(NULL),
lineRefinementFramePtr_(NULL),
coneRefinementFramePtr_(NULL),
sphereRefinementFramePtr_(NULL),
objectRefinementMainFramePtr_(NULL),
renameBoundaryFramePtr_(NULL)
meshGui_(reg),
generalPageFramePtr_(NULL),
mainWindowPtr_(NULL),
localRefinementFramePtr_(NULL),
keepCellsIntersectingPatchesFramePtr_(NULL),
bndLayersFramePtr_(NULL),
localSettingsMainFramePtr_(NULL),
boxRefinementFramePtr_(NULL),
lineRefinementFramePtr_(NULL),
coneRefinementFramePtr_(NULL),
sphereRefinementFramePtr_(NULL),
objectRefinementMainFramePtr_(NULL),
renameBoundaryFramePtr_(NULL)
{
gtk_init(&argc, &argv);
createLocalSettingsMainWindowPage();
createGeneralPage();
createObjectRefinementMainWindowPage();
createRenameBoundaryMainWindowPage();
createMainWindowPage();
gtk_main();
gtk_init(&argc, &argv);
createLocalSettingsMainWindowPage();
createGeneralPage();
createObjectRefinementMainWindowPage();
createRenameBoundaryMainWindowPage();
createMainWindowPage();
gtk_main();
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
meshGenGTK::~meshGenGTK()
{
meshGui_.writeDict();
meshGui_.writeDict();
gtk_main_quit();
}
......
......@@ -47,7 +47,7 @@ namespace Foam
//- Forward declarations
class triSurface;
static meshGenGUI* guiPtr(NULL);
/*---------------------------------------------------------------------------*\
......@@ -56,49 +56,49 @@ static meshGenGUI* guiPtr(NULL);
class meshGenGTK
{
// Private data
//- mesh generation dictionary
meshGenGUI meshGui_;
// Private data
//- mesh generation dictionary
meshGenGUI meshGui_;
//- pages
GtkWidget* generalPageFramePtr_;
GtkWidget* mainWindowPtr_;
GtkWidget* localRefinementFramePtr_;
GtkWidget* keepCellsIntersectingPatchesFramePtr_;
GtkWidget* bndLayersFramePtr_;
GtkWidget* localSettingsMainFramePtr_;
GtkWidget* boxRefinementFramePtr_;
GtkWidget* lineRefinementFramePtr_;
GtkWidget* coneRefinementFramePtr_;
GtkWidget* sphereRefinementFramePtr_;
GtkWidget* objectRefinementMainFramePtr_;
GtkWidget* renameBoundaryFramePtr_;
//- pages
GtkWidget* generalPageFramePtr_;
GtkWidget* mainWindowPtr_;
GtkWidget* localRefinementFramePtr_;
GtkWidget* keepCellsIntersectingPatchesFramePtr_;
GtkWidget* bndLayersFramePtr_;
GtkWidget* localSettingsMainFramePtr_;
GtkWidget* boxRefinementFramePtr_;
GtkWidget* lineRefinementFramePtr_;
GtkWidget* coneRefinementFramePtr_;
GtkWidget* sphereRefinementFramePtr_;
GtkWidget* objectRefinementMainFramePtr_;
GtkWidget* renameBoundaryFramePtr_;
private:
// Private member functions
//- create pages
void createGeneralPage();
void createMainWindowPage();
//- pages for local features
void createLocalRefinementWindowPage();
void createKeepCellsIntersectingPatchesWindowPage();
void createBndLayersWindowPage();
void createLocalSettingsMainWindowPage();
//- pages for object refinement
void createBoxRefinementWindowPage();
void createLineRefinementWindowPage();
void createConeRefinementWindowPage();
void createSphereRefinementWindowPage();
void createObjectRefinementMainWindowPage();
//- pages for boundary renaming
void createRenameBoundaryMainWindowPage();
// Private member functions
//- create pages
void createGeneralPage();
void createMainWindowPage();
//- pages for local features
void createLocalRefinementWindowPage();
void createKeepCellsIntersectingPatchesWindowPage();
void createBndLayersWindowPage();
void createLocalSettingsMainWindowPage();
//- pages for object refinement
void createBoxRefinementWindowPage();
void createLineRefinementWindowPage();
void createConeRefinementWindowPage();
void createSphereRefinementWindowPage();
void createObjectRefinementMainWindowPage();
//- pages for boundary renaming
void createRenameBoundaryMainWindowPage();
//- Disallow default bitwise copy construct
meshGenGTK(const meshGenGTK&);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -37,88 +37,88 @@ namespace Foam
void meshGenGTK::createLocalSettingsMainWindowPage()
{
//- create pages within this page
createLocalRefinementWindowPage();
createKeepCellsIntersectingPatchesWindowPage();
createBndLayersWindowPage();
localSettingsMainFramePtr_ = gtk_frame_new(NULL);
GtkWidget* notebook1 = gtk_notebook_new ();
gtk_container_add(GTK_CONTAINER(localSettingsMainFramePtr_), notebook1);
//- add page for local refinement
GtkWidget* label_localRefinement = gtk_label_new("Local refinement");
gtk_widget_show(label_localRefinement);
gtk_notebook_append_page
(
GTK_NOTEBOOK(notebook1),
localRefinementFramePtr_,
label_localRefinement
);
//- add page for keepCellsIntersectingPatches
GtkWidget* label_keepBoxesIntersectingPatches =