mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +03:00
0031622: Samples - update MFC Animation sample with proper frame updates
Animation sample has been updated to: - use reuse AIS_ViewController for general viewer manipulations; - update animation using elapsed time; - do not block camera manipilations; - get rid of redundant controls.
This commit is contained in:
kgv
bugmaster
parent
08b7a39f75
commit
64f128c111
@ -10,19 +10,15 @@ set (Animation_HEADER_FILES ${Animation_SRC_DIR}/AnimationApp.h
|
|||||||
${Animation_SRC_DIR}/AnimationDoc.h
|
${Animation_SRC_DIR}/AnimationDoc.h
|
||||||
${Animation_SRC_DIR}/AnimationView3D.h
|
${Animation_SRC_DIR}/AnimationView3D.h
|
||||||
${Animation_SRC_DIR}/Fonc.hxx
|
${Animation_SRC_DIR}/Fonc.hxx
|
||||||
${Animation_SRC_DIR}/Sensitivity.h
|
|
||||||
${Animation_SRC_DIR}/ShadingDialog.h
|
${Animation_SRC_DIR}/ShadingDialog.h
|
||||||
${Animation_SRC_DIR}/ThreadDialog.h
|
${Animation_SRC_DIR}/ThreadDialog.h
|
||||||
${Animation_SRC_DIR}/Tune.h
|
|
||||||
${Animation_SRC_DIR}/StdAfx.h )
|
${Animation_SRC_DIR}/StdAfx.h )
|
||||||
set (Animation_SOURCE_FILES ${Animation_SRC_DIR}/AnimationApp.cpp
|
set (Animation_SOURCE_FILES ${Animation_SRC_DIR}/AnimationApp.cpp
|
||||||
${Animation_SRC_DIR}/AnimationDoc.cpp
|
${Animation_SRC_DIR}/AnimationDoc.cpp
|
||||||
${Animation_SRC_DIR}/AnimationView3D.cpp
|
${Animation_SRC_DIR}/AnimationView3D.cpp
|
||||||
${Animation_SRC_DIR}/Fonc.cxx
|
${Animation_SRC_DIR}/Fonc.cxx
|
||||||
${Animation_SRC_DIR}/Sensitivity.cpp
|
|
||||||
${Animation_SRC_DIR}/ShadingDialog.cpp
|
${Animation_SRC_DIR}/ShadingDialog.cpp
|
||||||
${Animation_SRC_DIR}/ThreadDialog.cpp
|
${Animation_SRC_DIR}/ThreadDialog.cpp
|
||||||
${Animation_SRC_DIR}/Tune.cpp
|
|
||||||
${Animation_SRC_DIR}/StdAfx.cpp )
|
${Animation_SRC_DIR}/StdAfx.cpp )
|
||||||
|
|
||||||
set (Animation_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/09_Animation/res)
|
set (Animation_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/09_Animation/res)
|
||||||
|
|||||||
@ -314,7 +314,6 @@
|
|||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\src\Fonc.cxx" />
|
<ClCompile Include="..\..\..\src\Fonc.cxx" />
|
||||||
<ClCompile Include="..\..\..\src\Sensitivity.cpp" />
|
|
||||||
<ClCompile Include="..\..\..\src\ShadingDialog.cpp">
|
<ClCompile Include="..\..\..\src\ShadingDialog.cpp">
|
||||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
@ -367,7 +366,6 @@
|
|||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\src\Tune.cpp" />
|
|
||||||
<ClCompile Include="..\..\..\..\Common\WINMAIN.CPP">
|
<ClCompile Include="..\..\..\..\Common\WINMAIN.CPP">
|
||||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
@ -391,11 +389,9 @@
|
|||||||
<ClInclude Include="..\..\..\src\AnimationView3D.h" />
|
<ClInclude Include="..\..\..\src\AnimationView3D.h" />
|
||||||
<ClInclude Include="..\..\..\src\Fonc.hxx" />
|
<ClInclude Include="..\..\..\src\Fonc.hxx" />
|
||||||
<ClInclude Include="..\..\..\res\resource.h" />
|
<ClInclude Include="..\..\..\res\resource.h" />
|
||||||
<ClInclude Include="..\..\..\src\Sensitivity.h" />
|
|
||||||
<ClInclude Include="..\..\..\src\ShadingDialog.h" />
|
<ClInclude Include="..\..\..\src\ShadingDialog.h" />
|
||||||
<ClInclude Include="..\..\..\src\StdAfx.h" />
|
<ClInclude Include="..\..\..\src\StdAfx.h" />
|
||||||
<ClInclude Include="..\..\..\src\ThreadDialog.h" />
|
<ClInclude Include="..\..\..\src\ThreadDialog.h" />
|
||||||
<ClInclude Include="..\..\..\src\Tune.h" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\..\..\res\child2.bmp" />
|
<None Include="..\..\..\res\child2.bmp" />
|
||||||
|
|||||||
@ -32,9 +32,6 @@
|
|||||||
<ClCompile Include="..\..\..\src\Fonc.cxx">
|
<ClCompile Include="..\..\..\src\Fonc.cxx">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\src\Sensitivity.cpp">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\src\ShadingDialog.cpp">
|
<ClCompile Include="..\..\..\src\ShadingDialog.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@ -44,9 +41,6 @@
|
|||||||
<ClCompile Include="..\..\..\src\ThreadDialog.cpp">
|
<ClCompile Include="..\..\..\src\ThreadDialog.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\src\Tune.cpp">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\..\Common\WINMAIN.CPP">
|
<ClCompile Include="..\..\..\..\Common\WINMAIN.CPP">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@ -67,9 +61,6 @@
|
|||||||
<ClInclude Include="..\..\..\res\resource.h">
|
<ClInclude Include="..\..\..\res\resource.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\..\..\src\Sensitivity.h">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\..\..\src\ShadingDialog.h">
|
<ClInclude Include="..\..\..\src\ShadingDialog.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
@ -79,9 +70,6 @@
|
|||||||
<ClInclude Include="..\..\..\src\ThreadDialog.h">
|
<ClInclude Include="..\..\..\src\ThreadDialog.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\..\..\src\Tune.h">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\..\..\res\child2.bmp">
|
<None Include="..\..\..\res\child2.bmp">
|
||||||
|
|||||||
@ -80,9 +80,6 @@ BEGIN
|
|||||||
BUTTON ID_SHADING
|
BUTTON ID_SHADING
|
||||||
SEPARATOR
|
SEPARATOR
|
||||||
BUTTON ID_FILE_LOADGRID
|
BUTTON ID_FILE_LOADGRID
|
||||||
BUTTON ID_SENSITIVITY
|
|
||||||
BUTTON ID_VIEW_DISPLAYSTATUS
|
|
||||||
BUTTON ID_WALK_WALKTHRU
|
|
||||||
SEPARATOR
|
SEPARATOR
|
||||||
BUTTON ID_APP_ABOUT
|
BUTTON ID_APP_ABOUT
|
||||||
END
|
END
|
||||||
@ -156,11 +153,6 @@ BEGIN
|
|||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "&About DisplayAnimation...", ID_APP_ABOUT
|
MENUITEM "&About DisplayAnimation...", ID_APP_ABOUT
|
||||||
END
|
END
|
||||||
POPUP "Walk"
|
|
||||||
BEGIN
|
|
||||||
MENUITEM "Sensitivity...", ID_SENSITIVITY
|
|
||||||
MENUITEM "Walkthrough", ID_WALK_WALKTHRU
|
|
||||||
END
|
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
||||||
@ -191,51 +183,6 @@ BEGIN
|
|||||||
EDITTEXT IDC_Angle,65,27,48,16,ES_AUTOHSCROLL
|
EDITTEXT IDC_Angle,65,27,48,16,ES_AUTOHSCROLL
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_SENS DIALOG 0, 0, 229, 50
|
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
||||||
CAPTION "Sensitivity"
|
|
||||||
FONT 8, "MS Sans Serif"
|
|
||||||
BEGIN
|
|
||||||
LTEXT "Fly",IDC_STATIC,8,10,10,8
|
|
||||||
EDITTEXT IDC_FLY,33,8,76,15,ES_AUTOHSCROLL
|
|
||||||
CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,112,8,11,15
|
|
||||||
LTEXT "Turn",IDC_STATIC,6,28,16,8
|
|
||||||
EDITTEXT IDC_TURN,34,25,76,15,ES_AUTOHSCROLL
|
|
||||||
CONTROL "Spin1",IDC_SPIN2,"msctls_updown32",UDS_ARROWKEYS,112,25,11,15
|
|
||||||
DEFPUSHBUTTON "OK",IDOK,170,7,50,14
|
|
||||||
PUSHBUTTON "Cancel",IDCANCEL,170,23,50,14
|
|
||||||
END
|
|
||||||
|
|
||||||
IDD_TUNE DIALOG 0, 0, 131, 154
|
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
|
|
||||||
CAPTION "Display Tuning"
|
|
||||||
FONT 8, "MS Sans Serif"
|
|
||||||
BEGIN
|
|
||||||
LTEXT "Distance",IDC_STATIC,9,8,29,8
|
|
||||||
EDITTEXT IDC_FOCDIST,46,5,57,14,ES_AUTOHSCROLL
|
|
||||||
CONTROL "Spin1",IDC_SPINFOC,"msctls_updown32",UDS_ARROWKEYS,107,6,11,14
|
|
||||||
LTEXT "Aperture",IDC_STATIC,9,25,28,8
|
|
||||||
EDITTEXT IDC_APPERTURE,46,23,57,14,ES_AUTOHSCROLL
|
|
||||||
CONTROL "Spin4",IDC_SPINANG,"msctls_updown32",UDS_ARROWKEYS,107,23,11,14
|
|
||||||
LTEXT "X :",IDC_STATIC,17,52,12,8
|
|
||||||
LTEXT "0.",IDC_XEYE,31,52,66,8
|
|
||||||
GROUPBOX "Eye",IDC_STATIC,9,41,110,43
|
|
||||||
LTEXT "Y :",IDC_STATIC,17,62,12,8
|
|
||||||
LTEXT "0.",IDC_YEYE,31,62,66,8
|
|
||||||
LTEXT "Z :",IDC_STATIC,17,72,12,8
|
|
||||||
LTEXT "0.",IDC_ZEYE,31,72,66,8
|
|
||||||
LTEXT "X :",IDC_STATIC,15,98,12,8
|
|
||||||
LTEXT "0.",IDC_XAT,33,98,66,8
|
|
||||||
GROUPBOX "Target",IDC_STATIC,9,86,110,45
|
|
||||||
LTEXT "Y :",IDC_STATIC,15,109,12,8
|
|
||||||
LTEXT "0.",IDC_YAT,33,109,66,8
|
|
||||||
LTEXT "Z :",IDC_STATIC,15,120,12,8
|
|
||||||
LTEXT "0.",IDC_ZAT,33,120,66,8
|
|
||||||
LTEXT "Twist :",IDC_STATIC,11,137,22,8
|
|
||||||
LTEXT "0.",IDC_TWIST,35,137,77,8
|
|
||||||
END
|
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Version
|
// Version
|
||||||
@ -297,12 +244,6 @@ BEGIN
|
|||||||
ID_FILE_LOADGRID "Load Grid Files\nLoad Grid File"
|
ID_FILE_LOADGRID "Load Grid Files\nLoad Grid File"
|
||||||
END
|
END
|
||||||
|
|
||||||
STRINGTABLE
|
|
||||||
BEGIN
|
|
||||||
ID_VIEW_DISPLAYSTATUS "Show/Hide the display status Window\nShow/Hide the display status Window"
|
|
||||||
ID_WALK_WALKTHRU "Toggle Walkthru On/Off\nToggle Walkthru On/Off"
|
|
||||||
END
|
|
||||||
|
|
||||||
#endif // English (U.S.) resources
|
#endif // English (U.S.) resources
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|||||||
@ -45,10 +45,6 @@ CAnimationDoc::CAnimationDoc()
|
|||||||
{
|
{
|
||||||
// TODO: add one-time construction code here
|
// TODO: add one-time construction code here
|
||||||
|
|
||||||
static Standard_Integer StaticCount=1;
|
|
||||||
StaticCount++;
|
|
||||||
myCount = StaticCount;
|
|
||||||
|
|
||||||
Handle(Graphic3d_GraphicDriver) aGraphicDriver =
|
Handle(Graphic3d_GraphicDriver) aGraphicDriver =
|
||||||
((CAnimationApp*)AfxGetApp())->GetGraphicDriver();
|
((CAnimationApp*)AfxGetApp())->GetGraphicDriver();
|
||||||
|
|
||||||
@ -60,7 +56,6 @@ CAnimationDoc::CAnimationDoc()
|
|||||||
|
|
||||||
myDeviation = 0.0008;
|
myDeviation = 0.0008;
|
||||||
thread = 4;
|
thread = 4;
|
||||||
myAngle = 0;
|
|
||||||
|
|
||||||
BRep_Builder B;
|
BRep_Builder B;
|
||||||
TopoDS_Shape CrankArm;
|
TopoDS_Shape CrankArm;
|
||||||
@ -184,90 +179,6 @@ void CAnimationDoc::Dump(CDumpContext& dc) const
|
|||||||
//-----------------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
//-----------------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------------
|
||||||
void CAnimationDoc::DragEvent(const Standard_Integer x ,
|
|
||||||
const Standard_Integer y ,
|
|
||||||
const Standard_Integer TheState ,
|
|
||||||
const Handle(V3d_View)& aView )
|
|
||||||
{
|
|
||||||
|
|
||||||
// TheState == -1 button down
|
|
||||||
// TheState == 0 move
|
|
||||||
// TheState == 1 button up
|
|
||||||
|
|
||||||
static Standard_Integer theButtonDownX=0;
|
|
||||||
static Standard_Integer theButtonDownY=0;
|
|
||||||
|
|
||||||
if (TheState == -1)
|
|
||||||
{
|
|
||||||
theButtonDownX=x;
|
|
||||||
theButtonDownY=y;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TheState == 1)
|
|
||||||
myAISContext->Select (theButtonDownX, theButtonDownY, x, y, aView, Standard_True);
|
|
||||||
}
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
void CAnimationDoc::InputEvent(const Standard_Integer /*x*/,
|
|
||||||
const Standard_Integer /*y*/,
|
|
||||||
const Handle(V3d_View)& /*aView*/ )
|
|
||||||
{
|
|
||||||
myAISContext->Select (Standard_True);
|
|
||||||
}
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
void CAnimationDoc::MoveEvent(const Standard_Integer x ,
|
|
||||||
const Standard_Integer y ,
|
|
||||||
const Handle(V3d_View)& aView )
|
|
||||||
{
|
|
||||||
myAISContext->MoveTo (x, y, aView, Standard_True);
|
|
||||||
}
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
void CAnimationDoc::ShiftMoveEvent(const Standard_Integer x ,
|
|
||||||
const Standard_Integer y ,
|
|
||||||
const Handle(V3d_View)& aView )
|
|
||||||
{
|
|
||||||
myAISContext->MoveTo (x, y, aView, Standard_True);
|
|
||||||
}
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
void CAnimationDoc::ShiftDragEvent(const Standard_Integer x ,
|
|
||||||
const Standard_Integer y ,
|
|
||||||
const Standard_Integer TheState ,
|
|
||||||
const Handle(V3d_View)& aView )
|
|
||||||
{
|
|
||||||
static Standard_Integer theButtonDownX=0;
|
|
||||||
static Standard_Integer theButtonDownY=0;
|
|
||||||
|
|
||||||
if (TheState == -1)
|
|
||||||
{
|
|
||||||
theButtonDownX=x;
|
|
||||||
theButtonDownY=y;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TheState == 0)
|
|
||||||
myAISContext->ShiftSelect (theButtonDownX, theButtonDownY, x, y, aView, Standard_True);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
//-----------------------------------------------------------------------------------------
|
|
||||||
void CAnimationDoc::ShiftInputEvent(const Standard_Integer /*x*/,
|
|
||||||
const Standard_Integer /*y*/,
|
|
||||||
const Handle(V3d_View)& /*aView*/)
|
|
||||||
{
|
|
||||||
myAISContext->ShiftSelect (Standard_True);
|
|
||||||
}
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
@ -278,7 +189,7 @@ void CAnimationDoc::Popup(const Standard_Integer /*x*/,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAnimationDoc::OnMyTimer()
|
void CAnimationDoc::OnMyTimer (double theTimeSec)
|
||||||
{
|
{
|
||||||
// TODO: Add your message handler code here and/or call default
|
// TODO: Add your message handler code here and/or call default
|
||||||
|
|
||||||
@ -287,9 +198,7 @@ void CAnimationDoc::OnMyTimer()
|
|||||||
Standard_Real X;
|
Standard_Real X;
|
||||||
gp_Ax1 Ax1(gp_Pnt(0,0,0),gp_Vec(0,0,1));
|
gp_Ax1 Ax1(gp_Pnt(0,0,0),gp_Vec(0,0,1));
|
||||||
|
|
||||||
myAngle++;
|
angleA = thread * theTimeSec;
|
||||||
|
|
||||||
angleA = thread*myAngle*M_PI/180;
|
|
||||||
X = Sin(angleA)*3/8;
|
X = Sin(angleA)*3/8;
|
||||||
angleB = atan(X / Sqrt(-X * X + 1));
|
angleB = atan(X / Sqrt(-X * X + 1));
|
||||||
Standard_Real decal(25*0.6);
|
Standard_Real decal(25*0.6);
|
||||||
@ -308,8 +217,6 @@ void CAnimationDoc::OnMyTimer()
|
|||||||
gp_Trsf aPistonTrsf;
|
gp_Trsf aPistonTrsf;
|
||||||
aPistonTrsf.SetTranslation(gp_Vec(-3*decal*(1-Cos(angleA))-8*decal*(1-Cos(angleB)),0,0));
|
aPistonTrsf.SetTranslation(gp_Vec(-3*decal*(1-Cos(angleA))-8*decal*(1-Cos(angleB)),0,0));
|
||||||
myAISContext->SetLocation(myAisPiston,aPistonTrsf);
|
myAISContext->SetLocation(myAisPiston,aPistonTrsf);
|
||||||
|
|
||||||
myAISContext->UpdateCurrentViewer();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAnimationDoc::OnShading()
|
void CAnimationDoc::OnShading()
|
||||||
|
|||||||
@ -17,33 +17,6 @@
|
|||||||
class CAnimationDoc : public OCC_BaseDoc
|
class CAnimationDoc : public OCC_BaseDoc
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
void DragEvent (const Standard_Integer x,
|
|
||||||
const Standard_Integer y,
|
|
||||||
const Standard_Integer TheState,
|
|
||||||
const Handle(V3d_View)& aView);
|
|
||||||
|
|
||||||
void InputEvent (const Standard_Integer x,
|
|
||||||
const Standard_Integer y,
|
|
||||||
const Handle(V3d_View)& aView);
|
|
||||||
|
|
||||||
void MoveEvent (const Standard_Integer x,
|
|
||||||
const Standard_Integer y,
|
|
||||||
const Handle(V3d_View)& aView);
|
|
||||||
|
|
||||||
void ShiftMoveEvent (const Standard_Integer x,
|
|
||||||
const Standard_Integer y,
|
|
||||||
const Handle(V3d_View)& aView);
|
|
||||||
|
|
||||||
void ShiftDragEvent (const Standard_Integer x,
|
|
||||||
const Standard_Integer y,
|
|
||||||
const Standard_Integer TheState,
|
|
||||||
const Handle(V3d_View)& aView);
|
|
||||||
|
|
||||||
void ShiftInputEvent (const Standard_Integer x,
|
|
||||||
const Standard_Integer y,
|
|
||||||
const Handle(V3d_View)& aView);
|
|
||||||
|
|
||||||
void Popup (const Standard_Integer x,
|
void Popup (const Standard_Integer x,
|
||||||
const Standard_Integer y,
|
const Standard_Integer y,
|
||||||
const Handle(V3d_View)& aView);
|
const Handle(V3d_View)& aView);
|
||||||
@ -78,11 +51,9 @@ private:
|
|||||||
Handle(AIS_Shape) myAisEngineBlock ;
|
Handle(AIS_Shape) myAisEngineBlock ;
|
||||||
|
|
||||||
Standard_Real myDeviation;
|
Standard_Real myDeviation;
|
||||||
Standard_Integer myAngle;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void OnMyTimer();
|
void OnMyTimer (double theTimeSec);
|
||||||
Standard_Integer myCount;
|
|
||||||
Standard_Integer thread;
|
Standard_Integer thread;
|
||||||
double m_Xmin, m_Ymin, m_Zmin, m_Xmax, m_Ymax, m_Zmax;
|
double m_Xmin, m_Ymin, m_Zmin, m_Xmax, m_Ymax, m_Zmax;
|
||||||
BOOL m_bIsGridLoaded;
|
BOOL m_bIsGridLoaded;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -9,10 +9,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#endif // _MSC_VER >= 1000
|
#endif // _MSC_VER >= 1000
|
||||||
|
|
||||||
#include "Tune.h"
|
|
||||||
#include "AnimationDoc.h"
|
#include "AnimationDoc.h"
|
||||||
#include "..\..\Common\res\OCC_Resource.h"
|
#include "..\..\Common\res\OCC_Resource.h"
|
||||||
|
|
||||||
|
#include <AIS_AnimationTimer.hxx>
|
||||||
|
#include <AIS_ViewController.hxx>
|
||||||
|
|
||||||
class AIS_RubberBand;
|
class AIS_RubberBand;
|
||||||
|
|
||||||
enum View3D_CurrentAction {
|
enum View3D_CurrentAction {
|
||||||
@ -26,7 +28,7 @@ enum View3D_CurrentAction {
|
|||||||
CurrentAction3d_Turn
|
CurrentAction3d_Turn
|
||||||
};
|
};
|
||||||
|
|
||||||
class CAnimationView3D : public CView
|
class CAnimationView3D : public CView, public AIS_ViewController
|
||||||
{
|
{
|
||||||
protected: // create from serialization only
|
protected: // create from serialization only
|
||||||
CAnimationView3D();
|
CAnimationView3D();
|
||||||
@ -58,20 +60,10 @@ public:
|
|||||||
virtual void AssertValid() const;
|
virtual void AssertValid() const;
|
||||||
virtual void Dump(CDumpContext& dc) const;
|
virtual void Dump(CDumpContext& dc) const;
|
||||||
#endif
|
#endif
|
||||||
void SetDimensions ();
|
|
||||||
void ReloadData();
|
|
||||||
CTune m_Tune;
|
|
||||||
void SetFocal (double theFocus, double theAngle);
|
|
||||||
void Fly (int x , int y);
|
|
||||||
void Turn (int x , int y);
|
|
||||||
void Roll (int x , int y);
|
|
||||||
void Twist (int x , int y);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
double m_dAngle;
|
double m_dAngle;
|
||||||
BOOL m_bShift;
|
BOOL m_bShift;
|
||||||
int m_cx , m_cy ;
|
|
||||||
int m_curx , m_cury ;
|
|
||||||
|
|
||||||
// Generated message map functions
|
// Generated message map functions
|
||||||
protected:
|
protected:
|
||||||
@ -94,6 +86,7 @@ protected:
|
|||||||
afx_msg void OnSize(UINT nType, int cx, int cy);
|
afx_msg void OnSize(UINT nType, int cx, int cy);
|
||||||
afx_msg void OnBUTTONZoomProg();
|
afx_msg void OnBUTTONZoomProg();
|
||||||
afx_msg void OnBUTTONZoomWin();
|
afx_msg void OnBUTTONZoomWin();
|
||||||
|
afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint point);
|
||||||
afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
|
afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
|
||||||
afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
|
afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
|
||||||
afx_msg void OnMButtonDown(UINT nFlags, CPoint point);
|
afx_msg void OnMButtonDown(UINT nFlags, CPoint point);
|
||||||
@ -110,15 +103,11 @@ protected:
|
|||||||
afx_msg void OnUpdateBUTTONRot(CCmdUI* pCmdUI);
|
afx_msg void OnUpdateBUTTONRot(CCmdUI* pCmdUI);
|
||||||
|
|
||||||
afx_msg void OnChangeBackground();
|
afx_msg void OnChangeBackground();
|
||||||
afx_msg void OnTimer(UINT_PTR nIDEvent);
|
|
||||||
|
|
||||||
afx_msg void OnSensitivity();
|
|
||||||
afx_msg void OnBUTTONFly();
|
afx_msg void OnBUTTONFly();
|
||||||
afx_msg void OnBUTTONTurn();
|
afx_msg void OnBUTTONTurn();
|
||||||
afx_msg void OnUpdateBUTTONFly(CCmdUI* pCmdUI);
|
afx_msg void OnUpdateBUTTONFly(CCmdUI* pCmdUI);
|
||||||
afx_msg void OnUpdateBUTTONTurn(CCmdUI* pCmdUI);
|
afx_msg void OnUpdateBUTTONTurn(CCmdUI* pCmdUI);
|
||||||
afx_msg void OnViewDisplaystatus();
|
|
||||||
afx_msg void OnUpdateViewDisplaystatus(CCmdUI* pCmdUI);
|
|
||||||
//}}AFX_MSG
|
//}}AFX_MSG
|
||||||
|
|
||||||
public :
|
public :
|
||||||
@ -131,26 +120,44 @@ private:
|
|||||||
Handle(V3d_View) myView;
|
Handle(V3d_View) myView;
|
||||||
public:
|
public:
|
||||||
Handle(V3d_View)& GetView() { return myView;};
|
Handle(V3d_View)& GetView() { return myView;};
|
||||||
void DisplayTuneDialog();
|
|
||||||
|
//! Request view redrawing.
|
||||||
|
void update3dView();
|
||||||
|
|
||||||
|
//! Flush events and redraw view.
|
||||||
|
void redraw3dView();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
//! Handle view redraw.
|
||||||
|
virtual void handleViewRedraw (const Handle(AIS_InteractiveContext)& theCtx,
|
||||||
|
const Handle(V3d_View)& theView) Standard_OVERRIDE;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
//! Setup mouse gestures.
|
||||||
|
void defineMouseGestures();
|
||||||
|
|
||||||
|
//! Get current action.
|
||||||
|
View3D_CurrentAction getCurrentAction() const { return myCurrentMode; }
|
||||||
|
|
||||||
|
//! Set current action.
|
||||||
|
void setCurrentAction (View3D_CurrentAction theAction)
|
||||||
|
{
|
||||||
|
myCurrentMode = theAction;
|
||||||
|
defineMouseGestures();
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Standard_Integer myXmin;
|
AIS_AnimationTimer myAnimTimer;
|
||||||
Standard_Integer myYmin;
|
AIS_MouseGestureMap myDefaultGestures;
|
||||||
Standard_Integer myXmax;
|
Graphic3d_Vec2i myClickPos;
|
||||||
Standard_Integer myYmax;
|
|
||||||
Standard_Real myCurZoom;
|
Standard_Real myCurZoom;
|
||||||
Standard_Boolean myHlrModeIsOn;
|
Standard_Boolean myHlrModeIsOn;
|
||||||
|
Standard_Boolean myIsTurnStarted;
|
||||||
|
unsigned int myUpdateRequests; //!< counter for unhandled update requests
|
||||||
|
|
||||||
View3D_CurrentAction myCurrentMode;
|
View3D_CurrentAction myCurrentMode;
|
||||||
double m_Atx , m_Aty , m_Atz ;
|
|
||||||
double m_Eyex , m_Eyey , m_Eyez ;
|
|
||||||
double m_FlySens ;
|
|
||||||
double m_TurnSens ;
|
|
||||||
double m_Focus ;
|
|
||||||
|
|
||||||
private:
|
|
||||||
Handle(AIS_RubberBand) myRect; //!< Rubber rectangle for selection
|
|
||||||
void DrawRectangle (Standard_Integer theMinX, Standard_Integer theMinY, Standard_Integer theMaxX, Standard_Integer theMaxY,
|
|
||||||
Standard_Boolean theToDraw, Aspect_TypeOfLine theLineType = Aspect_TOL_SOLID);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef _DEBUG // debug version in AnimationView.cpp
|
#ifndef _DEBUG // debug version in AnimationView.cpp
|
||||||
|
|||||||
@ -1,81 +0,0 @@
|
|||||||
// Sensitivity.cpp : implementation file
|
|
||||||
//
|
|
||||||
|
|
||||||
#include "stdafx.h"
|
|
||||||
|
|
||||||
#include "Sensitivity.h"
|
|
||||||
|
|
||||||
#include "AnimationApp.h"
|
|
||||||
|
|
||||||
#ifdef _DEBUG
|
|
||||||
#define new DEBUG_NEW
|
|
||||||
#undef THIS_FILE
|
|
||||||
static char THIS_FILE[] = __FILE__;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// CSensitivity dialog
|
|
||||||
|
|
||||||
|
|
||||||
CSensitivity::CSensitivity(CWnd* pParent /*=NULL*/)
|
|
||||||
: CDialog(CSensitivity::IDD, pParent)
|
|
||||||
{
|
|
||||||
//{{AFX_DATA_INIT(CSensitivity)
|
|
||||||
m_SensFly = 0.0;
|
|
||||||
m_SensTurn = 0.0;
|
|
||||||
//}}AFX_DATA_INIT
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void CSensitivity::DoDataExchange(CDataExchange* pDX)
|
|
||||||
{
|
|
||||||
CDialog::DoDataExchange(pDX);
|
|
||||||
//{{AFX_DATA_MAP(CSensitivity)
|
|
||||||
DDX_Text(pDX, IDC_FLY, m_SensFly);
|
|
||||||
DDV_MinMaxDouble(pDX, m_SensFly, 0., 10000000.);
|
|
||||||
DDX_Text(pDX, IDC_TURN, m_SensTurn);
|
|
||||||
DDV_MinMaxDouble(pDX, m_SensTurn, 0., 10000000.);
|
|
||||||
//}}AFX_DATA_MAP
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
BEGIN_MESSAGE_MAP(CSensitivity, CDialog)
|
|
||||||
//{{AFX_MSG_MAP(CSensitivity)
|
|
||||||
ON_NOTIFY(UDN_DELTAPOS, IDC_SPIN1, OnDeltaposSpin1)
|
|
||||||
ON_NOTIFY(UDN_DELTAPOS, IDC_SPIN2, OnDeltaposSpin2)
|
|
||||||
//}}AFX_MSG_MAP
|
|
||||||
END_MESSAGE_MAP()
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// CSensitivity message handlers
|
|
||||||
|
|
||||||
void CSensitivity::OnDeltaposSpin1(NMHDR* pNMHDR, LRESULT* pResult)
|
|
||||||
{
|
|
||||||
NM_UPDOWN* pNMUpDown = (NM_UPDOWN*)pNMHDR;
|
|
||||||
// TODO: Add your control notification handler code here
|
|
||||||
if ( pNMUpDown->iDelta > 0 ) {
|
|
||||||
m_SensFly /= 1.1 ;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
m_SensFly *= 1.1 ;
|
|
||||||
}
|
|
||||||
UpdateData ( FALSE ) ;
|
|
||||||
|
|
||||||
|
|
||||||
*pResult = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CSensitivity::OnDeltaposSpin2(NMHDR* pNMHDR, LRESULT* pResult)
|
|
||||||
{
|
|
||||||
NM_UPDOWN* pNMUpDown = (NM_UPDOWN*)pNMHDR;
|
|
||||||
// TODO: Add your control notification handler code here
|
|
||||||
if ( pNMUpDown->iDelta > 0 ) {
|
|
||||||
m_SensTurn /= 1.1 ;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
m_SensTurn *= 1.1 ;
|
|
||||||
}
|
|
||||||
UpdateData ( FALSE ) ;
|
|
||||||
|
|
||||||
*pResult = 0;
|
|
||||||
}
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
#if !defined(AFX_SENSITIVITY_H__F3897393_7D55_11D2_8E5F_0800369C8A03__INCLUDED_)
|
|
||||||
#define AFX_SENSITIVITY_H__F3897393_7D55_11D2_8E5F_0800369C8A03__INCLUDED_
|
|
||||||
|
|
||||||
#if _MSC_VER >= 1000
|
|
||||||
#pragma once
|
|
||||||
#endif // _MSC_VER >= 1000
|
|
||||||
// Sensitivity.h : header file
|
|
||||||
//
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// CSensitivity dialog
|
|
||||||
|
|
||||||
class CSensitivity : public CDialog
|
|
||||||
{
|
|
||||||
// Construction
|
|
||||||
public:
|
|
||||||
CSensitivity(CWnd* pParent = NULL); // standard constructor
|
|
||||||
|
|
||||||
// Dialog Data
|
|
||||||
//{{AFX_DATA(CSensitivity)
|
|
||||||
enum { IDD = IDD_SENS };
|
|
||||||
double m_SensFly;
|
|
||||||
double m_SensTurn;
|
|
||||||
//}}AFX_DATA
|
|
||||||
|
|
||||||
|
|
||||||
// Overrides
|
|
||||||
// ClassWizard generated virtual function overrides
|
|
||||||
//{{AFX_VIRTUAL(CSensitivity)
|
|
||||||
protected:
|
|
||||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
|
||||||
//}}AFX_VIRTUAL
|
|
||||||
|
|
||||||
// Implementation
|
|
||||||
protected:
|
|
||||||
|
|
||||||
// Generated message map functions
|
|
||||||
//{{AFX_MSG(CSensitivity)
|
|
||||||
afx_msg void OnDeltaposSpin1(NMHDR* pNMHDR, LRESULT* pResult);
|
|
||||||
afx_msg void OnDeltaposSpin2(NMHDR* pNMHDR, LRESULT* pResult);
|
|
||||||
//}}AFX_MSG
|
|
||||||
DECLARE_MESSAGE_MAP()
|
|
||||||
};
|
|
||||||
|
|
||||||
//{{AFX_INSERT_LOCATION}}
|
|
||||||
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
|
|
||||||
|
|
||||||
#endif // !defined(AFX_SENSITIVITY_H__F3897393_7D55_11D2_8E5F_0800369C8A03__INCLUDED_)
|
|
||||||
@ -1,140 +0,0 @@
|
|||||||
// Tune.cpp : implementation file
|
|
||||||
//
|
|
||||||
|
|
||||||
#include "stdafx.h"
|
|
||||||
|
|
||||||
#include "Tune.h"
|
|
||||||
|
|
||||||
#include "AnimationApp.h"
|
|
||||||
#include "Animationdoc.h"
|
|
||||||
#include "AnimationView3D.h"
|
|
||||||
|
|
||||||
#ifdef _DEBUG
|
|
||||||
#define new DEBUG_NEW
|
|
||||||
#undef THIS_FILE
|
|
||||||
static char THIS_FILE[] = __FILE__;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// CTune dialog
|
|
||||||
|
|
||||||
|
|
||||||
CTune::CTune(CWnd* pParent /*=NULL*/)
|
|
||||||
: CDialog(CTune::IDD, pParent)
|
|
||||||
{
|
|
||||||
//{{AFX_DATA_INIT(CTune)
|
|
||||||
m_dAngle = 0.0;
|
|
||||||
m_dFocus = 0.0;
|
|
||||||
//}}AFX_DATA_INIT
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void CTune::DoDataExchange(CDataExchange* pDX)
|
|
||||||
{
|
|
||||||
CDialog::DoDataExchange(pDX);
|
|
||||||
//{{AFX_DATA_MAP(CTune)
|
|
||||||
DDX_Text(pDX, IDC_APPERTURE, m_dAngle);
|
|
||||||
DDV_MinMaxDouble(pDX, m_dAngle, 5., 179.);
|
|
||||||
DDX_Text(pDX, IDC_FOCDIST, m_dFocus);
|
|
||||||
DDV_MinMaxDouble(pDX, m_dFocus, 1.e-003, 10000000.);
|
|
||||||
//}}AFX_DATA_MAP
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
BEGIN_MESSAGE_MAP(CTune, CDialog)
|
|
||||||
//{{AFX_MSG_MAP(CTune)
|
|
||||||
ON_NOTIFY(UDN_DELTAPOS, IDC_SPINANG, OnDeltaposSpinang)
|
|
||||||
ON_NOTIFY(UDN_DELTAPOS, IDC_SPINFOC, OnDeltaposSpinfoc)
|
|
||||||
ON_EN_CHANGE(IDC_APPERTURE, OnChangeApperture)
|
|
||||||
ON_EN_CHANGE(IDC_FOCDIST, OnChangeFocdist)
|
|
||||||
//}}AFX_MSG_MAP
|
|
||||||
END_MESSAGE_MAP()
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// CTune message handlers
|
|
||||||
|
|
||||||
void CTune::OnDeltaposSpinang(NMHDR* pNMHDR, LRESULT* pResult)
|
|
||||||
{
|
|
||||||
NM_UPDOWN* pNMUpDown = (NM_UPDOWN*)pNMHDR;
|
|
||||||
// TODO: Add your control notification handler code here
|
|
||||||
|
|
||||||
if ( pNMUpDown->iDelta > 0 ) {
|
|
||||||
if ( m_dAngle > 2. )
|
|
||||||
m_dAngle -= 1. ;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if ( m_dAngle < 178. )
|
|
||||||
m_dAngle += 1 ;
|
|
||||||
}
|
|
||||||
UpdateData ( FALSE ) ;
|
|
||||||
|
|
||||||
OnChangeApperture() ;
|
|
||||||
|
|
||||||
*pResult = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CTune::OnDeltaposSpinfoc(NMHDR* pNMHDR, LRESULT* pResult)
|
|
||||||
{
|
|
||||||
NM_UPDOWN* pNMUpDown = (NM_UPDOWN*)pNMHDR;
|
|
||||||
// TODO: Add your control notification handler code here
|
|
||||||
|
|
||||||
if ( pNMUpDown->iDelta > 0 ) {
|
|
||||||
m_dFocus /= 1.1 ;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
m_dFocus *= 1.1 ;
|
|
||||||
}
|
|
||||||
UpdateData ( FALSE ) ;
|
|
||||||
|
|
||||||
OnChangeFocdist() ;
|
|
||||||
|
|
||||||
*pResult = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CTune::OnChangeApperture()
|
|
||||||
{
|
|
||||||
// TODO: If this is a RICHEDIT control, the control will not
|
|
||||||
// send this notification unless you override the CDialog::OnInitDialog()
|
|
||||||
// function to send the EM_SETEVENTMASK message to the control
|
|
||||||
// with the ENM_CHANGE flag ORed into the lParam mask.
|
|
||||||
|
|
||||||
// TODO: Add your control notification handler code here
|
|
||||||
|
|
||||||
( (CAnimationView3D *) m_pView) ->SetFocal ( m_dFocus , m_dAngle ) ;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CTune::OnChangeFocdist()
|
|
||||||
{
|
|
||||||
// TODO: If this is a RICHEDIT control, the control will not
|
|
||||||
// send this notification unless you override the CDialog::OnInitDialog()
|
|
||||||
// function to send the EM_SETEVENTMASK message to the control
|
|
||||||
// with the ENM_CHANGE flag ORed into the lParam mask.
|
|
||||||
|
|
||||||
// TODO: Add your control notification handler code here
|
|
||||||
|
|
||||||
( (CAnimationView3D *) m_pView) ->SetFocal ( m_dFocus , m_dAngle ) ;
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOL CTune::OnCommand(WPARAM wParam, LPARAM lParam)
|
|
||||||
{
|
|
||||||
// TODO: Add your specialized code here and/or call the base class
|
|
||||||
|
|
||||||
return CDialog::OnCommand(wParam, lParam);
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOL CTune::OnInitDialog()
|
|
||||||
{
|
|
||||||
CDialog::OnInitDialog();
|
|
||||||
|
|
||||||
// TODO: Add extra initialization here
|
|
||||||
|
|
||||||
return TRUE; // return TRUE unless you set the focus to a control
|
|
||||||
// EXCEPTION: OCX Property Pages should return FALSE
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOL CTune::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
|
|
||||||
{
|
|
||||||
// TODO: Add your specialized code here and/or call the base class
|
|
||||||
|
|
||||||
return CDialog::OnNotify(wParam, lParam, pResult);
|
|
||||||
}
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
#if !defined(AFX_TUNE_H__D7E45B53_AAD2_11D2_9E97_0800362A0F04__INCLUDED_)
|
|
||||||
#define AFX_TUNE_H__D7E45B53_AAD2_11D2_9E97_0800362A0F04__INCLUDED_
|
|
||||||
|
|
||||||
#if _MSC_VER >= 1000
|
|
||||||
#pragma once
|
|
||||||
#endif // _MSC_VER >= 1000
|
|
||||||
// Tune.h : header file
|
|
||||||
//
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// CTune dialog
|
|
||||||
|
|
||||||
class CTune : public CDialog
|
|
||||||
{
|
|
||||||
// Construction
|
|
||||||
public:
|
|
||||||
CTune(CWnd* pParent = NULL); // standard constructor
|
|
||||||
CView * m_pView;
|
|
||||||
|
|
||||||
// Dialog Data
|
|
||||||
//{{AFX_DATA(CTune)
|
|
||||||
enum { IDD = IDD_TUNE };
|
|
||||||
double m_dAngle;
|
|
||||||
double m_dFocus;
|
|
||||||
//}}AFX_DATA
|
|
||||||
|
|
||||||
|
|
||||||
// Overrides
|
|
||||||
// ClassWizard generated virtual function overrides
|
|
||||||
//{{AFX_VIRTUAL(CTune)
|
|
||||||
protected:
|
|
||||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
|
||||||
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
|
|
||||||
virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
|
|
||||||
//}}AFX_VIRTUAL
|
|
||||||
|
|
||||||
// Implementation
|
|
||||||
protected:
|
|
||||||
|
|
||||||
// Generated message map functions
|
|
||||||
//{{AFX_MSG(CTune)
|
|
||||||
afx_msg void OnDeltaposSpinang(NMHDR* pNMHDR, LRESULT* pResult);
|
|
||||||
afx_msg void OnDeltaposSpinfoc(NMHDR* pNMHDR, LRESULT* pResult);
|
|
||||||
afx_msg void OnChangeApperture();
|
|
||||||
afx_msg void OnChangeFocdist();
|
|
||||||
virtual BOOL OnInitDialog();
|
|
||||||
//}}AFX_MSG
|
|
||||||
DECLARE_MESSAGE_MAP()
|
|
||||||
};
|
|
||||||
|
|
||||||
//{{AFX_INSERT_LOCATION}}
|
|
||||||
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
|
|
||||||
|
|
||||||
#endif // !defined(AFX_TUNE_H__D7E45B53_AAD2_11D2_9E97_0800362A0F04__INCLUDED_)
|
|
||||||
Loading…
x
Reference in New Issue
Block a user