Skip to content

Commit

Permalink
- fixed an OMC crash on Vista (sendData.cpp)
Browse files Browse the repository at this point in the history 
- added icons for Plot Window (ext.exe) and OMC (omc.exe)
- display the Plot Window (ext.exe) on the taskbar
- updated copyright in OMShell
- added .pdb files for releases: ext.exe, OMShell.exe, omc.exe
  to make it easier to debug crashes
- fixed the last date in OpenModelica System Guide
- fixed 3D_Bouncinball3D.onb
- fixed OMShell runtime error at start



git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3844 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@adrpo
adrpo committed Feb 5, 2009
1 parent bd30c7d commit 2d72701
Show file tree
Hide file tree
Showing 8 changed files with 260 additions and 1 deletion.
Binary file modified OMNotebook/OMNotebookQT4/res.aps
View file
Binary file not shown.
Binary file added OMNotebook/ext/Resources/plotWindow.ico
View file
Binary file not shown.
7 changes: 6 additions & 1 deletion OMNotebook/ext/e.cpp
View file
Expand Up @@ -32,18 +32,23 @@

#include <QApplication>
#include "../Pltpkg2/graphWindow.h"
#include "resource.h"
using namespace std;

int main(int argc, char** argv)
{
QApplication a(argc, argv);
QFrame *mainFrame_ = new QFrame();
QMainWindow *mw = new QMainWindow();
mw->setWindowTitle("Plot Window");
mw->setWindowIcon( QIcon(":/Resources/plotWindow.bmp"));
#ifndef __APPLE_CC__
SoQt::init(mainFrame_);
#endif
GraphWindow *w = new GraphWindow(mainFrame_);
mw->setCentralWidget(w);
w->compoundWidget->gwMain->setServerState(true);
w->show();
mw->show();

return a.exec();
}
91 changes: 91 additions & 0 deletions OMNotebook/ext/ext.rc
View file
@@ -0,0 +1,91 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE
BEGIN
"resource.h\0"
END

2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END

3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED

#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// Swedish resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
#ifdef _WIN32
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
#pragma code_page(1252)
#endif //_WIN32

/////////////////////////////////////////////////////////////////////////////
//
// Icon
//

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON "Resources\\plotWindow.ico"

/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//

IDB_BITMAP1 BITMAP "Resources\\plotWindow.bmp"
#endif // Swedish resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

