← Back to branch summary

~vbursian/research-assistant/intervers

« back to all changes in this revision

Viewing changes to RAGUI/CurvesUI.cpp

  • Committer: Viktor Bursian at blin-ubuntu
  • Date: 2015-01-08 00:57:26 UTC
  • mto: (4.19.3 VB)
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: vbursian@gmail.com-20150108005726-feotiqa8veqaxqxe
Expessions: Wow! There is something to work on, but WOW!

Show diffs side-by-side

added added

removed removed

Lines of Context:
RAGUI/CurvesUI.cpp
82
82
  psCurve                     Curve(dynamic_cast<psCurve>
83
83
                                         (tree_item->AttrValue().operator->()));
84
84
  ASSERT( Curve );
85
 
  psCurveAppearance           A = dynamic_cast<psCurveAppearance>
86
 
                                              (Curve->Appearance);
87
 
  ASSERT( A );
 
85
  sColor                      OldColor(Curve->Color());
88
86
  QColorDialog                D;
89
87
  D.setOptions(QColorDialog::DontUseNativeDialog);
90
88
//    sColorSet                   ColorSet(sColorSet::Basic());
96
94
//                                   ,ColorSet.Get().Blue()  ).rgb() );
97
95
//      ColorSet.ShiftToNext();
98
96
//    };
99
 
 
100
 
  D.setCurrentColor(QColor(A->Color.Red(),A->Color.Green(),A->Color.Blue()));
 
97
  D.setCurrentColor(QColor(OldColor.Red(),OldColor.Green(),OldColor.Blue()));
101
98
  if( D.exec() ){
102
 
    A->Color = sColor(D.selectedColor().red()
103
 
                     ,D.selectedColor().green()
104
 
                     ,D.selectedColor().blue());
105
 
    Curve->_MarkAsEdited();
 
99
    Curve->SetColor(sColor(D.selectedColor().red()
 
100
                          ,D.selectedColor().green()
 
101
                          ,D.selectedColor().blue()));
106
102
  }
107
103
}
108
104