Ignore:
Timestamp:
Apr 1, 2013 2:11:21 PM (9 years ago)
Author:
ilavsky
Message:

Minor GUI fix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • User Procedures/Indra 2/IN3_Calculations.ipf

    r13 r15  
    504504        NVAR CalculateThickness=root:Packages:Indra3:CalculateThickness
    505505        if (cmpstr("CalculateThickness",ctrlName)==0)
    506                 SetVariable SampleThickness, win=USAXSDataReduction, noedit=CalculateThickness, frame=!CalculateThickness
    507                 SetVariable SampleLinAbsorption, win=USAXSDataReduction, noedit=!CalculateThickness, frame=CalculateThickness
    508                 SetVariable SampleFilledFraction, win=USAXSDataReduction, noedit=!CalculateThickness, frame=CalculateThickness
     506                NI3_TabPanelControl("",0)
    509507                IN3_CalculateSampleThickness()
    510508        endif
    511509        if (cmpstr("CalculateWeight",ctrlName)==0)
    512                 SetVariable SampleWeightInBeam, win=USAXSDataReduction, noedit=CalculateWeight, frame=!CalculateWeight
    513                 SetVariable SampleDensity, win=USAXSDataReduction, frame=CalculateWeight
    514                 SetVariable SampleThickness, win=USAXSDataReduction, noedit=CalculateThickness, frame=!CalculateThickness
    515                 SetVariable BeamExposureArea, win=USAXSDataReduction, noedit=!CalculateWeight, frame=CalculateWeight
     510                NI3_TabPanelControl("",0)
    516511                IN3_CalculateSampleThickness()
    517512        endif
     
    528523                endif
    529524                NI3_TabPanelControl("",0)
    530                 SetVariable BeamExposureArea, win=USAXSDataReduction, noedit=!(CalculateWeight&&CalibrateToWeight), frame=!CalculateWeight
    531525        endif
    532526       
     
    542536                endif
    543537                NI3_TabPanelControl("",0)
    544                 SetVariable BeamExposureArea, win=USAXSDataReduction, noedit=!(CalculateWeight&&CalibrateToWeight), frame=!CalculateWeight
    545538        endif
    546539
     
    556549                endif
    557550                NI3_TabPanelControl("",0)
    558                 SetVariable BeamExposureArea, win=USAXSDataReduction, noedit=!(CalculateWeight&&CalibrateToWeight), frame=!CalculateWeight
    559551        endif
    560552       
     
    13621354        CheckBox CalculateThickness,win=USAXSDataReduction, disable=(tab!=0 || IsBlank)
    13631355        CheckBox CalculateWeight,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || !CalibrateToWeight )
    1364         SetVariable SampleThickness,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || CalibrateArbitrary), noedit=!(CalculateThickness||CalculateWeight), frame=CalculateThickness
    1365         SetVariable SampleWeightInBeam,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || !CalibrateToWeight || CalibrateArbitrary)
     1356        SetVariable SampleThickness,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || CalibrateArbitrary), noedit=(CalculateThickness), frame=!CalculateThickness
     1357        SetVariable SampleWeightInBeam,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || !CalibrateToWeight || CalibrateArbitrary), noedit=CalculateWeight, frame=!CalculateWeight
    13661358        SetVariable SampleTransmission,win=USAXSDataReduction, disable=(tab!=0 || IsBlank)
    13671359        SetVariable SampleLinAbsorption,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || CalibrateArbitrary), noedit=!CalculateThickness, frame=CalculateThickness
    1368         SetVariable SampleDensity,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || !CalibrateToWeight || CalibrateArbitrary), frame=CalculateWeight
     1360        SetVariable SampleDensity,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || !CalibrateToWeight || CalibrateArbitrary), frame=CalculateWeight, noedit=!CalculateWeight
    13691361        SetVariable SampleFilledFraction,win=USAXSDataReduction, disable=(tab!=0 || IsBlank || !CalibrateToVolume || CalibrateArbitrary),noedit=!CalculateThickness, frame=CalculateThickness
    13701362        SetVariable BeamExposureArea, win=USAXSDataReduction, disable=(tab!=0 || IsBlank || CalibrateArbitrary), noedit=!(CalculateWeight&&CalibrateToWeight), frame=!CalculateWeight
Note: See TracChangeset for help on using the changeset viewer.