Changeset 5332 for branches/1.4/gui


Ignore:
Timestamp:
Apr 28, 2015, 3:00:22 PM (9 years ago)
Author:
ldelgass
Message:

merge r5330:5331 from trunk

Location:
branches/1.4
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • branches/1.4

  • branches/1.4/gui/scripts/Makefile.in

    r4760 r5332  
    7979                $(srcdir)/mesh.tcl \
    8080                $(srcdir)/meshresult.tcl \
    81                 $(srcdir)/moleculeViewer.tcl \
    8281                $(srcdir)/molvisviewer.tcl \
    8382                $(srcdir)/nanovisviewer.tcl \

  • branches/1.4/gui/scripts/deviceEditor.tcl

    r3330 r5332  
    183183                }
    184184                set servers [Rappture::VisViewer::GetServerList "pymol"]
    185                 if { "" != $servers } {
    186                     Rappture::MolvisViewer $itk_component(hull).mol $servers
    187                 } else {
    188                     Rappture::MoleculeViewer $itk_component(hull).mol $this
    189                 }
     185                Rappture::MolvisViewer $itk_component(hull).mol $servers
    190186                pack $itk_component(hull).mol -expand yes -fill both
    191187            }

  • branches/1.4/gui/scripts/field.tcl

    r5324 r5332  
    887887            #
    888888            # Extract gzipped, base64-encoded OpenDX data
    889             # 
     889            #
    890890            set viewer [$_field get "about.view"]
    891891            if { $viewer != "" } {
Note: See TracChangeset for help on using the changeset viewer.