Commits

Anonymous committed 9fa6b78

able to import other frame files to duplicate papers

Comments (0)

Files changed (5)

 REM java -showversion -ea -Xmx1000M -cp . Tunnel.MainBox C:\\Users\\goatchurch\\tunneldata
 REM java -showversion -ea -Xmx1000M -cp . Tunnel.MainBox http://seagrass.goatchurch.org.uk/~expo/tunneldata/
 REM java -showversion -ea -Xmx1000M -cp . Tunnel.MainBox C:\\Users\\goatchurch\\tunneldata\\204-piece-frame-side.xml
-java -showversion -ea -Xmx2000M -cp . Tunnel.MainBox C:\\Users\\goatchurch\\caving\\YorkshireSVN\\mmmmc\\tunneldata
+
+java -showversion -ea -Xmx2000M -cp . Tunnel.MainBox C:\\Users\\goatchurch\\caving\\tunneldata
+REM java -showversion -ea -Xmx2000M -cp . Tunnel.MainBox C:\\Users\\goatchurch\\caving\\YorkshireSVN\\mmmmc\\tunneldata
+
 
 REM -- should work when no survex installed by uploading to executable on server
 REM -- allow net upload to take path, save on server and commit to mercurial (with username)

trunk/src/PtrelLn.java

 	/////////////////////////////////////////////
 	void PrepareForUnconnectedNodes(List<OnePathNode> vnodes)
 	{
-		CalcAvgTransform(ucavgtrans);
-
 		// find the centreline nodes; reset the proxdists
 		RefPathO srefpathconn = new RefPathO(); // reused object
 		List<OnePathNode> lcenconnnodes = new ArrayList<OnePathNode>();

trunk/src/SketchGraphics.java

 
 		TN.emitMessage("Extending all nodes");
 		ptrelln.PrepareProximity(asketch);
+		if (bcorrespsucc)
+			ptrelln.CalcAvgTransform(ptrelln.ucavgtrans);
+        else
+			ptrelln.ucavgtrans.setToIdentity();
 		ptrelln.PrepareForUnconnectedNodes(asketch.vnodes);
 		ptrelln.Extendallnodes(asketch.vnodes);
 		TN.emitMessage("Warping all paths");
 			boolean bsurvexlabel = ((op.linestyle == SketchLineStyle.SLS_CONNECTIVE) && (op.plabedl != null) && (op.plabedl.sfontcode != null) && (op.plabedl.sfontcode != null) && op.plabedl.sfontcode.equals("survey")); 
 			if (bsurvexlabel)
 				continue; 
-//pld.sfontcode = "default";
 
 			pthstoadd.add(ptrelln.WarpPathD(op, importfromname));
 			int progress = (20*i) / asketch.vpaths.size();
 		{
 			int a = vactivepathcomponentpairs[ivactivepathcomponents*2]; 
             int b = vactivepathcomponentpairs[ivactivepathcomponents*2+1]; 
-            System.out.println("a="+a+" b="+b+"  vactivepaths,size()="+vactivepaths.size()); 
+            //System.out.println("a="+a+" b="+b+"  vactivepaths,size()="+vactivepaths.size()); 
             for (int i = a; i < b; i++)
 				opselset.add(vactivepaths.get(i)); 
 		}

trunk/symbols/fontcolours.xml

 </groupsubsetattr>
 
 <groupsubsetattr groupsubsetname="planecolours" groupsubsetselectable="no">
-	<subsetattr name="red" uppersubset="visiblesets" areacolour="#88e50033">
-		<setvariable name="$labcolour" value="#ffe50033"/>
+	<subsetattr name="red" uppersubset="visiblesets" areacolour="#88e53344">
+		<setvariable name="$labcolour" value="#ffb50023"/>
 	</subsetattr>
 	<subsetattr name="orange" uppersubset="visiblesets" areacolour="#88ff9900">
 		<setvariable name="$labcolour" value="#ffff9900"/>
 	</subsetattr>
 	<subsetattr name="yellow" uppersubset="visiblesets" areacolour="#88bbde00">
-		<setvariable name="$labcolour" value="#ffabde00"/>
+		<setvariable name="$labcolour" value="#ff9bae00"/>
 	</subsetattr>
-	<subsetattr name="cyan" uppersubset="visiblesets" areacolour="#8800ffff">
-		<setvariable name="$labcolour" value="#ff00cccc"/>
+	<subsetattr name="cyan" uppersubset="visiblesets" areacolour="#8850ffff">
+		<setvariable name="$labcolour" value="#ff00aaaa"/>
 	</subsetattr>
-	<subsetattr name="green" uppersubset="visiblesets" areacolour="#8819ff2d">
-		<setvariable name="$labcolour" value="#ff09cf1d"/>
+	<subsetattr name="green" uppersubset="visiblesets" areacolour="#8829ff3d">
+		<setvariable name="$labcolour" value="#ff09bf1d"/>
 	</subsetattr>
 	<subsetattr name="blue" uppersubset="visiblesets" areacolour="#882255ff">
 		<setvariable name="$labcolour" value="#ff0033ff"/>

trunk/symbols/helpfile.html

 <li>;%v3/%%t0/%%h1/%%blackrect%</li>
 </ul></tt>
 
+<p>Left arrow:</p>
+<tt><ul>
+<li>%t2/0.1%%v0/%%h0/%</li>
+<li>;%v0.5/%%t0/%%h2/%%whiterect%</li>
+<li>%v0.5/0.1%</li>
+<li>%v0.5/%%t0/%%h2/%</li>
+<li>;%v0.5/%%t2/%%h0/%%blackrect%</li>
+</ul></tt>
+
+
 <p>Depth scale bar:</p>
 <tt><ul>
 <li>%10/3%%v50/%%blackrect%</li>