Some changes.

SemaphoreTO · Jan 10, 2015 · eac1cb6 · eac1cb6
1 parent 74e8246
commit eac1cb6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 29 deletions.
diff --git a/build.spec b/build.spec
@@ -57,6 +57,7 @@ coll = COLLECT(exe,
                Tree('history',prefix='history'),
                Tree('reference',prefix='reference'),
                Tree('socket',prefix='socket'),
+               Tree('holeMaker',prefix='holeMaker'),
                strip=None,
                upx=True,
                name='SocketmixerStart')

diff --git a/extensions/extraFunctions.py b/extensions/extraFunctions.py
@@ -416,7 +416,7 @@ def boolean(object1,object2):
     cmd.AppendBeginToolCommand('difference')
     remote.runCommand(cmd)
     remote.shutdown()
-    return cmd
+    return True
 
 
 

diff --git a/reference/alignmentObject.STL b/reference/alignmentObject.STL
diff --git a/static/html/modeling/page5.html b/static/html/modeling/page5.html
@@ -128,9 +128,9 @@ <h3>Create Socket Thickness </h3>
 
                         </div>
 
-    					<div id="subText7" class="subText" style="display: none;" acceptDisabled=1>
-    						<h3>Finished </h3>
-    					</div>
+                        <div id="subText7" apifuncstart="$.post('api/saveLatest()',apiReturnParser);"  class="subText" style="display: none;" acceptdisabled=1>
+                            <h3>Finished </h3>
+                        </div>
                     </div>
 					<div class="panel-footer "> 
 					   <div id="page62TemplateControls"> </div>

diff --git a/static/html/modeling/page6.html b/static/html/modeling/page6.html
@@ -114,7 +114,7 @@ <h3>Position Hole Maker</h3>
                             message here
                         <p>
                     </div>
-                    <div id="subText4" apifunc=$.post("api/boolean('socket','holemaker')",apiReturnParser); class="subText" style="display: none;">
+                    <div id="subText4" apifunc=$.post("api/boolean('connector','holemaker')",acceptBoolean); class="subText" style="display: none;">
                         <div class='questionMarkPlaceHolder' align='right' helppage=''> </div>
                         <h3>Boolean Hole Maker</h3>
                         <hr>
@@ -123,7 +123,7 @@ <h3>Boolean Hole Maker</h3>
                         <p>
                     </div>
 
-                    <div id="subText5" class="subText" style="display: none;">
+                    <div id="subText5" apifuncstart="$.post('api/saveLatest()',apiReturnParser);"  class="subText" style="display: none;">
                         <h3>Finished </h3>
                     </div>
                 </div>
@@ -149,6 +149,16 @@ <h3>Finished </h3>
 </div>
 
 <script>
+
+    function acceptBoolean(data)
+    {
+        debugger;
+        if (data == false) {
+            apiReturnParser(data)
+        }
+        $.post("api/accept()", apiReturnParser);
+    }
+
     var selectedConnector ='socket.obj'
     function loadconnector()
     {

diff --git a/static/index.html b/static/index.html
@@ -287,36 +287,14 @@
              }
          }
 
-         function alignReference(data)
-         {
-             if (data == false) {
-                 apiReturnParser(data)
-             }
-             else
-             {
-                 $.post("api/centerModel()", selectObjects);
-             }
-         }
-         function exportReference(data)
-         {
-             if (data == false) {
-                 apiReturnParser(data)
-             }
-             else {
-                 $.post("api/exportTempModel()", alignReference);
-             }
-         }
-
-
          function loadReferenceObject(data)
          {
-             debugger;
              if (data == false) {
                  apiReturnParser(data)
              }
              else {
                  selectedObjects = data;
-                 $.post("api/importFile('alignmentObject.STL','reference')", exportReference);
+                 $.post("api/importFile('alignmentObject.stl','reference')", selectObjects);
              }
          }