[simspark-cvs] simspark/contrib/rsgedit kinematicframe.cpp, 1.1, 1.2 kinematicframe.h, 1.1, 1.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/rsgedit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28263

Modified Files:
	kinematicframe.cpp kinematicframe.h 
Log Message:
- refactored joint control creation into kinematicFrame::AddJointControl()

Index: kinematicframe.h
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/kinematicframe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kinematicframe.h	8 Jul 2007 13:44:17 -0000	1.1
--- kinematicframe.h	15 Jul 2007 10:29:53 -0000	1.2
***************
*** 25,28 ****
--- 25,32 ----
  #include <zeitgeist/leaf.h>
  
+ namespace oxygen
+ {
+     class Joint;
+ }
  
  class kinematicFrame: public wxFrame {
***************
*** 70,73 ****
--- 74,78 ----
  
  protected:
+     void AddJointControl(boost::shared_ptr<oxygen::Joint> joint, int axis);
      void OnSliderChanged(wxCommandEvent& event);
      void OnScrollChanged(wxScrollEvent& event);

Index: kinematicframe.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/kinematicframe.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kinematicframe.cpp	8 Jul 2007 13:44:17 -0000	1.1
--- kinematicframe.cpp	15 Jul 2007 10:29:53 -0000	1.2
***************
*** 73,76 ****
--- 73,107 ----
  }
  
+ void kinematicFrame::AddJointControl(shared_ptr<Joint> joint, int axis)
+ {
+     wxSizer* sizer = mCtrScrollWnd->GetSizer();
+     if (
+         (sizer == 0) ||
+         (joint.get() == 0)
+         )
+         {
+             assert(false);
+             return;
+         }
+ 
+     wxString path = joint->GetFullPath();
+     wxStaticText* text =
+         new wxStaticText( mCtrScrollWnd, wxID_ANY, path, wxDefaultPosition, wxDefaultSize, 0 );
+ 
+     sizer->Add(text, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
+ 
+     wxSlider* slider =
+         new wxSlider( mCtrScrollWnd, wxID_ANY, 0, -179, 179, wxDefaultPosition, wxSize(250,-1),
+                                      wxSL_HORIZONTAL|wxSL_AUTOTICKS|wxSL_LABELS );
+     sizer->Add(slider, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+ 
+     JointControl entry;
+     entry.type = joint->GetType();
+     entry.axis = axis;
+     entry.joint = joint;
+ 
+     mJoints[slider] = entry;
+ }
+ 
  void kinematicFrame::UpdateCached()
  {
***************
*** 113,131 ****
          {
              shared_ptr<Joint> joint = shared_static_cast<Joint>(*iter);
! 
!             wxString path = joint->GetFullPath();
!             wxStaticText* text = new wxStaticText( mCtrScrollWnd, wxID_ANY, path, wxDefaultPosition, wxDefaultSize, 0 );
!             sizer->Add(text, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
! 
!             wxSlider* slider = new wxSlider( mCtrScrollWnd, wxID_ANY, 0, -179, 179, wxDefaultPosition, wxSize(250,-1),
!                                              wxSL_HORIZONTAL|wxSL_AUTOTICKS|wxSL_LABELS );
!             sizer->Add(slider, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
! 
!             JointControl entry;
!             entry.type = joint->GetType();
!             entry.axis = 0;
!             entry.joint = joint;
! 
!             mJoints[slider] = entry;
          }
  
--- 144,148 ----
          {
              shared_ptr<Joint> joint = shared_static_cast<Joint>(*iter);
!             AddJointControl(joint, 0);
          }