Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
2046135e
Commit
2046135e
authored
Jan 28, 2013
by
untereiner
Browse files
Options
Browse Files
Download
Plain Diff
Merge cgogn:~cgogn/CGoGN
parents
8b368628
42e522b2
Changes
30
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
344 additions
and
139 deletions
+344
-139
SCHNApps/Debug/CMakeLists.txt
SCHNApps/Debug/CMakeLists.txt
+1
-0
SCHNApps/Plugins/differentialProperties/include/differentialProperties.h
...s/differentialProperties/include/differentialProperties.h
+0
-4
SCHNApps/Plugins/importSurface/importSurface.cpp
SCHNApps/Plugins/importSurface/importSurface.cpp
+2
-1
SCHNApps/Plugins/importSurface/importSurface.h
SCHNApps/Plugins/importSurface/importSurface.h
+1
-5
SCHNApps/Plugins/importVolume/importVolume.cpp
SCHNApps/Plugins/importVolume/importVolume.cpp
+2
-1
SCHNApps/Plugins/importVolume/importVolume.h
SCHNApps/Plugins/importVolume/importVolume.h
+1
-5
SCHNApps/Plugins/render/render.cpp
SCHNApps/Plugins/render/render.cpp
+32
-20
SCHNApps/Plugins/render/render.h
SCHNApps/Plugins/render/render.h
+5
-4
SCHNApps/Plugins/renderExplod/renderExplod.ui
SCHNApps/Plugins/renderExplod/renderExplod.ui
+1
-1
SCHNApps/Plugins/renderVector/renderVector.cpp
SCHNApps/Plugins/renderVector/renderVector.cpp
+30
-20
SCHNApps/Plugins/renderVector/renderVector.h
SCHNApps/Plugins/renderVector/renderVector.h
+5
-4
SCHNApps/Plugins/subdivideSurface/include/subdivideSurface.h
SCHNApps/Plugins/subdivideSurface/include/subdivideSurface.h
+0
-4
SCHNApps/Release/CMakeLists.txt
SCHNApps/Release/CMakeLists.txt
+1
-0
SCHNApps/bin/init.py
SCHNApps/bin/init.py
+10
-0
SCHNApps/include/dialogs/cameraViewDialog.h
SCHNApps/include/dialogs/cameraViewDialog.h
+3
-0
SCHNApps/include/dialogs/mapsViewDialog.h
SCHNApps/include/dialogs/mapsViewDialog.h
+3
-0
SCHNApps/include/dialogs/pluginsViewDialog.h
SCHNApps/include/dialogs/pluginsViewDialog.h
+3
-0
SCHNApps/include/mapHandler.h
SCHNApps/include/mapHandler.h
+4
-0
SCHNApps/include/plugin.h
SCHNApps/include/plugin.h
+7
-5
SCHNApps/include/view.h
SCHNApps/include/view.h
+4
-0
SCHNApps/include/window.h
SCHNApps/include/window.h
+5
-0
SCHNApps/src/dialogs/cameraViewDialog.cpp
SCHNApps/src/dialogs/cameraViewDialog.cpp
+45
-8
SCHNApps/src/dialogs/mapsViewDialog.cpp
SCHNApps/src/dialogs/mapsViewDialog.cpp
+46
-9
SCHNApps/src/dialogs/pluginsViewDialog.cpp
SCHNApps/src/dialogs/pluginsViewDialog.cpp
+46
-9
SCHNApps/src/main.cpp
SCHNApps/src/main.cpp
+9
-4
SCHNApps/src/window.cpp
SCHNApps/src/window.cpp
+57
-24
include/Algo/Decimation/halfEdgeSelector.h
include/Algo/Decimation/halfEdgeSelector.h
+2
-2
include/Algo/Decimation/halfEdgeSelector.hpp
include/Algo/Decimation/halfEdgeSelector.hpp
+15
-5
include/Algo/Render/GL2/explodeVolumeRender.hpp
include/Algo/Render/GL2/explodeVolumeRender.hpp
+2
-2
include/Utils/Shaders/shaderExplodeSmoothVolumes.frag
include/Utils/Shaders/shaderExplodeSmoothVolumes.frag
+2
-2
No files found.
SCHNApps/Debug/CMakeLists.txt
View file @
2046135e
...
@@ -38,6 +38,7 @@ SET(SCHNApps_H_OBJECT_FILES
...
@@ -38,6 +38,7 @@ SET(SCHNApps_H_OBJECT_FILES
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/window.h
${
SCHNApps_ROOT_DIR
}
/include/window.h
${
SCHNApps_ROOT_DIR
}
/include/mapHandler.h
${
SCHNApps_ROOT_DIR
}
/include/mapHandler.h
${
SCHNApps_ROOT_DIR
}
/include/plugin.h
${
SCHNApps_ROOT_DIR
}
/include/viewButtonArea.h
${
SCHNApps_ROOT_DIR
}
/include/viewButtonArea.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/camerasDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/camerasDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/pluginsDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/pluginsDialog.h
...
...
SCHNApps/Plugins/differentialProperties/include/differentialProperties.h
View file @
2046135e
...
@@ -37,10 +37,6 @@ public:
...
@@ -37,10 +37,6 @@ public:
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
viewLinked
(
View
*
view
)
{}
virtual
void
viewUnlinked
(
View
*
view
)
{}
virtual
void
currentViewChanged
(
View
*
view
)
{}
public
slots
:
public
slots
:
void
openComputeNormalDialog
();
void
openComputeNormalDialog
();
void
openComputeCurvatureDialog
();
void
openComputeCurvatureDialog
();
...
...
SCHNApps/Plugins/importSurface/importSurface.cpp
View file @
2046135e
...
@@ -15,7 +15,7 @@ bool ImportSurfacePlugin::enable()
...
@@ -15,7 +15,7 @@ bool ImportSurfacePlugin::enable()
return
true
;
return
true
;
}
}
void
ImportSurfacePlugin
::
importFromFile
(
const
QString
&
fileName
)
MapHandlerGen
*
ImportSurfacePlugin
::
importFromFile
(
const
QString
&
fileName
)
{
{
QFileInfo
fi
(
fileName
);
QFileInfo
fi
(
fileName
);
if
(
fi
.
exists
())
if
(
fi
.
exists
())
...
@@ -43,6 +43,7 @@ void ImportSurfacePlugin::importFromFile(const QString& fileName)
...
@@ -43,6 +43,7 @@ void ImportSurfacePlugin::importFromFile(const QString& fileName)
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
LINES
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
LINES
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
TRIANGLES
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
TRIANGLES
);
}
}
return
mhg
;
}
}
}
}
...
...
SCHNApps/Plugins/importSurface/importSurface.h
View file @
2046135e
...
@@ -34,12 +34,8 @@ public:
...
@@ -34,12 +34,8 @@ public:
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
viewLinked
(
View
*
view
)
{}
virtual
void
viewUnlinked
(
View
*
view
)
{}
virtual
void
currentViewChanged
(
View
*
view
)
{}
public
slots
:
public
slots
:
void
importFromFile
(
const
QString
&
fileName
);
MapHandlerGen
*
importFromFile
(
const
QString
&
fileName
);
void
importFromFileDialog
();
void
importFromFileDialog
();
private:
private:
...
...
SCHNApps/Plugins/importVolume/importVolume.cpp
View file @
2046135e
...
@@ -15,7 +15,7 @@ bool ImportVolumePlugin::enable()
...
@@ -15,7 +15,7 @@ bool ImportVolumePlugin::enable()
return
true
;
return
true
;
}
}
void
ImportVolumePlugin
::
importFromFile
(
const
QString
&
fileName
)
MapHandlerGen
*
ImportVolumePlugin
::
importFromFile
(
const
QString
&
fileName
)
{
{
QFileInfo
fi
(
fileName
);
QFileInfo
fi
(
fileName
);
if
(
fi
.
exists
())
if
(
fi
.
exists
())
...
@@ -43,6 +43,7 @@ void ImportVolumePlugin::importFromFile(const QString& fileName)
...
@@ -43,6 +43,7 @@ void ImportVolumePlugin::importFromFile(const QString& fileName)
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
LINES
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
LINES
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
TRIANGLES
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
TRIANGLES
);
}
}
return
mhg
;
}
}
}
}
...
...
SCHNApps/Plugins/importVolume/importVolume.h
View file @
2046135e
...
@@ -34,12 +34,8 @@ public:
...
@@ -34,12 +34,8 @@ public:
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
viewLinked
(
View
*
view
)
{}
virtual
void
viewUnlinked
(
View
*
view
)
{}
virtual
void
currentViewChanged
(
View
*
view
)
{}
public
slots
:
public
slots
:
void
importFromFile
(
const
QString
&
fileName
);
MapHandlerGen
*
importFromFile
(
const
QString
&
fileName
);
void
importFromFileDialog
();
void
importFromFileDialog
();
private:
private:
...
...
SCHNApps/Plugins/render/render.cpp
View file @
2046135e
...
@@ -66,6 +66,10 @@ bool RenderPlugin::enable()
...
@@ -66,6 +66,10 @@ bool RenderPlugin::enable()
connect
(
m_dockTab
->
check_renderFaces
,
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
cb_renderFacesChanged
(
bool
)));
connect
(
m_dockTab
->
check_renderFaces
,
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
cb_renderFacesChanged
(
bool
)));
connect
(
m_dockTab
->
group_faceShading
,
SIGNAL
(
buttonClicked
(
QAbstractButton
*
)),
this
,
SLOT
(
cb_faceStyleChanged
(
QAbstractButton
*
)));
connect
(
m_dockTab
->
group_faceShading
,
SIGNAL
(
buttonClicked
(
QAbstractButton
*
)),
this
,
SLOT
(
cb_faceStyleChanged
(
QAbstractButton
*
)));
connect
(
m_window
,
SIGNAL
(
viewAndPluginLinked
(
View
*
,
Plugin
*
)),
this
,
SLOT
(
viewLinked
(
View
*
,
Plugin
*
)));
connect
(
m_window
,
SIGNAL
(
viewAndPluginUnlinked
(
View
*
,
Plugin
*
)),
this
,
SLOT
(
viewUnlinked
(
View
*
,
Plugin
*
)));
connect
(
m_window
,
SIGNAL
(
currentViewChanged
(
View
*
)),
this
,
SLOT
(
currentViewChanged
(
View
*
)));
return
true
;
return
true
;
}
}
...
@@ -128,38 +132,44 @@ void RenderPlugin::redraw(View* view)
...
@@ -128,38 +132,44 @@ void RenderPlugin::redraw(View* view)
}
}
}
}
void
RenderPlugin
::
viewLinked
(
View
*
view
)
void
RenderPlugin
::
viewLinked
(
View
*
view
,
Plugin
*
plugin
)
{
{
ParameterSet
*
params
=
new
ParameterSet
();
if
(
plugin
==
this
)
h_viewParams
.
insert
(
view
,
params
);
const
QList
<
MapHandlerGen
*>&
maps
=
view
->
getLinkedMaps
();
foreach
(
MapHandlerGen
*
map
,
maps
)
{
{
PerMapParameterSet
p
(
map
);
ParameterSet
*
params
=
new
ParameterSet
();
params
->
perMap
.
insert
(
map
->
getName
(),
p
);
h_viewParams
.
insert
(
view
,
params
);
}
const
QList
<
MapHandlerGen
*>&
maps
=
view
->
getLinkedMaps
();
if
(
!
maps
.
empty
())
foreach
(
MapHandlerGen
*
map
,
maps
)
changeSelectedMap
(
view
,
maps
[
0
]);
{
PerMapParameterSet
p
(
map
);
params
->
perMap
.
insert
(
map
->
getName
(),
p
);
}
if
(
!
maps
.
empty
())
changeSelectedMap
(
view
,
maps
[
0
]);
connect
(
view
,
SIGNAL
(
mapLinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapLinked
(
MapHandlerGen
*
)));
connect
(
view
,
SIGNAL
(
mapLinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapLinked
(
MapHandlerGen
*
)));
connect
(
view
,
SIGNAL
(
mapUnlinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapUnlinked
(
MapHandlerGen
*
)));
connect
(
view
,
SIGNAL
(
mapUnlinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapUnlinked
(
MapHandlerGen
*
)));
if
(
view
->
isCurrentView
())
if
(
view
->
isCurrentView
())
m_dockTab
->
refreshUI
(
params
);
m_dockTab
->
refreshUI
(
params
);
}
}
}
void
RenderPlugin
::
viewUnlinked
(
View
*
view
)
void
RenderPlugin
::
viewUnlinked
(
View
*
view
,
Plugin
*
plugin
)
{
{
h_viewParams
.
remove
(
view
);
if
(
plugin
==
this
)
{
h_viewParams
.
remove
(
view
);
disconnect
(
view
,
SIGNAL
(
mapLinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapLinked
(
MapHandlerGen
*
)));
disconnect
(
view
,
SIGNAL
(
mapLinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapLinked
(
MapHandlerGen
*
)));
disconnect
(
view
,
SIGNAL
(
mapUnlinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapUnlinked
(
MapHandlerGen
*
)));
disconnect
(
view
,
SIGNAL
(
mapUnlinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapUnlinked
(
MapHandlerGen
*
)));
}
}
}
void
RenderPlugin
::
currentViewChanged
(
View
*
view
)
void
RenderPlugin
::
currentViewChanged
(
View
*
view
)
{
{
assert
(
isLinkedToView
(
view
));
if
(
isLinkedToView
(
view
))
m_dockTab
->
refreshUI
(
h_viewParams
[
view
]);
m_dockTab
->
refreshUI
(
h_viewParams
[
view
]);
}
}
void
RenderPlugin
::
mapLinked
(
MapHandlerGen
*
m
)
void
RenderPlugin
::
mapLinked
(
MapHandlerGen
*
m
)
...
@@ -210,6 +220,8 @@ void RenderPlugin::vboRemoved(Utils::VBO* vbo)
...
@@ -210,6 +220,8 @@ void RenderPlugin::vboRemoved(Utils::VBO* vbo)
changePositionVBO
(
view
,
map
,
NULL
);
changePositionVBO
(
view
,
map
,
NULL
);
if
(
params
->
perMap
[
map
->
getName
()].
normalVBO
==
vbo
)
if
(
params
->
perMap
[
map
->
getName
()].
normalVBO
==
vbo
)
changeNormalVBO
(
view
,
map
,
NULL
);
changeNormalVBO
(
view
,
map
,
NULL
);
m_dockTab
->
refreshUI
(
h_viewParams
[
view
]);
}
}
void
RenderPlugin
::
changeSelectedMap
(
View
*
view
,
MapHandlerGen
*
map
)
void
RenderPlugin
::
changeSelectedMap
(
View
*
view
,
MapHandlerGen
*
map
)
...
...
SCHNApps/Plugins/render/render.h
View file @
2046135e
...
@@ -96,10 +96,6 @@ public:
...
@@ -96,10 +96,6 @@ public:
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
viewLinked
(
View
*
view
);
virtual
void
viewUnlinked
(
View
*
view
);
virtual
void
currentViewChanged
(
View
*
view
);
void
setRefreshingUI
(
bool
b
)
{
b_refreshingUI
=
b
;
}
void
setRefreshingUI
(
bool
b
)
{
b_refreshingUI
=
b
;
}
protected:
protected:
...
@@ -114,8 +110,13 @@ protected:
...
@@ -114,8 +110,13 @@ protected:
bool
b_refreshingUI
;
bool
b_refreshingUI
;
public
slots
:
public
slots
:
void
viewLinked
(
View
*
view
,
Plugin
*
plugin
);
void
viewUnlinked
(
View
*
view
,
Plugin
*
plugin
);
void
currentViewChanged
(
View
*
view
);
void
mapLinked
(
MapHandlerGen
*
m
);
void
mapLinked
(
MapHandlerGen
*
m
);
void
mapUnlinked
(
MapHandlerGen
*
m
);
void
mapUnlinked
(
MapHandlerGen
*
m
);
void
vboAdded
(
Utils
::
VBO
*
vbo
);
void
vboAdded
(
Utils
::
VBO
*
vbo
);
void
vboRemoved
(
Utils
::
VBO
*
vbo
);
void
vboRemoved
(
Utils
::
VBO
*
vbo
);
...
...
SCHNApps/Plugins/renderExplod/renderExplod.ui
View file @
2046135e
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"2"
column=
"2"
alignment=
"Qt::AlignRight"
>
<item
row=
"2"
column=
"2"
>
<widget
class=
"QPushButton"
name=
"button_refreshVBOs"
>
<widget
class=
"QPushButton"
name=
"button_refreshVBOs"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Fixed"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Fixed"
>
...
...
SCHNApps/Plugins/renderVector/renderVector.cpp
View file @
2046135e
...
@@ -36,6 +36,10 @@ bool RenderVectorPlugin::enable()
...
@@ -36,6 +36,10 @@ bool RenderVectorPlugin::enable()
connect
(
m_dockTab
->
list_vectorVBO
,
SIGNAL
(
itemSelectionChanged
()),
this
,
SLOT
(
cb_selectedVectorsVBOChanged
()));
connect
(
m_dockTab
->
list_vectorVBO
,
SIGNAL
(
itemSelectionChanged
()),
this
,
SLOT
(
cb_selectedVectorsVBOChanged
()));
connect
(
m_dockTab
->
slider_vectorsScaleFactor
,
SIGNAL
(
valueChanged
(
int
)),
this
,
SLOT
(
cb_vectorsScaleFactorChanged
(
int
)));
connect
(
m_dockTab
->
slider_vectorsScaleFactor
,
SIGNAL
(
valueChanged
(
int
)),
this
,
SLOT
(
cb_vectorsScaleFactorChanged
(
int
)));
connect
(
m_window
,
SIGNAL
(
viewAndPluginLinked
(
View
*
,
Plugin
*
)),
this
,
SLOT
(
viewLinked
(
View
*
,
Plugin
*
)));
connect
(
m_window
,
SIGNAL
(
viewAndPluginUnlinked
(
View
*
,
Plugin
*
)),
this
,
SLOT
(
viewUnlinked
(
View
*
,
Plugin
*
)));
connect
(
m_window
,
SIGNAL
(
currentViewChanged
(
View
*
)),
this
,
SLOT
(
currentViewChanged
(
View
*
)));
return
true
;
return
true
;
}
}
...
@@ -66,38 +70,44 @@ void RenderVectorPlugin::redraw(View* view)
...
@@ -66,38 +70,44 @@ void RenderVectorPlugin::redraw(View* view)
}
}
}
}
void
RenderVectorPlugin
::
viewLinked
(
View
*
view
)
void
RenderVectorPlugin
::
viewLinked
(
View
*
view
,
Plugin
*
plugin
)
{
{
ParameterSet
*
params
=
new
ParameterSet
();
if
(
plugin
==
this
)
h_viewParams
.
insert
(
view
,
params
);
const
QList
<
MapHandlerGen
*>&
maps
=
view
->
getLinkedMaps
();
foreach
(
MapHandlerGen
*
map
,
maps
)
{
{
PerMapParameterSet
p
(
map
);
ParameterSet
*
params
=
new
ParameterSet
();
params
->
perMap
.
insert
(
map
->
getName
(),
p
);
h_viewParams
.
insert
(
view
,
params
);
}
const
QList
<
MapHandlerGen
*>&
maps
=
view
->
getLinkedMaps
();
if
(
!
maps
.
empty
())
foreach
(
MapHandlerGen
*
map
,
maps
)
changeSelectedMap
(
view
,
maps
[
0
]);
{
PerMapParameterSet
p
(
map
);
params
->
perMap
.
insert
(
map
->
getName
(),
p
);
}
if
(
!
maps
.
empty
())
changeSelectedMap
(
view
,
maps
[
0
]);
connect
(
view
,
SIGNAL
(
mapLinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapLinked
(
MapHandlerGen
*
)));
connect
(
view
,
SIGNAL
(
mapLinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapLinked
(
MapHandlerGen
*
)));
connect
(
view
,
SIGNAL
(
mapUnlinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapUnlinked
(
MapHandlerGen
*
)));
connect
(
view
,
SIGNAL
(
mapUnlinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapUnlinked
(
MapHandlerGen
*
)));
if
(
view
->
isCurrentView
())
if
(
view
->
isCurrentView
())
m_dockTab
->
refreshUI
(
params
);
m_dockTab
->
refreshUI
(
params
);
}
}
}
void
RenderVectorPlugin
::
viewUnlinked
(
View
*
view
)
void
RenderVectorPlugin
::
viewUnlinked
(
View
*
view
,
Plugin
*
plugin
)
{
{
h_viewParams
.
remove
(
view
);
if
(
plugin
==
this
)
{
h_viewParams
.
remove
(
view
);
disconnect
(
view
,
SIGNAL
(
mapLinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapLinked
(
MapHandlerGen
*
)));
disconnect
(
view
,
SIGNAL
(
mapLinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapLinked
(
MapHandlerGen
*
)));
disconnect
(
view
,
SIGNAL
(
mapUnlinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapUnlinked
(
MapHandlerGen
*
)));
disconnect
(
view
,
SIGNAL
(
mapUnlinked
(
MapHandlerGen
*
)),
this
,
SLOT
(
mapUnlinked
(
MapHandlerGen
*
)));
}
}
}
void
RenderVectorPlugin
::
currentViewChanged
(
View
*
view
)
void
RenderVectorPlugin
::
currentViewChanged
(
View
*
view
)
{
{
assert
(
isLinkedToView
(
view
));
if
(
isLinkedToView
(
view
))
m_dockTab
->
refreshUI
(
h_viewParams
[
view
]);
m_dockTab
->
refreshUI
(
h_viewParams
[
view
]);
}
}
void
RenderVectorPlugin
::
mapLinked
(
MapHandlerGen
*
m
)
void
RenderVectorPlugin
::
mapLinked
(
MapHandlerGen
*
m
)
...
...
SCHNApps/Plugins/renderVector/renderVector.h
View file @
2046135e
...
@@ -78,10 +78,6 @@ public:
...
@@ -78,10 +78,6 @@ public:
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
viewLinked
(
View
*
view
);
virtual
void
viewUnlinked
(
View
*
view
);
virtual
void
currentViewChanged
(
View
*
view
);
void
setRefreshingUI
(
bool
b
)
{
b_refreshingUI
=
b
;
}
void
setRefreshingUI
(
bool
b
)
{
b_refreshingUI
=
b
;
}
protected:
protected:
...
@@ -93,8 +89,13 @@ protected:
...
@@ -93,8 +89,13 @@ protected:
bool
b_refreshingUI
;
bool
b_refreshingUI
;
public
slots
:
public
slots
:
void
viewLinked
(
View
*
view
,
Plugin
*
plugin
);
void
viewUnlinked
(
View
*
view
,
Plugin
*
plugin
);
void
currentViewChanged
(
View
*
view
);
void
mapLinked
(
MapHandlerGen
*
m
);
void
mapLinked
(
MapHandlerGen
*
m
);
void
mapUnlinked
(
MapHandlerGen
*
m
);
void
mapUnlinked
(
MapHandlerGen
*
m
);
void
vboAdded
(
Utils
::
VBO
*
vbo
);
void
vboAdded
(
Utils
::
VBO
*
vbo
);
void
vboRemoved
(
Utils
::
VBO
*
vbo
);
void
vboRemoved
(
Utils
::
VBO
*
vbo
);
...
...
SCHNApps/Plugins/subdivideSurface/include/subdivideSurface.h
View file @
2046135e
...
@@ -36,10 +36,6 @@ public:
...
@@ -36,10 +36,6 @@ public:
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
viewLinked
(
View
*
view
)
{}
virtual
void
viewUnlinked
(
View
*
view
)
{}
virtual
void
currentViewChanged
(
View
*
view
)
{}
public
slots
:
public
slots
:
void
openSubdivideSurfaceDialog
();
void
openSubdivideSurfaceDialog
();
void
subdivideSurface
();
void
subdivideSurface
();
...
...
SCHNApps/Release/CMakeLists.txt
View file @
2046135e
...
@@ -37,6 +37,7 @@ file(
...
@@ -37,6 +37,7 @@ file(
SET
(
SCHNApps_H_OBJECT_FILES
SET
(
SCHNApps_H_OBJECT_FILES
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/mapHandler.h
${
SCHNApps_ROOT_DIR
}
/include/mapHandler.h
${
SCHNApps_ROOT_DIR
}
/include/plugin.h
${
SCHNApps_ROOT_DIR
}
/include/window.h
${
SCHNApps_ROOT_DIR
}
/include/window.h
${
SCHNApps_ROOT_DIR
}
/include/viewButtonArea.h
${
SCHNApps_ROOT_DIR
}
/include/viewButtonArea.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/camerasDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/camerasDialog.h
...
...
SCHNApps/bin/init.py
0 → 100644
View file @
2046135e
importPlugin
=
schnapps
.
loadPlugin
(
"ImportSurfacePlugin"
);
differentialPropertiesPlugin
=
schnapps
.
loadPlugin
(
"DifferentialPropertiesPlugin"
);
renderPlugin
=
schnapps
.
loadPlugin
(
"RenderPlugin"
);
hand
=
importPlugin
.
importFromFile
(
"/home/kraemer/Media/Data/surface/midRes/handman_12k.off"
);
v
=
schnapps
.
getView
(
"view_0"
);
schnapps
.
linkViewAndPlugin
(
v
.
getName
(),
renderPlugin
.
getName
());
schnapps
.
linkViewAndMap
(
v
.
getName
(),
hand
.
getName
());
SCHNApps/include/dialogs/cameraViewDialog.h
View file @
2046135e
...
@@ -24,11 +24,14 @@ public:
...
@@ -24,11 +24,14 @@ public:
private:
private:
Window
*
m_window
;
Window
*
m_window
;
View
*
m_view
;
View
*
m_view
;
bool
b_refreshingUI
;
void
selectCurrentCamera
();
void
selectCurrentCamera
();
public
slots
:
public
slots
:
void
selectedCameraChanged
();
void
selectedCameraChanged
();
void
selectCamera
(
View
*
view
,
Camera
*
camera
);
void
deselectCamera
(
View
*
view
,
Camera
*
camera
);
void
addCameraToList
(
Camera
*
c
);
void
addCameraToList
(
Camera
*
c
);
void
removeCameraFromList
(
Camera
*
c
);
void
removeCameraFromList
(
Camera
*
c
);
};
};
...
...
SCHNApps/include/dialogs/mapsViewDialog.h
View file @
2046135e
...
@@ -24,9 +24,12 @@ public:
...
@@ -24,9 +24,12 @@ public:
private:
private:
Window
*
m_window
;
Window
*
m_window
;
View
*
m_view
;
View
*
m_view
;
bool
b_refreshingUI
;
public
slots
:
public
slots
:
void
selectedMapsChanged
();
void
selectedMapsChanged
();
void
selectMap
(
View
*
view
,
MapHandlerGen
*
map
);
void
deselectMap
(
View
*
view
,
MapHandlerGen
*
map
);
void
addMapToList
(
MapHandlerGen
*
m
);
void
addMapToList
(
MapHandlerGen
*
m
);
void
removeMapFromList
(
MapHandlerGen
*
m
);
void
removeMapFromList
(
MapHandlerGen
*
m
);
};
};
...
...
SCHNApps/include/dialogs/pluginsViewDialog.h
View file @
2046135e
...
@@ -24,9 +24,12 @@ public:
...
@@ -24,9 +24,12 @@ public:
private:
private:
Window
*
m_window
;
Window
*
m_window
;
View
*
m_view
;
View
*
m_view
;
bool
b_refreshingUI
;
public
slots
:
public
slots
:
void
selectedPluginsChanged
();
void
selectedPluginsChanged
();
void
selectPlugin
(
View
*
view
,
Plugin
*
plugin
);
void
deselectPlugin
(
View
*
view
,
Plugin
*
plugin
);
void
addPluginToList
(
Plugin
*
p
);
void
addPluginToList
(
Plugin
*
p
);
void
removePluginFromList
(
Plugin
*
p
);
void
removePluginFromList
(
Plugin
*
p
);
};
};
...
...
SCHNApps/include/mapHandler.h
View file @
2046135e
...
@@ -29,6 +29,9 @@ public:
...
@@ -29,6 +29,9 @@ public:
virtual
~
MapHandlerGen
();
virtual
~
MapHandlerGen
();
const
QString
&
getName
()
const
{
return
m_name
;
}
const
QString
&
getName
()
const
{
return
m_name
;
}
public
slots
:
QString
getName
()
{
return
m_name
;
}
void
setName
(
const
QString
&
name
)
{
m_name
=
name
;
}
void
setName
(
const
QString
&
name
)
{
m_name
=
name
;
}
Window
*
getWindow
()
const
{
return
m_window
;
}
Window
*
getWindow
()
const
{
return
m_window
;
}
...
@@ -42,6 +45,7 @@ public:
...
@@ -42,6 +45,7 @@ public:
bool
isUsed
()
const
{
return
!
l_views
.
empty
();
}
bool
isUsed
()
const
{
return
!
l_views
.
empty
();
}
public:
void
draw
(
Utils
::
GLSLShader
*
shader
,
int
primitive
)
{
m_render
->
draw
(
shader
,
primitive
);
}
void
draw
(
Utils
::
GLSLShader
*
shader
,
int
primitive
)
{
m_render
->
draw
(
shader
,
primitive
);
}
/*********************************************************
/*********************************************************
...
...
SCHNApps/include/plugin.h
View file @
2046135e
...
@@ -16,11 +16,16 @@ class Window;
...
@@ -16,11 +16,16 @@ class Window;
class
Plugin
:
public
QObject
class
Plugin
:
public
QObject
{
{
Q_OBJECT
public:
public:
Plugin
();
Plugin
();
virtual
~
Plugin
();
virtual
~
Plugin
();
const
QString
&
getName
()
{
return
m_name
;
}
const
QString
&
getName
()
const
{
return
m_name
;
}
public
slots
:
QString
getName
()
{
return
m_name
;
}
void
setName
(
const
QString
&
name
)
{
m_name
=
name
;
}
void
setName
(
const
QString
&
name
)
{
m_name
=
name
;
}
const
QString
&
getFilePath
()
{
return
m_filePath
;
}
const
QString
&
getFilePath
()
{
return
m_filePath
;
}
...
@@ -34,6 +39,7 @@ public:
...
@@ -34,6 +39,7 @@ public:
bool
getProvidesRendering
()
{
return
b_providesRendering
;
}
bool
getProvidesRendering
()
{
return
b_providesRendering
;
}
void
setProvidesRendering
(
bool
b
)
{
b_providesRendering
=
b
;
}
void
setProvidesRendering
(
bool
b
)
{
b_providesRendering
=
b
;
}
public:
virtual
bool
enable
()
=
0
;
virtual
bool
enable
()
=
0
;
virtual
void
disable
()
=
0
;
virtual
void
disable
()
=
0
;
...
@@ -46,10 +52,6 @@ public:
...
@@ -46,10 +52,6 @@ public:
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
=
0
;
virtual
void
mouseMove
(
View
*
view
,
int
buttons
,
int
x
,
int
y
)
=
0
;
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
=
0
;
virtual
void
wheelEvent
(
View
*
view
,
int
delta
,
int
x
,
int
y
)
=
0
;
virtual
void
viewLinked
(
View
*
view
)
=
0
;
virtual
void
viewUnlinked
(
View
*
view
)
=
0
;
virtual
void
currentViewChanged
(
View
*
view
)
=
0
;
/*********************************************************
/*********************************************************
* MANAGE LINKED VIEWS
* MANAGE LINKED VIEWS
*********************************************************/
*********************************************************/
...
...
SCHNApps/include/view.h
View file @
2046135e
...
@@ -32,6 +32,9 @@ public:
...
@@ -32,6 +32,9 @@ public:
~
View
();
~
View
();