Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
FreeCAD
FreeCAD
Commits
0d17470a
Commit
0d17470a
authored
Dec 20, 2012
by
Yorik van Havre
Browse files
Merge branch 'master' of
ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad
parents
496a216f
b288826d
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/Gui/CADNavigationStyle.cpp
View file @
0d17470a
...
...
@@ -71,7 +71,7 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode)
case
NavigationStyle
::
DRAGGING
:
return
QT_TR_NOOP
(
"Press left and middle mouse button"
);
case
NavigationStyle
::
ZOOMING
:
return
QT_TR_NOOP
(
"Scroll middle mouse button"
);
return
QT_TR_NOOP
(
"Scroll middle mouse button
or middle and left click
"
);
default:
return
"No description"
;
}
...
...
src/Gui/DlgSettings3DView.ui
View file @
0d17470a
...
...
@@ -176,7 +176,7 @@
<double>
0.050000000000000
</double>
</property>
<property
name=
"value"
>
<double>
0.0
5
0000000000000
</double>
<double>
0.
2
00000000000000
</double>
</property>
<property
name=
"prefEntry"
stdset=
"0"
>
<cstring>
ZoomStep
</cstring>
...
...
@@ -190,7 +190,10 @@
</item>
<item
row=
"5"
column=
"0"
>
<widget
class=
"Gui::PrefCheckBox"
name=
"checkBoxInvertZoom"
>
<property
name=
"text"
>
<property
name=
"checked"
>
<bool>
true
</bool>
</property>
<property
name=
"text"
>
<string>
Invert zoom
</string>
</property>
<property
name=
"prefEntry"
stdset=
"0"
>
...
...
src/Gui/DlgSettingsViewColor.ui
View file @
0d17470a
...
...
@@ -7,7 +7,7 @@
<x>
0
</x>
<y>
0
</y>
<width>
601
</width>
<height>
44
5
</height>
<height>
56
5
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
...
...
@@ -652,17 +652,20 @@
<tabstop>
checkBoxSelection
</tabstop>
<tabstop>
HighlightColor
</tabstop>
<tabstop>
SelectionColor
</tabstop>
<tabstop>
DefaultShapeColor
</tabstop>
<tabstop>
DefaultShapeLineWidth
</tabstop>
<tabstop>
DefaultShapeLineColor
</tabstop>
<tabstop>
CursorTextColor
</tabstop>
<tabstop>
EditedEdgeColor
</tabstop>
<tabstop>
EditedVertexColor
</tabstop>
<tabstop>
ConstructionColor
</tabstop>
<tabstop>
FullyConstrainedColor
</tabstop>
<tabstop>
radioButtonSimple
</tabstop>
<tabstop>
radioButtonGradient
</tabstop>
<tabstop>
checkMidColor
</tabstop>
<tabstop>
SelectionColor_Background
</tabstop>
<tabstop>
radioButtonGradient
</tabstop>
<tabstop>
backgroundColorFrom
</tabstop>
<tabstop>
backgroundColorTo
</tabstop>
<tabstop>
checkMidColor
</tabstop>
<tabstop>
backgroundColorMid
</tabstop>
</tabstops>
<resources/>
...
...
src/Gui/NavigationStyle.cpp
View file @
0d17470a
...
...
@@ -226,11 +226,11 @@ void NavigationStyle::initialize()
this
->
shiftdown
=
FALSE
;
this
->
altdown
=
FALSE
;
this
->
invertZoom
=
App
::
GetApplication
().
GetParameterGroupByPath
(
"User parameter:BaseApp/Preferences/View"
)
->
GetBool
(
"InvertZoom"
,
fals
e
);
(
"User parameter:BaseApp/Preferences/View"
)
->
GetBool
(
"InvertZoom"
,
tru
e
);
this
->
zoomAtCursor
=
App
::
GetApplication
().
GetParameterGroupByPath
(
"User parameter:BaseApp/Preferences/View"
)
->
GetBool
(
"ZoomAtCursor"
,
false
);
this
->
zoomStep
=
App
::
GetApplication
().
GetParameterGroupByPath
(
"User parameter:BaseApp/Preferences/View"
)
->
GetFloat
(
"ZoomStep"
,
0.
05
f
);
(
"User parameter:BaseApp/Preferences/View"
)
->
GetFloat
(
"ZoomStep"
,
0.
2
f
);
}
void
NavigationStyle
::
finalize
()
...
...
src/Gui/TaskView/TaskWatcher.cpp
View file @
0d17470a
...
...
@@ -143,5 +143,30 @@ bool TaskWatcherCommandsEmptyDoc::shouldShow()
return
doc
&&
doc
->
countObjects
()
==
0
;
}
//**************************************************************************
//**************************************************************************
// TaskWatcherCommandsEmptySelection
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskWatcherCommandsEmptySelection
::
TaskWatcherCommandsEmptySelection
(
const
char
*
commands
[],
const
char
*
name
,
const
char
*
pixmap
)
:
TaskWatcherCommands
(
0
,
commands
,
name
,
pixmap
)
{
}
TaskWatcherCommandsEmptySelection
::~
TaskWatcherCommandsEmptySelection
()
{
}
//==== implementer ===========================================================================
//==== calls from the TaskView ===============================================================
bool
TaskWatcherCommandsEmptySelection
::
shouldShow
()
{
return
(
App
::
GetApplication
().
getActiveDocument
()
&&
Gui
::
Selection
().
size
()
==
0
);
}
#include
"moc_TaskWatcher.cpp"
src/Gui/TaskView/TaskWatcher.h
View file @
0d17470a
...
...
@@ -97,6 +97,23 @@ public:
};
// --------------------------------------------------------------------------
/// Special watcher class for showing commands when there is nothing selected
class
GuiExport
TaskWatcherCommandsEmptySelection
:
public
TaskWatcherCommands
{
Q_OBJECT
public:
TaskWatcherCommandsEmptySelection
(
const
char
*
commands
[],
const
char
*
name
,
const
char
*
pixmap
);
~
TaskWatcherCommandsEmptySelection
();
public:
/// is called wenn the document or the Selection changes.
virtual
bool
shouldShow
(
void
);
};
}
//namespace TaskView
...
...
src/Mod/Part/Gui/ViewProviderExt.cpp
View file @
0d17470a
...
...
@@ -860,9 +860,10 @@ void ViewProviderPartExt::updateVisual(const TopoDS_Shape& inputShape)
Base
::
Console
().
Error
(
"Cannot compute Inventor representation for the shape of %s.
\n
"
,
pcObject
->
getNameInDocument
());
}
// printing some informations
Base
::
Console
().
Log
(
"ViewProvider update time: %f s
\n
"
,
Base
::
TimeInfo
::
diffTimeF
(
start_time
,
Base
::
TimeInfo
()));
Base
::
Console
().
Log
(
"Shape tria info: Faces:%d Edges:%d Nodes:%d Triangles:%d IdxVec:%d
\n
"
,
nbrFaces
,
nbrEdges
,
nbrNodes
,
nbrTriangles
,
nbrLines
);
# ifdef FC_DEBUG
// printing some informations
Base
::
Console
().
Log
(
"ViewProvider update time: %f s
\n
"
,
Base
::
TimeInfo
::
diffTimeF
(
start_time
,
Base
::
TimeInfo
()));
Base
::
Console
().
Log
(
"Shape tria info: Faces:%d Edges:%d Nodes:%d Triangles:%d IdxVec:%d
\n
"
,
nbrFaces
,
nbrEdges
,
nbrNodes
,
nbrTriangles
,
nbrLines
);
# endif
VisualTouched
=
false
;
}
src/Mod/PartDesign/Gui/Workbench.cpp
View file @
0d17470a
...
...
@@ -140,7 +140,7 @@ void Workbench::activated()
"Part_Box"
,
"Part_Cylinder"
,
0
};
Watcher
.
push_back
(
new
Gui
::
TaskView
::
TaskWatcherCommandsEmpty
Doc
(
Watcher
.
push_back
(
new
Gui
::
TaskView
::
TaskWatcherCommandsEmpty
Selection
(
Empty
,
"Create Geometry"
,
"Part_Box"
...
...
Write
Preview
Supports
Markdown
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