[dsa4-cvs] det/src/gui PersonenKomponenteGUIwx.h,1.24,1.25

[<vra...@us...>]

Update of /cvsroot/darkeyetool/det/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv13906

Modified Files:
	PersonenKomponenteGUIwx.h 
Log Message:
Schlechte Eigenschaften 5+ bei RKP

Index: PersonenKomponenteGUIwx.h
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/PersonenKomponenteGUIwx.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** PersonenKomponenteGUIwx.h	2 Jan 2004 20:53:24 -0000	1.24
--- PersonenKomponenteGUIwx.h	4 Jan 2004 00:02:50 -0000	1.25
***************
*** 166,174 ****
  	
  	bool showplusminus = false;
! 	//if (charakteristika_->GetSelection()!=-1)
! 	//  showplusminus = strings::BeginntMit(charakteristika_->GetStringSelection(), _t("Ritualkenntnis"));
  	
  	FindWindow(CHARPLUS)->Show(showplusminus);
  	FindWindow(CHARMINUS)->Show(showplusminus);
  	//@-node:<< VNT >>
  	//@nl
--- 166,182 ----
  	
  	bool showplusminus = false;
! 	if (charakteristika_->GetSelection()!=-1) {
! 	  std::string c = charakteristika_->GetStringSelection().c_str();
! 	  std::string auswahl;
! 	  for (DSA::Charakteristika::iterator i = objekt_->charakteristika_.begin(); i != objekt_->charakteristika_.end(); ++i)
! 	    if (i->second.Text() == c)
! 	      auswahl = i->first;
! 	
! 	  showplusminus = DSA::charakteristika()->Hole(auswahl).SchlechteEigenschaft();
! 	}
  	
  	FindWindow(CHARPLUS)->Show(showplusminus);
  	FindWindow(CHARMINUS)->Show(showplusminus);
+ 	//@nonl
  	//@-node:<< VNT >>
  	//@nl
***************
*** 1651,1654 ****
--- 1659,1674 ----
  //@+node:<< OnCharListe >>
  void OnCharListe (wxCommandEvent& WXUNUSED(event)) {
+   if (charakteristika_->GetSelection()==-1) return;
+ 
+   std::string c = charakteristika_->GetStringSelection().c_str();
+   std::string auswahl;
+   for (DSA::Charakteristika::iterator i = objekt_->charakteristika_.begin(); i != objekt_->charakteristika_.end(); ++i)
+     if (i->second.Text() == c)
+       auswahl = i->first;
+ 
+   bool showplusminus = DSA::charakteristika()->Hole(auswahl).SchlechteEigenschaft();
+   Log::Add(auswahl);
+   FindWindow(CHARPLUS)->Show(showplusminus);
+   FindWindow(CHARMINUS)->Show(showplusminus);
  } // OnCharListe
  //@nonl
***************
*** 1658,1661 ****
--- 1678,1692 ----
  //@+node:<< OnCharPlus >>
  void OnCharPlus (wxCommandEvent& WXUNUSED(event)) {
+   int sel = charakteristika_->GetSelection();
+   if (sel==-1) return;
+ 
+   std::string c = charakteristika_->GetStringSelection().c_str();
+   std::string auswahl;
+   for (DSA::Charakteristika::iterator i = objekt_->charakteristika_.begin(); i != objekt_->charakteristika_.end(); ++i)
+     if (i->second.Text() == c) {
+       i->second.Stufe(i->second.Stufe()+1);
+       charakteristika_->SetString(sel, i->second.Text().c_str());
+   }
+ //  Update();
  } // OnCharPlus
  //@nonl
***************
*** 1665,1670 ****
  //@+node:<< OnCharMinus >>
  void OnCharMinus (wxCommandEvent& WXUNUSED(event)) {
  } // OnCharMinus
- //@nonl
  //@-node:<< OnCharMinus >>
  //@nl
--- 1696,1711 ----
  //@+node:<< OnCharMinus >>
  void OnCharMinus (wxCommandEvent& WXUNUSED(event)) {
+   int sel = charakteristika_->GetSelection();
+   if (sel==-1) return;
+ 
+   std::string c = charakteristika_->GetStringSelection().c_str();
+   std::string auswahl;
+   for (DSA::Charakteristika::iterator i = objekt_->charakteristika_.begin(); i != objekt_->charakteristika_.end(); ++i)
+     if (i->second.Text() == c) {
+       i->second.Stufe(i->second.Stufe()-1);
+       charakteristika_->SetString(sel, i->second.Text().c_str());
+   }
+ //  Update();
  } // OnCharMinus
  //@-node:<< OnCharMinus >>
  //@nl
***************
*** 1897,1900 ****
--- 1938,1944 ----
  //@+node:<< Version History >>
  // $Log$
+ // Revision 1.25  2004/01/04 00:02:50  vrandezo
+ // Schlechte Eigenschaften 5+ bei RKP
+ //
  // Revision 1.24  2004/01/02 20:53:24  vrandezo
  // generierte SF jetzt auch für RKP möglich