Changeset 6975

Timestamp:

Oct 8, 2015, 8:11:11 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #1941: Store experimental factor values as part experiments

Added 'Clone' button in the 'Inherit annotations' dialog to make it possible to clone annotations in a single step without having to re-select and clone in a second step.

Location:

branches/3.6-stable

Files:

• doc/src/docbook/figures/clone_annotation.png (modified) (previous)
• doc/src/docbook/figures/inherit_annotations.png (modified) (previous)
• doc/src/docbook/user/annotations.xml (modified) (2 diffs)
• www/common/annotations/annotate.js (modified) (4 diffs)
• www/common/annotations/inherit.js (modified) (4 diffs)
• www/common/annotations/inherit.jsp (modified) (1 diff)

branches/3.6-stable/doc/src/docbook/user/annotations.xml

@@ -807 +807 @@
         </para>
         
+        <para>
+          Use the <guibutton>Inherit</guibutton> button to inherit the selected
+          annotations by reference, and the <guibutton>Clone</guibutton> button
+          to clone the values of the selected annotations.
+        </para>
+        
         <note>
           <itemizedlist>
           <listitem>
             <para>
-            Already inherited annotations are not shown in the dialog.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-            By default, the inheritance is implemented by reference. To convert 
-            it to a cloned annotation select it in the list and click on <guilabel>clone</guilabel>.
+            Already inherited or cloned annotations are not shown in the dialog.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+            Annotations that are inherited by reference can easily be converted to
+            cloned annotations. Select the annotation in the list and click on the
+            <guilabel>clone</guilabel> link.
             <nohelp>
             <figure>
@@ -831 +838 @@
             </figure>
             </nohelp>
-
             </para>
           </listitem>

branches/3.6-stable/www/common/annotations/annotate.js

@@ -981 +981 @@
     Doc.show('inherited-list');
     var inheritedId = event.detail.id;
+    var clone = event.detail.clone;
     
     // Check if we have info about this annotation already
@@ -989 +990 @@
       {
         entry.modified = INHERITED;
+        if (clone && entry.source != 'CLONED')
+        {
+          annotate.convertToCloned(entry);
+        }
+        else if (!clone && entry.source != 'INHERITED')
+        {
+          annotate.convertToInherited(entry);
+        }
         Doc.show(entry.id);
         return;
@@ -1002 +1011 @@
     request.open("GET", url, true);
     request.send(null);
-    Ajax.setReadyStateHandler(request, annotate.inheritInfoLoaded, annotate.inheritInfoLoaded);
+    var callback = clone ? annotate.inheritInfoLoadedAndClone : annotate.inheritInfoLoaded;
+    Ajax.setReadyStateHandler(request, callback, callback);
+  }
+  
+  /**
+    Callback that converts the inherited annotation to a cloned
+    annotation.
+  */
+  annotate.inheritInfoLoadedAndClone = function(request)
+  {
+    var entry = annotate.inheritInfoLoaded(request);
+    annotate.convertToCloned(entry);
   }
   
@@ -1023 +1043 @@
     annotations[annotations.length] = entry;
     annotate.createAnnotationEntryInList(entry, true);
+    return entry;
   }
   

branches/3.6-stable/www/common/annotations/inherit.js

@@ -32 +32 @@
     // Buttons (on standalone dialog)
     Buttons.addClickHandler('close', App.closeWindow);
-    Buttons.addClickHandler('btnOk', inherit.save);
+    Buttons.addClickHandler('btnInherit', inherit.save);
+    Buttons.addClickHandler('btnClone', inherit.save);
     
     Events.addEventHandler('quickFilter', 'keyup', inherit.quickFilter);
@@ -80 +81 @@
   }
   
-  inherit.saveInheritedAnnotations = function()
+  inherit.saveInheritedAnnotations = function(clone)
   {
     var tree = Doc.element('joust');
@@ -100 +101 @@
           var detail = {};
           detail.id = menuItem.externalId;
+          detail.clone = clone;
           if (isInherited) 
           {
@@ -140 +142 @@
     Save the annotations in standalone mode.
   */
-  inherit.save = function()
+  inherit.save = function(event)
   {
-    inherit.saveInheritedAnnotations();
+    var clone = Data.int(event.currentTarget, 'clone', 0);
+    inherit.saveInheritedAnnotations(clone);
     App.closeWindow();
   }

branches/3.6-stable/www/common/annotations/inherit.jsp

@@ -371 +371 @@
 
   <base:buttongroup subclass="dialogbuttons">
-    <base:button id="btnOk" title="Ok" />
+    <base:button id="btnClone" title="Clone" image="copy.png" data-clone="1" />
+    <base:button id="btnInherit" title="Inherit" image="inherit.png" />
     <base:button id="close" title="Cancel" />
   </base:buttongroup>