*Updated to make compatible with omc changes

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2942 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 9, 2007 · e77e12a · e77e12a
1 parent ab51bdd
commit e77e12a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 23 deletions.
diff --git a/OMNotebook/Pltpkg2/Pltpkg2.vcproj b/OMNotebook/Pltpkg2/Pltpkg2.vcproj
@@ -77,8 +77,9 @@
 				Optimization="2"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="2"
+				ImproveFloatingPointConsistency="FALSE"
 				FavorSizeOrSpeed="1"
-				OptimizeForProcessor="3"
+				OptimizeForProcessor="0"
 				AdditionalIncludeDirectories="&quot;$(QTHOME)\include\QtCore&quot;;&quot;$(QTHOME)\include\QtGui&quot;;&quot;$(QTHOME)\include&quot;;.;&quot;$(QTHOME)\include\ActiveQt&quot;;debug;&quot;$(QTHOME)\mkspecs\win32-msvc.net&quot;"
 				PreprocessorDefinitions="NDEBUG,_WINDOWS,UNICODE,QT_LARGEFILE_SUPPORT,WIN32,QT_DLL,QT_NO_DEBUG,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
 				GeneratePreprocessedFile="0"
@@ -160,18 +161,18 @@
 				RelativePath="lineGroup.cpp">
 			</File>
 			<File
-				RelativePath="debug\moc_compoundWidget.cpp">
+				RelativePath="release\moc_compoundWidget.cpp">
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
 					<Tool
 						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="release\moc_compoundWidget.cpp">
+				RelativePath="debug\moc_compoundWidget.cpp">
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE">
 					<Tool
 						Name="VCCLCompilerTool"/>
@@ -195,6 +196,15 @@
 						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="debug\moc_graphWindow.cpp">
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="release\moc_graphWindow.cpp">
 				<FileConfiguration
@@ -205,7 +215,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="debug\moc_graphWindow.cpp">
+				RelativePath=".\debug\moc_legendLabel.cpp">
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE">
@@ -229,15 +239,6 @@
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\debug\moc_legendLabel.cpp">
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath=".\release\moc_preferenceWindow.cpp">
 				<FileConfiguration

diff --git a/OMNotebook/Pltpkg2/graphWidget.cpp b/OMNotebook/Pltpkg2/graphWidget.cpp
@@ -488,6 +488,7 @@ fitInView(graphicsScene->sceneRect());
 void GraphWidget::getData()
 {
 	disconnect(activeSocket, SIGNAL(readyRead()), 0, 0);
+	connect(activeSocket, SIGNAL(readyRead()), this, SLOT(getData()));
 
 	while(activeSocket->bytesAvailable())
 	{
@@ -529,6 +530,7 @@ void GraphWidget::getData()
 		else if(command == QString("drawEllipse"))
 		{
 			drawEllipse(ds);
+			activeSocket->disconnect();
 		}
 		else if(command == QString("closeServer"))
 		{
@@ -694,17 +696,21 @@ void GraphWidget::mouseReleaseEvent ( QMouseEvent * event )
 				bottom = zoomEnd.y();
 			}
 
-			bottom += mapToScene(0,0,0,this->horizontalScrollBar()->height()).boundingRect().height();
-			right += mapToScene(0,0,this->verticalScrollBar()->width(), 0).boundingRect().width();
+//			bottom += mapToScene(0,0,0,this->horizontalScrollBar()->height()).boundingRect().height();
+//			right += mapToScene(0,0,this->verticalScrollBar()->width(), 0).boundingRect().width();
+
 
-			QRectF r(left, bottom, right-left, top-bottom);
 
+//			QRectF r(left, bottom, right-left, top-bottom);
+
+			QRectF r(QPointF(left,top),QPointF(right, bottom));
 			if(!r.width() || !r.height())
 				return;
 
 
 			//			fitInView(r);
 			//			setArea(r);
+
 			zoomIn(r);
 
 			double xScale = matrix().m11()/125;
@@ -741,6 +747,8 @@ void GraphWidget::zoomIn(QRectF r)
 
 //	if(graphicsScene->gridVisible)
 //		showGrid(true);
+
+
 	showGrid(graphicsScene->gridVisible);
 }
 
@@ -1003,6 +1011,7 @@ void GraphWidget::createGrid(bool numbersOnly)
 	}
 	else
 	{
+
 		if(!numbersOnly)
 		{
 			for(qreal y = yMin-yMajorDist; y < 1.5* yMajorDist + yMax ; y+= yMinorDist)
@@ -1141,12 +1150,14 @@ void GraphWidget::setArea(const QRectF& r)
 		current.setBottom(r.bottom());
 
 
-	graphicsScene->setSceneRect(current);
-	setSceneRect(current);
 
-	fitInView(r);
+	graphicsScene->setSceneRect(current); 
+	setSceneRect(current);                
+
+	fitInView(r); //uu
 
 	setCurrentArea(mapToScene(rect()).boundingRect());
+//	setCurrentArea(r);
 	update(rect());
 }
 
@@ -1710,7 +1721,9 @@ void GraphWidget::plotPtolemyDataStream()
 			showGrid(grid);
 
 			double xmin, xmax, ymin, ymax;
-			ds >> xmin >> xmax >> ymin >> ymax;
+			if(dataStreamVersion < 1.2)
+				ds >> xmin >> xmax >> ymin >> ymax;
+
 			int logX, logY;
 			ds >> logX >> logY;
 			QString interpolation;

diff --git a/OMNotebook/Pltpkg2/graphWidget.h b/OMNotebook/Pltpkg2/graphWidget.h
@@ -211,7 +211,7 @@ public slots:
 		return currentArea_;
 	}
 
-	void setCurrentArea(QRectF& r)
+	void setCurrentArea(const QRectF& r)
 	{
 		currentArea_ = r;
 	}