30 changes: 30 additions & 0 deletions OMNotebook/ext/ext.vcproj
View file
Expand Up @@ -235,6 +235,20 @@
RelativePath="..\Pltpkg2\lineGroup.cpp"
>
</File>
<File
RelativePath=".\qtres.qrc"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(QTHOME)\bin\rcc.exe -o generatedfiles/qtres.cpp qtres.qrc"
AdditionalDependencies="qtres.qrc"
Outputs="generatedfiles/qtres.cpp"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\Pltpkg2\variableData.cpp"
>
Expand Down Expand Up @@ -425,6 +439,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\generatedfiles\qtres.cpp"
>
</File>
</Filter>
<File
RelativePath=".\ext.rc"
Expand All @@ -434,6 +452,18 @@
RelativePath="..\OMNotebookQT4\omnotebook_png.png"
>
</File>
<File
RelativePath=".\Resources\plotWindow.bmp"
>
</File>
<File
RelativePath=".\Resources\plotWindow.ico"
>
</File>
<File
RelativePath=".\Resources\plotWindow.png"
>
</File>
</Files>
<Globals>
</Globals>
Expand Down
111 changes: 111 additions & 0 deletions OMNotebook/ext/generatedfiles/qtres.cpp
View file
@@ -0,0 +1,111 @@
/****************************************************************************
** Resource object code
**
** Created: Thu 5. Feb 02:51:50 2009
** by: The Resource Compiler for Qt version 4.4.3
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/

#include <QtCore/qglobal.h>

static const unsigned char qt_resource_data[] = {
// C:/bin/cygwin/home/adrpo/dev/OpenModelica/OMNotebook/ext/Resources/plotWindow.bmp
0x0,0x0,0x2,0x76,
0x42,
0x4d,0x76,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x76,0x0,0x0,0x0,0x28,0x0,0x0,
0x0,0x20,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x1,0x0,0x4,0x0,0x0,0x0,0x0,
0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,
0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,
0x0,0x0,0x80,0x80,0x0,0x80,0x0,0x0,0x0,0x80,0x0,0x80,0x0,0x80,0x80,0x0,
0x0,0xc0,0xc0,0xc0,0x0,0x80,0x80,0x80,0x0,0x0,0x0,0xff,0x0,0x0,0xff,0x0,
0x0,0x0,0xff,0xff,0x0,0xff,0x0,0x0,0x0,0xff,0x0,0xff,0x0,0xff,0xff,0x0,
0x0,0xff,0xff,0xff,0x0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0x78,0xff,0xff,0xff,0xf0,0x7,0x77,0x7f,0xff,0xff,0x8,
0xff,0xff,0xff,0xf0,0x7,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
0xff,0xff,0xff,0x70,0x8f,0x87,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
0xff,0xff,0xff,0xf0,0x8,0x70,0xff,0xff,0xff,0xf7,0x8f,0xff,0xff,0xff,0xff,0x77,
0xff,0xff,0xff,0xff,0x77,0xff,0xff,0x8f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xf0,0x7,0xff,0xff,0xff,0xff,0xff,0x8f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0x80,0x11,0xff,0xff,0xff,0xff,0xff,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0x11,0x11,0xff,0xff,0xff,0xff,0xff,0xff,0x8f,0xff,0xff,0xff,0xf8,0xff,0xff,0xff,
0x19,0x99,0xff,0xff,0xff,0xff,0xff,0xff,0xf0,0xff,0xff,0xff,0xff,0x8f,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf8,0x8f,0xff,0xff,0xff,0xf7,0xff,0xff,
0xff,0xff,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xf,0xff,0xff,0xff,0xf0,0xff,0xff,
0xff,0xff,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0x78,0xff,0xff,0xff,0xff,0xf,0xff,
0xff,0xff,0xf0,0xff,0xff,0xf,0xff,0xff,0xff,0xf0,0xf,0xff,0xff,0xff,0x70,0x7f,
0xff,0xff,0xff,0x7,0xff,0x0,0xff,0xff,0xff,0xf0,0x0,0xff,0xff,0xff,0xf0,0x7,
0xff,0xff,0xff,0x70,0xff,0x0,0xf,0xff,0xff,0xf8,0x0,0xf,0xff,0xff,0xff,0x0,
0x7f,0xff,0xff,0xf0,0xf,0x0,0x0,0xff,0xff,0xff,0x0,0x0,0xff,0xff,0xff,0x0,
0x8,0xff,0xff,0xf8,0x7,0x70,0x0,0xf,0xff,0xff,0x0,0x0,0x8f,0xff,0xff,0x0,
0x0,0xff,0xff,0xf7,0x8,0xff,0xf0,0x0,0x0,0x70,0x0,0x70,0x0,0x7,0x78,0x0,
0x0,0x0,0x7f,0x70,0x0,0xff,0xff,0x70,0x0,0x0,0x0,0xff,0x80,0x0,0x0,0x0,
0xff,0x0,0x0,0x0,0x8,0xff,0xff,0xff,0x80,0x0,0x7,0xff,0xff,0x0,0x0,0x8,
0xff,0xf0,0x0,0x0,0xf,0xff,0xff,0xff,0xf7,0x0,0x8f,0xff,0xff,0xf0,0x0,0x8f,
0xff,0xf7,0x0,0x0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,

};

static const unsigned char qt_resource_name[] = {
// Resources
0x0,0x9,
0xa,0x6c,0x38,0x43,
0x0,0x52,
0x0,0x65,0x0,0x73,0x0,0x6f,0x0,0x75,0x0,0x72,0x0,0x63,0x0,0x65,0x0,0x73,
// plotWindow.bmp
0x0,0xe,
0xd,0xbd,0xec,0x0,
0x0,0x70,
0x0,0x6c,0x0,0x6f,0x0,0x74,0x0,0x57,0x0,0x69,0x0,0x6e,0x0,0x64,0x0,0x6f,0x0,0x77,0x0,0x2e,0x0,0x62,0x0,0x6d,0x0,0x70,

};

static const unsigned char qt_resource_struct[] = {
// :
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,
// :/Resources
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x2,
// :/Resources/plotWindow.bmp
0x0,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,

};

QT_BEGIN_NAMESPACE

extern bool qRegisterResourceData
(int, const unsigned char *, const unsigned char *, const unsigned char *);

extern bool qUnregisterResourceData
(int, const unsigned char *, const unsigned char *, const unsigned char *);

QT_END_NAMESPACE


int QT_MANGLE_NAMESPACE(qInitResources)()
{
QT_PREPEND_NAMESPACE(qRegisterResourceData)
(0x01, qt_resource_struct, qt_resource_name, qt_resource_data);
return 1;
}

Q_CONSTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qInitResources))

int QT_MANGLE_NAMESPACE(qCleanupResources)()
{
QT_PREPEND_NAMESPACE(qUnregisterResourceData)
(0x01, qt_resource_struct, qt_resource_name, qt_resource_data);
return 1;
}

Q_DESTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qCleanupResources))

5 changes: 5 additions & 0 deletions OMNotebook/ext/qtres.qrc
View file
@@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/" >
<file>Resources/plotWindow.bmp</file>
</qresource>
</RCC>
17 changes: 17 additions & 0 deletions OMNotebook/ext/resource.h
View file
@@ -0,0 +1,17 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by ext.rc
//
#define IDI_ICON1 104
#define IDB_BITMAP1 106

// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 107
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

0 comments on commit 2d72701

Please sign in to comment.