Changeset 1743

Show
Ignore:
Timestamp:
12/08/09 21:13:44 (2 years ago)
Author:
andreas
Message:

some tweaks to lattice overlay

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/qt_gui/src/ex/gui/lib/lattice_overlay.cc

    r1734 r1743  
    164164 
    165165    if(GetEditFlag()) { 
    166  
    167       strategy_->SetPenColor(anchor_color_); 
    168       if(anchor1flag_){ 
    169         QPoint index = dvp->FracPointToWinCenter(GetEditLattice().CalcPosition(anchor1_)); 
    170         strategy_->Draw(pnt,index); 
    171       } 
    172       if(anchor2flag_){ 
    173         QPoint index = dvp->FracPointToWinCenter(GetEditLattice().CalcPosition(anchor2_)); 
    174         strategy_->Draw(pnt,index); 
    175       } 
    176166      if(distortion_index_!=Point(0,0)){ 
    177167        QColor edit_color = active_color_.toHsv(); 
    …… 
    188178        pnt.drawLine(dp,up); 
    189179      } 
    190     } else { 
    191       if(anchor1flag_){ 
    192         QPoint index = dvp->FracPointToWinCenter(GetLattice().CalcPosition(anchor1_)); 
    193         strategy_->Draw(pnt,index); 
    194       } 
    195       if(anchor2flag_){ 
    196         QPoint index = dvp->FracPointToWinCenter(GetLattice().CalcPosition(anchor2_)); 
    197         strategy_->Draw(pnt,index); 
    198       } 
    199     } 
    200      
     180    } 
     181    QColor anchor_brush_color=anchor_color_; 
     182    anchor_brush_color.setAlphaF(0.3); 
     183    strategy_->SetBrush(QBrush(anchor_brush_color)); 
     184    strategy_->SetPenColor(anchor_color_); 
     185    if(anchor1flag_){ 
     186      QPoint index = dvp->FracPointToWinCenter(GetEditLattice().CalcPosition(anchor1_)); 
     187      strategy_->Draw(pnt,index); 
     188    } 
     189    if(anchor2flag_){ 
     190      QPoint index = dvp->FracPointToWinCenter(GetEditLattice().CalcPosition(anchor2_)); 
     191      strategy_->Draw(pnt,index); 
     192    } 
     193    strategy_->SetBrush(QBrush(Qt::NoBrush)); 
    201194  } 
    202195} 

  • branches/qt_gui/src/ex/gui/lib/lattice_overlay_base.cc

    r1739 r1743  
    217217void LatticeOverlayBase::OnDraw(QPainter& pnt,  DataViewerPanel* dvp, bool is_active) 
    218218{ 
    219   DrawLattice(pnt,dvp,lattice_,is_active ? active_color_ : passive_color_,is_active ? active_color_.lighter() : passive_color_ ); 
     219  DrawLattice(pnt,dvp,lattice_,is_active ? active_color_ : passive_color_,is_active ? active_color_.lighter(180) : passive_color_ ); 
    220220 
    221221  if(tilt_flag_) { 
    …… 
    228228    QColor edit_color = active_color_.toHsv(); 
    229229    edit_color.setHsv(edit_color.hue()+45,edit_color.saturation(),edit_color.value()); 
    230     DrawLattice(pnt,dvp,edit_lattice_, edit_color, edit_color.lighter()); 
     230    DrawLattice(pnt,dvp,edit_lattice_, edit_color, edit_color.lighter(180)); 
    231231    if(tilt_flag_) { 
    232232      DrawTilt(pnt,dvp, edit_lattice_, edit_tilt_geometry_, edit_color);