summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorleo2006-02-23 19:17:47 +0000
committerleo2006-02-23 19:17:47 +0000
commit1f09315ee9d57c00fa398929c14d02ad8768cb59 (patch)
treee6cd3f1e6b311c9eb0e64471b4b5a5b16f88c31b /common
parentf3e2613e0adb1a04acd883dcf3aebac8769cbc5b (diff)
Added check marks to the status bar snap menu.
git-svn-id: http://svn.leocad.org/trunk@492 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'common')
-rw-r--r--common/project.cpp18
-rw-r--r--common/project.h1
2 files changed, 13 insertions, 6 deletions
diff --git a/common/project.cpp b/common/project.cpp
index 84556f3..7c402b1 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -7059,14 +7059,20 @@ void Project::StartTracking(int mode)
FileSave(m_pTrackFile, true);
}
-void Project::GetSnapDistance(float* SnapXY, float* SnapZ) const
+void Project::GetSnapIndex(int* SnapXY, int* SnapZ) const
{
- int SXY = (m_nMoveSnap & 0xff);
- int SZ = ((m_nMoveSnap >> 8) & 0xff);
+ *SnapXY = (m_nMoveSnap & 0xff);
+ *SnapZ = ((m_nMoveSnap >> 8) & 0xff);
+}
+void Project::GetSnapDistance(float* SnapXY, float* SnapZ) const
+{
const float SnapXYTable[] = { 0.01f, 0.04f, 0.2f, 0.32f, 0.4f, 0.8f, 1.6f, 2.4f, 3.2f, 6.4f };
const float SnapZTable[] = { 0.01f, 0.04f, 0.2f, 0.32f, 0.4f, 0.8f, 0.96f, 1.92f, 3.84f, 7.68f };
+ int SXY, SZ;
+ GetSnapIndex(&SXY, &SZ);
+
SXY = min(SXY, 9);
SZ = min(SZ, 9);
@@ -7087,12 +7093,12 @@ void Project::GetSnapDistanceText(char* SnapXY, char* SnapZ) const
}
else
{
- int SXY = (m_nMoveSnap & 0xff);
- int SZ = ((m_nMoveSnap >> 8) & 0xff);
-
const char* SnapXYText[] = { "0", "1/20S", "1/4S", "1F", "1/2S", "1S", "2S", "3S", "4S", "8S" };
const char* SnapZText[] = { "0", "1/20S", "1/4S", "1F", "1/2S", "1S", "1B", "2B", "4B", "8B" };
+ int SXY, SZ;
+ GetSnapIndex(&SXY, &SZ);
+
SXY = min(SXY, 9);
SZ = min(SZ, 9);
diff --git a/common/project.h b/common/project.h
index dd495c6..614a584 100644
--- a/common/project.h
+++ b/common/project.h
@@ -83,6 +83,7 @@ public:
{ return m_nCurAction; }
int GetOverlayMode() const
{ return m_OverlayMode; }
+ void GetSnapIndex(int* SnapXY, int* SnapZ) const;
void GetSnapDistance(float* SnapXY, float* SnapZ) const;
void GetSnapDistanceText(char* SnapXY, char* SnapZ) const;
Camera* GetCamera(int i);