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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
64bd8a46
Commit
64bd8a46
authored
Nov 08, 2011
by
untereiner
Browse files
Options
Browse Files
Download
Plain Diff
Merge cgogn:~cgogn/CGoGN
parents
2d082a87
d5eebb90
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12 additions
and
16 deletions
+12
-16
Apps/Examples/Debug/CMakeLists.txt
Apps/Examples/Debug/CMakeLists.txt
+1
-1
Apps/Examples/Release/CMakeLists.txt
Apps/Examples/Release/CMakeLists.txt
+1
-1
Apps/Examples/clipping.cpp
Apps/Examples/clipping.cpp
+1
-4
Apps/Tuto/CMakeLists.txt
Apps/Tuto/CMakeLists.txt
+1
-1
build/CMakeLists.txt
build/CMakeLists.txt
+1
-1
build/Debug/CMakeLists.txt
build/Debug/CMakeLists.txt
+1
-1
build/Release/CMakeLists.txt
build/Release/CMakeLists.txt
+1
-1
include/Algo/ImplicitHierarchicalMesh/ihm.h
include/Algo/ImplicitHierarchicalMesh/ihm.h
+2
-3
include/Algo/ImplicitHierarchicalMesh/ihm.hpp
include/Algo/ImplicitHierarchicalMesh/ihm.hpp
+1
-1
src/Utils/qtgl.cpp
src/Utils/qtgl.cpp
+2
-2
No files found.
Apps/Examples/Debug/CMakeLists.txt
View file @
64bd8a46
cmake_minimum_required
(
VERSION 2.
6
)
cmake_minimum_required
(
VERSION 2.
8
)
project
(
examplesD
)
...
...
Apps/Examples/Release/CMakeLists.txt
View file @
64bd8a46
cmake_minimum_required
(
VERSION 2.
6
)
cmake_minimum_required
(
VERSION 2.
8
)
project
(
examples
)
...
...
Apps/Examples/clipping.cpp
View file @
64bd8a46
...
...
@@ -186,10 +186,7 @@ void Clipping::slot_spinBox_GridResolution(int i)
void
Clipping
::
slot_pushButton_changePlanesColor
()
{
QColor
NewColor
;
QColorDialog
ColDialog
;
NewColor
=
ColDialog
.
getColor
();
QColor
NewColor
=
QColorDialog
::
getColor
();
int
r
,
g
,
b
;
NewColor
.
getRgb
(
&
r
,
&
g
,
&
b
);
...
...
Apps/Tuto/CMakeLists.txt
View file @
64bd8a46
cmake_minimum_required
(
VERSION 2.
6
)
cmake_minimum_required
(
VERSION 2.
8
)
project
(
Tutos
)
...
...
build/CMakeLists.txt
View file @
64bd8a46
cmake_minimum_required
(
VERSION 2.
6
)
cmake_minimum_required
(
VERSION 2.
8
)
project
(
CGoGN
)
...
...
build/Debug/CMakeLists.txt
View file @
64bd8a46
cmake_minimum_required
(
VERSION 2.
6
)
cmake_minimum_required
(
VERSION 2.
8
)
project
(
CGoGNDebug
)
...
...
build/Release/CMakeLists.txt
View file @
64bd8a46
cmake_minimum_required
(
VERSION 2.
6
)
cmake_minimum_required
(
VERSION 2.
8
)
project
(
CGoGNRelease
)
...
...
include/Algo/ImplicitHierarchicalMesh/ihm.h
View file @
64bd8a46
...
...
@@ -25,8 +25,7 @@
#ifndef __IMPLICIT_HIERARCHICAL_MAP__
#define __IMPLICIT_HIERARCHICAL_MAP__
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
namespace
CGoGN
{
...
...
@@ -39,7 +38,7 @@ namespace IHM
template
<
typename
T
>
class
AttributeHandler_IHM
;
class
ImplicitHierarchicalMap
:
public
EmbeddedMap2
<
Map2
>
class
ImplicitHierarchicalMap
:
public
EmbeddedMap2
{
template
<
typename
T
>
friend
class
AttributeHandler_IHM
;
...
...
include/Algo/ImplicitHierarchicalMesh/ihm.hpp
View file @
64bd8a46
...
...
@@ -253,7 +253,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_cc(Dart d, FunctorType& f,
inline
void
ImplicitHierarchicalMap
::
splitFace
(
Dart
d
,
Dart
e
)
{
EmbeddedMap2
<
Map2
>
::
splitFace
(
d
,
e
)
;
EmbeddedMap2
::
splitFace
(
d
,
e
)
;
if
(
isOrbitEmbedded
(
FACE
))
{
unsigned
int
cur
=
m_curLevel
;
...
...
src/Utils/qtgl.cpp
View file @
64bd8a46
...
...
@@ -336,8 +336,8 @@ void GLWidget::keyPressEvent(QKeyEvent* event)
m_state_modifier
=
event
->
modifiers
();
int
k
=
event
->
key
();
//
if ( (k >= 65) && (k <= 91) && !(event->modifiers() & Qt::ShiftModifier) )
//
k += 32;
if
(
(
k
>=
65
)
&&
(
k
<=
91
)
&&
!
(
event
->
modifiers
()
&
Qt
::
ShiftModifier
)
)
k
+=
32
;
if
(
m_cbs
)
m_cbs
->
cb_keyPress
(
k
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment