[Jsbsimcommander-cvslogs] src/gui ResultShow_Diag.cpp, 1.1.1.1, 1.2 actuator_dlg.cpp, 1.3, 1.4 sensor.cpp, 1.11, 1.12 sensor_dlg.cpp, 1.5, 1.6

[Matthew G. <mat...@us...>]

Update of /cvsroot/jsbsimcommander/src/gui
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18171

Modified Files:
	ResultShow_Diag.cpp actuator_dlg.cpp sensor.cpp sensor_dlg.cpp 
Log Message:
Update for the wxWidgets built in unicode mode

Index: ResultShow_Diag.cpp
===================================================================
RCS file: /cvsroot/jsbsimcommander/src/gui/ResultShow_Diag.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ResultShow_Diag.cpp	30 Apr 2006 23:38:48 -0000	1.1.1.1
--- ResultShow_Diag.cpp	27 Sep 2007 10:46:49 -0000	1.2
***************
*** 28,31 ****
--- 28,32 ----
  #include <wx/wfstream.h>
  #include <wx/mstream.h>
+ #include <wx/sstream.h>
  #include <wx/txtstrm.h>
  
***************
*** 34,38 ****
  wxArrayString readStrsfromString(const wxString & str)
  {
!   wxMemoryInputStream mis(str, str.Length());
    wxTextInputStream tis(mis);
    tis.SetStringSeparators(wxT("\t,"));
--- 35,39 ----
  wxArrayString readStrsfromString(const wxString & str)
  {
!   wxStringInputStream mis(str);
    wxTextInputStream tis(mis);
    tis.SetStringSeparators(wxT("\t,"));
***************
*** 57,61 ****
  void readNumsfromString(std::vector<double> &list, const wxString & str)
  {
!   wxMemoryInputStream mis(str, str.Length());
    wxTextInputStream tis(mis);
    tis.SetStringSeparators(wxT("\t, "));
--- 58,62 ----
  void readNumsfromString(std::vector<double> &list, const wxString & str)
  {
!   wxStringInputStream mis(str);
    wxTextInputStream tis(mis);
    tis.SetStringSeparators(wxT("\t, "));

Index: sensor.cpp
===================================================================
RCS file: /cvsroot/jsbsimcommander/src/gui/sensor.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sensor.cpp	28 Feb 2007 04:48:44 -0000	1.11
--- sensor.cpp	27 Sep 2007 10:46:49 -0000	1.12
***************
*** 60,64 ****
    bits = 0;
    quantized = 0;
!   quant_property = "";
    max=0;
    min=0;
--- 60,64 ----
    bits = 0;
    quantized = 0;
!   quant_property = wxEmptyString;
    max=0;
    min=0;
***************
*** 195,201 ****
        stream << Pre << wxT("<quantization>") << endl;
      }
!     stream << Pre << wxT("  <bits>") << bits << "</bits>" << endl;
!     stream << Pre << wxT("  <min>") << min << "</min>" << endl;
!     stream << Pre << wxT("  <max>") << min << "</max>" << endl;
      if (!quant_property.empty()) {
        stream << Pre << wxT("</quantization>") << endl;
--- 195,201 ----
        stream << Pre << wxT("<quantization>") << endl;
      }
!     stream << Pre << wxT("  <bits>") << bits << wxT("</bits>") << endl;
!     stream << Pre << wxT("  <min>") << min << wxT("</min>") << endl;
!     stream << Pre << wxT("  <max>") << min << wxT("</max>") << endl;
      if (!quant_property.empty()) {
        stream << Pre << wxT("</quantization>") << endl;
***************
*** 224,231 ****
  * ImportXML ====================================================================
  
! <sensor name=”name” rate_group=”name”>
    <input> property </input>
    <lag> number </lag>
!   <noise variation=”PERCENT|ABSOLUTE”> number </noise>
    <quantization name="name">
      <bits> number </bits>
--- 224,231 ----
  * ImportXML ====================================================================
  
! <sensor name=?name? rate_group=?name?>
    <input> property </input>
    <lag> number </lag>
!   <noise variation=?PERCENT|ABSOLUTE?> number </noise>
    <quantization name="name">
      <bits> number </bits>
***************
*** 245,249 ****
    JSBSim::Element* quantization_element = element->FindElement("quantization");
    if ( quantization_element) {
!     quant_property = quantization_element->GetAttributeValue("name");
      if ( quantization_element->FindElement("bits") ) {
        bits = (int)quantization_element->FindElementValueAsNumber("bits");
--- 245,249 ----
    JSBSim::Element* quantization_element = element->FindElement("quantization");
    if ( quantization_element) {
!     quant_property = std2wxstr(quantization_element->GetAttributeValue("name"));
      if ( quantization_element->FindElement("bits") ) {
        bits = (int)quantization_element->FindElementValueAsNumber("bits");

Index: sensor_dlg.cpp
===================================================================
RCS file: /cvsroot/jsbsimcommander/src/gui/sensor_dlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sensor_dlg.cpp	14 Apr 2007 06:19:31 -0000	1.5
--- sensor_dlg.cpp	27 Sep 2007 10:46:49 -0000	1.6
***************
*** 382,394 ****
    
    radio_box_noise_type->SetSelection(g->GetNoiseType());
!   text_ctrl_2->SetValue("");   *text_ctrl_2 << g->GetNoise();
!   text_ctrl_lag->SetValue(""); *text_ctrl_lag << g->GetLag();
!   text_ctrl_4->SetValue("");   *text_ctrl_4 << g->GetDriftRate();
!   text_ctrl_4_1->SetValue(""); *text_ctrl_4_1 << g->GetBias();
!   text_ctrl_7->SetValue("");   *text_ctrl_7 << g->GetMax();
!   text_ctrl_6->SetValue("");   *text_ctrl_6 << g->GetMin();
    slider_1->SetValue(g->GetBits());
    //g->GetQuantized();
!   text_ctrl_5->SetValue("");   *text_ctrl_5 << g->GetQuantProperty();
  }
  
--- 382,394 ----
    
    radio_box_noise_type->SetSelection(g->GetNoiseType());
!   text_ctrl_2->SetValue(wxT(""));   *text_ctrl_2 << g->GetNoise();
!   text_ctrl_lag->SetValue(wxT("")); *text_ctrl_lag << g->GetLag();
!   text_ctrl_4->SetValue(wxT(""));   *text_ctrl_4 << g->GetDriftRate();
!   text_ctrl_4_1->SetValue(wxT("")); *text_ctrl_4_1 << g->GetBias();
!   text_ctrl_7->SetValue(wxT(""));   *text_ctrl_7 << g->GetMax();
!   text_ctrl_6->SetValue(wxT(""));   *text_ctrl_6 << g->GetMin();
    slider_1->SetValue(g->GetBits());
    //g->GetQuantized();
!   text_ctrl_5->SetValue(wxT(""));   *text_ctrl_5 << g->GetQuantProperty();
  }
  

Index: actuator_dlg.cpp
===================================================================
RCS file: /cvsroot/jsbsimcommander/src/gui/actuator_dlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** actuator_dlg.cpp	12 May 2007 20:46:29 -0000	1.3
--- actuator_dlg.cpp	27 Sep 2007 10:46:49 -0000	1.4
***************
*** 277,284 ****
    txtEd_OutputProperty->SetValue(g->GetOutputName());
  
!   txtEd_Lag->SetValue("");        *txtEd_Lag << g->GetLag();
!   txtEd_RateLimit->SetValue("");  *txtEd_RateLimit << g->GetRate_Limit();
!   txtEd_Hysteresis->SetValue(""); *txtEd_Hysteresis << g->GetHysteresis_Width();
!   txtEd_Bias->SetValue("");       *txtEd_Bias << g->GetBias();
  
    if (inputs.GetCount() > 0) {
--- 277,284 ----
    txtEd_OutputProperty->SetValue(g->GetOutputName());
  
!   txtEd_Lag->SetValue(wxT(""));        *txtEd_Lag << g->GetLag();
!   txtEd_RateLimit->SetValue(wxT(""));  *txtEd_RateLimit << g->GetRate_Limit();
!   txtEd_Hysteresis->SetValue(wxT("")); *txtEd_Hysteresis << g->GetHysteresis_Width();
!   txtEd_Bias->SetValue(wxT(""));       *txtEd_Bias << g->GetBias();
  
    if (inputs.GetCount() > 0) {