カメラシーケンスをデータだけ読み込んだ状態で使用しない機能を追加

diff --git a/Src/LibQtGeoViewerCore/Camera.cpp b/Src/LibQtGeoViewerCore/Camera.cpp
index 6b0b7c2..b0e917e 100644 (file)
--- a/Src/LibQtGeoViewerCore/Camera.cpp
+++ b/Src/LibQtGeoViewerCore/Camera.cpp
@@ -160,6 +160,8 @@ void Camera::SetViewportAndMatrix(void)
 
 void Camera::SetFrame(int frame)
 {
+       if (!m_EnableSeqence)
+               return;
        if (!m_SeqTrans.HasKey())
                return;
 

diff --git a/Src/LibQtGeoViewerCore/Camera.h b/Src/LibQtGeoViewerCore/Camera.h
index 17abe2b..2abbfd6 100644 (file)
--- a/Src/LibQtGeoViewerCore/Camera.h
+++ b/Src/LibQtGeoViewerCore/Camera.h
@@ -39,7 +39,8 @@ public:
        {
                m_Projection.m_Fovy = 45;
                m_ProjMode = PROJ_PERS;
-               m_CameraReverse= false;
+               m_CameraReverse = false;
+               m_EnableSeqence = true;
        }
 
        void Reset(void);
@@ -90,6 +91,7 @@ public:
        bool m_CameraReverse;
 
        geom::SeqTrans m_SeqTrans;
+       bool m_EnableSeqence;
        lm::vec3f m_SeqPos;
        lm::vec3f m_SeqUp;
        lm::vec3f m_SeqLook;

diff --git a/Src/QtGeoViewer/FormMain.cpp b/Src/QtGeoViewer/FormMain.cpp
index 1a35b17..92dcfa9 100644 (file)
--- a/Src/QtGeoViewer/FormMain.cpp
+++ b/Src/QtGeoViewer/FormMain.cpp
@@ -3725,3 +3725,8 @@ void FormMain::on_buttonClearCameraSeq_clicked()
        m_Scene.m_Camera.m_SeqTrans.Clear();
        ResetSequenceSliderRange();
 }
+
+void FormMain::on_checkEnableCamerSeq_toggled(bool checked)
+{
+       m_Scene.m_Camera.m_EnableSeqence = checked;
+}

diff --git a/Src/QtGeoViewer/FormMain.h b/Src/QtGeoViewer/FormMain.h
index c640a8b..f67a43f 100644 (file)
--- a/Src/QtGeoViewer/FormMain.h
+++ b/Src/QtGeoViewer/FormMain.h
@@ -476,8 +476,8 @@ private slots:
        void on_actionTextureNearest_toggled(bool b);
 
        void on_buttonLoadCameraSeq_clicked();
-
        void on_buttonClearCameraSeq_clicked();
+       void on_checkEnableCamerSeq_toggled(bool checked);
 
 private:
        Ui::FormMainClass ui;

diff --git a/Src/QtGeoViewer/FormMain.ui b/Src/QtGeoViewer/FormMain.ui
index ea4ab70..7a56765 100644 (file)
--- a/Src/QtGeoViewer/FormMain.ui
+++ b/Src/QtGeoViewer/FormMain.ui
@@ -1119,7 +1119,7 @@ border: 1px solid black;
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>33</height>
+         <height>0</height>
         </size>
        </property>
        <property name="title">
@@ -1195,7 +1195,7 @@ border: 1px solid black;
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>33</height>
+         <height>0</height>
         </size>
        </property>
        <property name="title">
@@ -1218,6 +1218,16 @@ border: 1px solid black;
          <number>1</number>
         </property>
         <item>
+         <widget class="QCheckBox" name="checkEnableCamerSeq">
+          <property name="text">
+           <string>EnableCameraSequence</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
          <layout class="QHBoxLayout" name="horizontalLayout_13">
           <item>
            <widget class="QPushButton" name="buttonLoadCameraSeq">
@@ -1238,6 +1248,7 @@ border: 1px solid black;
        </layout>
        <zorder>groupBox</zorder>
        <zorder></zorder>
+       <zorder>checkEnableCamerSeq</zorder>
       </widget>
      </item>
     </layout>